diff --git a/.gitignore b/.gitignore
index a1c2a23..7b7a6cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 # Compiled class file
 *.class
-
+.DS_Store
 # Log file
 *.log
 
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..e9e1a01
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,59 @@
+plugins {
+    id 'java'
+    id 'java-library'
+}
+
+sourceSets {
+    main {
+        java {
+            srcDirs 'src/main/base', 'src/main/analysis', 'src/main/asm', 'src/main/crypto', 'src/main/entry', 'src/main/gen', 'src/main/pythongen', 'src/main/DOIP', 'src/main/config'
+        }
+        resources {
+            srcDir 'src/main/resources'
+        }
+    }
+    test {
+        java {
+            srcDir 'src/test/java'
+        }
+        resources {
+            srcDir 'src/test/resources'
+        }
+    }
+}
+
+dependencies {
+    api project(":gmhelper")
+
+    api 'berkeleydb:je:3.2.76'
+    api 'com.fifesoft:rsyntaxtextarea:3.1.3'
+    api 'commons-io:commons-io:2.11.0'
+    api 'io.grpc:grpc-all:1.40.1'
+    api 'io.netty:netty-all:4.1.52.Final'
+    api 'io.prometheus:simpleclient:0.12.0'
+    api 'org.antlr:antlr4:4.9.2'
+    api 'org.apache.commons:commons-lang3:3.12.0'
+    api 'org.apache.httpcomponents:httpclient:4.5.13'
+    api 'org.apache.logging.log4j:log4j-core:2.14.1'
+    api 'org.apache.logging.log4j:log4j-api:2.14.1'
+    api 'org.apache.velocity:velocity-engine-core:2.3'
+    api 'org.knowhowlab.osgi:sigar:1.6.5_01'
+    api 'org.rocksdb:rocksdbjni:6.22.1'
+
+    api fileTree(dir: 'lib', include: '*.jar')
+
+    testImplementation 'junit:junit:4.13.2'
+}
+
+tasks.processResources.setDuplicatesStrategy(DuplicatesStrategy.INCLUDE)
+
+task copyLibs(type: Copy) {
+    from configurations.runtimeClasspath
+    into "./build/output/libs/"
+}
+
+task copyJar(type: Copy) {
+    from "./build/libs/$project.name-${version}.jar"
+    into "./build/output/"
+    rename { String fileName -> "yjs.jar" }
+}
\ No newline at end of file
diff --git a/lib/bdledger-java-sdk-20200311-SNAPSHOT.jar.bak b/lib/bdledger-java-sdk-20200311-SNAPSHOT.jar.bak
new file mode 100644
index 0000000..6047fe7
Binary files /dev/null and b/lib/bdledger-java-sdk-20200311-SNAPSHOT.jar.bak differ
diff --git a/lib/bdledger-java-sdk-dev-200712.f6d4130c.jar.bak b/lib/bdledger-java-sdk-dev-200712.f6d4130c.jar.bak
new file mode 100644
index 0000000..3daebaf
Binary files /dev/null and b/lib/bdledger-java-sdk-dev-200712.f6d4130c.jar.bak differ
diff --git a/lib/bdledger-java-sdk-dev-200922.1278255c.jar.bak b/lib/bdledger-java-sdk-dev-200922.1278255c.jar.bak
new file mode 100644
index 0000000..a0d0d4a
Binary files /dev/null and b/lib/bdledger-java-sdk-dev-200922.1278255c.jar.bak differ
diff --git a/lib/bdledger-java-sdk-tb-0621.jar.bak b/lib/bdledger-java-sdk-tb-0621.jar.bak
new file mode 100644
index 0000000..221431c
Binary files /dev/null and b/lib/bdledger-java-sdk-tb-0621.jar.bak differ
diff --git a/lib/bdledger-java-sdk-tb-20200722.jar.bak b/lib/bdledger-java-sdk-tb-20200722.jar.bak
new file mode 100644
index 0000000..130a7ed
Binary files /dev/null and b/lib/bdledger-java-sdk-tb-20200722.jar.bak differ
diff --git a/src/main/analysis/org/bdware/analysis/AnalysisResult.java b/src/main/analysis/org/bdware/analysis/AnalysisResult.java
new file mode 100644
index 0000000..bdbc01a
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/AnalysisResult.java
@@ -0,0 +1,18 @@
+package org.bdware.analysis;
+
+import org.objectweb.asm.tree.AbstractInsnNode;
+
+public abstract class AnalysisResult {
+	public AnalysisResult() {
+	}
+
+	public abstract AnalysisResult merge(AbstractInsnNode insn);
+
+	public abstract void printResult();
+
+	public abstract boolean covers(AnalysisResult result);
+
+	public abstract void mergeResult(AnalysisResult r);
+
+	public abstract AnalysisResult clone();
+}
\ No newline at end of file
diff --git a/src/main/analysis/org/bdware/analysis/AnalysisTarget.java b/src/main/analysis/org/bdware/analysis/AnalysisTarget.java
new file mode 100644
index 0000000..0a8465d
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/AnalysisTarget.java
@@ -0,0 +1,7 @@
+package org.bdware.analysis;
+
+public interface AnalysisTarget {
+	public boolean inList();
+
+	public void setInList(boolean b);
+}
diff --git a/src/main/analysis/org/bdware/analysis/BasicBlock.java b/src/main/analysis/org/bdware/analysis/BasicBlock.java
new file mode 100644
index 0000000..4d31245
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/BasicBlock.java
@@ -0,0 +1,49 @@
+package org.bdware.analysis;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.objectweb.asm.tree.AbstractInsnNode;
+
+public class BasicBlock {
+	public List<AbstractInsnNode> list;
+	public int blockID;
+	public int lineNum = -1;
+    public int insnCount;
+
+    public BasicBlock(int id) {
+		list = new ArrayList<>();
+		blockID = id;
+	}
+
+	public void add(AbstractInsnNode insn) {
+		list.add(insn);
+	}
+
+	public int size() {
+
+		return list.size();
+	}
+
+	public List<AbstractInsnNode> getInsn() {
+		return list;
+	}
+
+	boolean inList = false;
+
+	public AbstractInsnNode lastInsn() {
+		return list.get(list.size() - 1);
+	}
+
+	public void setLineNum(int line) {
+		lineNum = line;
+	}
+
+	public boolean inList() {
+		return inList;
+	}
+
+	public void setInList(boolean b) {
+		inList = b;
+	}
+}
diff --git a/src/main/analysis/org/bdware/analysis/BreadthFirstSearch.java b/src/main/analysis/org/bdware/analysis/BreadthFirstSearch.java
new file mode 100644
index 0000000..20a040d
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/BreadthFirstSearch.java
@@ -0,0 +1,58 @@
+package org.bdware.analysis;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public abstract class BreadthFirstSearch<R extends AnalysisResult, T extends AnalysisTarget> {
+	public Map<T, AnalysisResult> results;
+	protected List<T> toAnalysis;
+
+	public abstract R execute(T t);
+
+	public abstract Collection<T> getSuc(T t);
+
+	public BreadthFirstSearch() {
+		results = new HashMap<T, AnalysisResult>();
+	}
+
+	public Map<T, AnalysisResult> analysis() {
+		results.clear();
+		T current = null;
+		for (int i = 0; i < toAnalysis.size(); i++) {
+			current = toAnalysis.get(i);
+			current.setInList(false);
+			AnalysisResult preResult = results.get(current);
+			AnalysisResult sucResult = execute(current);
+
+			if (preResult == null || !preResult.covers(sucResult)) {
+				AnalysisResult cloneResult = sucResult.clone();
+				if (cloneResult != null) {
+					results.put(current, cloneResult);
+				}
+				Collection<T> sucs = getSuc(current);
+				for (T next : sucs) {
+
+					if (toAnalysis.contains(next)) {
+						//results.remove(next);
+						//toAnalysis.remove(next);
+					}
+					if (!next.inList()) {
+						toAnalysis.add(next);
+						next.setInList(true);
+					}
+				}
+			}
+		}
+		return results;
+	}
+
+	public int getListLength() {
+		return toAnalysis.size();
+	}
+
+	public void setToAnalysis(List<T> l) {
+		toAnalysis = l;
+	}
+}
diff --git a/src/main/analysis/org/bdware/analysis/CFGraph.java b/src/main/analysis/org/bdware/analysis/CFGraph.java
new file mode 100644
index 0000000..5648ff3
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/CFGraph.java
@@ -0,0 +1,581 @@
+package org.bdware.analysis;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.objectweb.asm.*;
+import org.objectweb.asm.tree.*;
+
+import java.util.*;
+
+public abstract class CFGraph {
+    private static final Logger LOGGER = LogManager.getLogger(CFGraph.class);
+    private final Map<BasicBlock, Set<BasicBlock>> preBlock;
+    private final Map<Label, BasicBlock> labelToBB;
+    private final Map<Label, Integer> labelOrder = new HashMap<>();
+    protected List<BasicBlock> basicBlocks;
+    protected Map<BasicBlock, Set<BasicBlock>> sucBlock;
+    MethodNode methodNode;
+    // Pass2: build edges
+    // type2(canThrow) and catchLabels
+    // type3 and target labels
+    // type4 and catchLabels
+//    private List<TryCatchBlockNode> tryCacheList;
+    // Pass1: build basic blocks
+    // create a new block when:
+    // 1.starts with Label(can jump)
+    // 2.ends with CanReturn/CanThrow Insn
+    // 3.ends with CanBranch(IF/Switch)
+    // 4.ends with MethodInvoke
+    // At the same time build edges between:
+    // type1 and pre
+    // type2 and endBlock
+    // type3 and suc
+    // type4 and endBlock
+    // type4 and suc
+
+    public CFGraph(MethodNode mn) {
+        basicBlocks = new ArrayList<>();
+        preBlock = new HashMap<>();
+        sucBlock = new HashMap<>();
+        labelToBB = new HashMap<>();
+        methodNode = mn;
+        buildBasicBlock(mn.instructions, mn.tryCatchBlocks);
+    }
+
+    private void addEdge(BasicBlock pre, BasicBlock suc) {
+        Set<BasicBlock> pres = getPreBlocks(suc);
+        pres.add(pre);
+        Set<BasicBlock> sucs = getSucBlocks(pre);
+        sucs.add(suc);
+    }
+
+    public Set<BasicBlock> getSucBlocks(BasicBlock pre) {
+        if (null == sucBlock.get(pre)) {
+            Set<BasicBlock> ret = new HashSet<>();
+            sucBlock.put(pre, ret);
+            return ret;
+        }
+        return sucBlock.get(pre);
+    }
+
+    public Set<BasicBlock> getPreBlocks(BasicBlock suc) {
+        if (preBlock.get(suc) == null) {
+            Set<BasicBlock> ret = new HashSet<>();
+            preBlock.put(suc, ret);
+            return ret;
+        }
+        return preBlock.get(suc);
+    }
+
+    public abstract BasicBlock getBasicBlock(int id);
+
+    private void buildBasicBlock(InsnList instructions, List<TryCatchBlockNode> tryCatchBlocks) {
+        InsnPass1Visitor visitor = new InsnPass1Visitor(Opcodes.ASM4);
+        visitor.currBlock = getBasicBlock(0);
+        basicBlocks.add(visitor.currBlock);
+        for (int i = 0; i < instructions.size(); i++) {
+            AbstractInsnNode insn = instructions.get(i);
+            visitor.setCurrInsn(insn);
+            insn.accept(visitor);
+        }
+        visitor.visitEnd();
+        List<BasicBlock> merged = new ArrayList<>();
+        for (BasicBlock bb : basicBlocks)
+            if (bb.list.size() > 0)
+                merged.add(bb);
+        basicBlocks = merged;
+        InsnPass2Visitor pass2 = new InsnPass2Visitor(Opcodes.ASM4);
+        pass2.tryCatchBlocks = tryCatchBlocks;
+        for (int i = 0; i < basicBlocks.size(); i++) {
+            pass2.blockid = i;
+            BasicBlock bb = basicBlocks.get(i);
+            bb.blockID = i;
+            if (bb.size() > 0)
+                if (bb.list.get(0) instanceof LabelNode) {
+                    pass2.preLabel = ((LabelNode) bb.list.get(0)).getLabel();
+                }
+            for (AbstractInsnNode node : bb.list) {
+                node.accept(pass2);
+            }
+        }
+        int preLine = -1;
+        for (BasicBlock block : basicBlocks) {
+            if (block.lineNum != -1) {
+                preLine = block.lineNum;
+            } else
+                block.lineNum = preLine;
+        }
+    }
+
+    public void printSelf() {
+        InsnPrinter printer = new InsnPrinter(Opcodes.ASM4, System.out);
+        printer.setLabelOrder(getLabelOrder());
+        LOGGER.info("isStatic: " + ((methodNode.access & Opcodes.ACC_STATIC) > 0)
+                + "\tMethod:" + methodNode.name + "  " + methodNode.desc);
+        LOGGER.info(methodNode.maxLocals + "  " + methodNode.maxStack);
+        StringBuilder log = new StringBuilder();
+        for (BasicBlock bb : basicBlocks) {
+            log.append("B").append(bb.blockID);
+            if (getSucBlocks(bb).size() > 0) {
+                log.append(" -->");
+            }
+            for (BasicBlock suc : getSucBlocks(bb)) {
+                log.append(" B").append(suc.blockID);
+            }
+            for (AbstractInsnNode an : bb.list) {
+                an.accept(printer);
+            }
+            log.append("\n");
+        }
+        LOGGER.info(log.substring(0, log.length() - 1));
+    }
+
+    public Map<Label, Integer> getLabelOrder() {
+        return labelOrder;
+    }
+
+    public BasicBlock getBasicBlockAt(int i) {
+        return basicBlocks.get(i);
+    }
+
+    public int getBasicBlockSize() {
+        return basicBlocks.size();
+    }
+
+    public MethodNode getMethodNode() {
+        return methodNode;
+    }
+
+    public BasicBlock getBasicBlockByLabel(Label l) {
+        return labelToBB.get(l);
+    }
+
+    private class InsnPass1Visitor extends MethodVisitor {
+        int count = 0;
+        AbstractInsnNode currInsn;
+        BasicBlock currBlock;
+
+        // -------------------------------------------------------------------------
+        // Normal instructions
+        // -------------------------------------------------------------------------
+        BasicBlock endBlock = getEndBlock();
+
+        public InsnPass1Visitor(int api) {
+            super(api);
+        }
+
+        public void visitFrame(int type, int nLocal, Object[] local, int nStack, Object[] stack) {
+            currBlock.add(currInsn);
+        }
+
+        /**
+         * Visits a zero operand instruction.
+         *
+         * @param opcode the opcode of the instruction to be visited. This opcode is
+         *               either NOP, ACONST_NULL, ICONST_M1, ICONST_0, ICONST_1,
+         *               ICONST_2, ICONST_3, ICONST_4, ICONST_5, LCONST_0, LCONST_1,
+         *               FCONST_0, FCONST_1, FCONST_2, DCONST_0, DCONST_1, IALOAD,
+         *               LALOAD, FALOAD, DALOAD, AALOAD, BALOAD, CALOAD, SALOAD,
+         *               IASTORE, LASTORE, FASTORE, DASTORE, AASTORE, BASTORE, CASTORE,
+         *               SASTORE, POP, POP2, DUP, DUP_X1, DUP_X2, DUP2, DUP2_X1,
+         *               DUP2_X2, SWAP, IADD, LADD, FADD, DADD, ISUB, LSUB, FSUB, DSUB,
+         *               IMUL, LMUL, FMUL, DMUL, IDIV, LDIV, FDIV, DDIV, IREM, LREM,
+         *               FREM, DREM, INEG, LNEG, FNEG, DNEG, ISHL, LSHL, ISHR, LSHR,
+         *               IUSHR, LUSHR, IAND, LAND, IOR, LOR, IXOR, LXOR, I2L, I2F, I2D,
+         *               L2I, L2F, L2D, F2I, F2L, F2D, D2I, D2L, D2F, I2B, I2C, I2S,
+         *               LCMP, FCMPL, FCMPG, DCMPL, DCMPG, IRETURN, LRETURN, FRETURN,
+         *               DRETURN, ARETURN, RETURN, ARRAYLENGTH, ATHROW, MONITORENTER, or
+         *               MONITOREXIT.
+         */
+        public void visitInsn(int opcode) {
+            currBlock.add(currInsn);
+            if (OpInfo.ops[opcode].canReturn()) {
+                addEdge(currBlock, endBlock);
+                currBlock = getBasicBlock(basicBlocks.size());
+                basicBlocks.add(currBlock);
+            }
+        }
+
+        /**
+         * Visits an instruction with a single int operand.
+         *
+         * @param opcode  the opcode of the instruction to be visited. This opcode is
+         *                either BIPUSH, SIPUSH or NEWARRAY.
+         * @param operand the operand of the instruction to be visited.<br>
+         *                When opcode is BIPUSH, operand value should be between
+         *                Byte.MIN_VALUE and Byte.MAX_VALUE.<br>
+         *                When opcode is SIPUSH, operand value should be between
+         *                Short.MIN_VALUE and Short.MAX_VALUE.<br>
+         *                When opcode is NEWARRAY, operand value should be one of
+         *                {@link Opcodes#T_BOOLEAN}, {@link Opcodes#T_CHAR},
+         *                {@link Opcodes#T_FLOAT}, {@link Opcodes#T_DOUBLE},
+         *                {@link Opcodes#T_BYTE}, {@link Opcodes#T_SHORT},
+         *                {@link Opcodes#T_INT} or {@link Opcodes#T_LONG}.
+         */
+        public void visitIntInsn(int opcode, int operand) {
+            currBlock.add(currInsn);
+        }
+
+        /**
+         * Visits a local variable instruction. A local variable instruction is an
+         * instruction that loads or stores the value of a local variable.
+         *
+         * @param opcode the opcode of the local variable instruction to be visited.
+         *               This opcode is either ILOAD, LLOAD, FLOAD, DLOAD, ALOAD,
+         *               ISTORE, LSTORE, FSTORE, DSTORE, ASTORE or RET.
+         * @param var    the operand of the instruction to be visited. This operand is
+         *               the index of a local variable.
+         */
+        public void visitVarInsn(int opcode, int var) {
+            currBlock.add(currInsn);
+        }
+
+        /**
+         * Visits a type instruction. A type instruction is an instruction that takes
+         * the internal name of a class as parameter.
+         *
+         * @param opcode the opcode of the type instruction to be visited. This opcode
+         *               is either NEW, ANEWARRAY, CHECKCAST or INSTANCEOF.
+         * @param type   the operand of the instruction to be visited. This operand must
+         *               be the internal name of an object or array class (see
+         *               {@link Type#getInternalName() getInternalName}).
+         */
+        public void visitTypeInsn(int opcode, String type) {
+            currBlock.add(currInsn);
+        }
+
+        /**
+         * Visits a field instruction. A field instruction is an instruction that loads
+         * or stores the value of a field of an object.
+         *
+         * @param opcode the opcode of the type instruction to be visited. This opcode
+         *               is either GETSTATIC, PUTSTATIC, GETFIELD or PUTFIELD.
+         * @param owner  the internal name of the field's owner class (see
+         *               {@link Type#getInternalName() getInternalName}).
+         * @param name   the field's name.
+         * @param desc   the field's descriptor (see {@link Type Type}).
+         */
+        public void visitFieldInsn(int opcode, String owner, String name, String desc) {
+            currBlock.add(currInsn);
+        }
+
+        /**
+         * Visits a method instruction. A method instruction is an instruction that
+         * invokes a method.
+         *
+         * @param opcode the opcode of the type instruction to be visited. This opcode
+         *               is either INVOKEVIRTUAL, INVOKESPECIAL, INVOKESTATIC or
+         *               INVOKEINTERFACE.
+         * @param owner  the internal name of the method's owner class (see
+         *               {@link Type#getInternalName() getInternalName}).
+         * @param name   the method's name.
+         * @param desc   the method's descriptor (see {@link Type Type}).
+         */
+        public void visitMethodInsn(int opcode, String owner, String name, String desc) {
+            currBlock.add(currInsn);
+            addEdge(currBlock, endBlock);
+            BasicBlock nextBlock = getBasicBlock(basicBlocks.size());
+            addEdge(currBlock, nextBlock);
+            currBlock = nextBlock;
+            basicBlocks.add(currBlock);
+            // TODO add edges to try catch blocks!
+        }
+
+        // -------------------------------------------------------------------------
+        // Special instructions
+        // -------------------------------------------------------------------------
+
+        /**
+         * Visits an invokedynamic instruction.
+         *
+         * @param name    the method's name.
+         * @param desc    the method's descriptor (see {@link Type Type}).
+         * @param bsm     the bootstrap method.
+         * @param bsmArgs the bootstrap method constant arguments. Each argument must be
+         *                an {@link Integer}, {@link Float}, {@link Long},
+         *                {@link Double}, {@link String}, {@link Type} or {@link Handle}
+         *                value. This method is allowed to modify the content of the
+         *                array so a caller should expect that this array may change.
+         */
+        public void visitInvokeDynamicInsn(String name, String desc, Handle bsm, Object... bsmArgs) {
+
+            // TODO add edges to try catch blocks!
+            currBlock.add(currInsn);
+            addEdge(currBlock, endBlock);
+            BasicBlock nextBlock = getBasicBlock(basicBlocks.size());
+            addEdge(currBlock, nextBlock);
+            currBlock = nextBlock;
+            basicBlocks.add(currBlock);
+        }
+
+        /**
+         * Visits a jump instruction. A jump instruction is an instruction that may jump
+         * to another instruction.
+         *
+         * @param opcode the opcode of the type instruction to be visited. This opcode
+         *               is either IFEQ, IFNE, IFLT, IFGE, IFGT, IFLE, IF_ICMPEQ,
+         *               IF_ICMPNE, IF_ICMPLT, IF_ICMPGE, IF_ICMPGT, IF_ICMPLE,
+         *               IF_ACMPEQ, IF_ACMPNE, GOTO, JSR, IFNULL or IFNONNULL.
+         * @param label  the operand of the instruction to be visited. This operand is a
+         *               label that designates the instruction to which the jump
+         *               instruction may jump.
+         */
+        public void visitJumpInsn(int opcode, Label label) {
+            currBlock.add(currInsn);
+            BasicBlock nextBlock = getBasicBlock(basicBlocks.size());
+
+            if (!OpInfo.ops[opcode].toString().contains("goto"))
+                addEdge(currBlock, nextBlock);
+            currBlock = nextBlock;
+            basicBlocks.add(currBlock);
+        }
+
+        /**
+         * Visits a label. A label designates the instruction that will be visited just
+         * after it.
+         *
+         * @param label a {@link Label Label} object.
+         */
+        public void visitLabel(Label label) {
+            getLabelOrder().put(label, count++);
+            if (currBlock.size() > 0) {
+                BasicBlock pre = currBlock;
+                currBlock = getBasicBlock(basicBlocks.size());
+                basicBlocks.add(currBlock);
+                addEdge(pre, currBlock);
+            }
+            currBlock.add(currInsn);
+            labelToBB.put(label, currBlock);
+        }
+
+        /**
+         * Visits a LDC instruction. Note that new constant types may be added in future
+         * versions of the Java Virtual Machine. To easily detect new constant types,
+         * implementations of this method should check for unexpected constant types,
+         * like this:
+         *
+         * <pre>
+         * if (cst instanceof Integer) {
+         * 	// ...
+         * } else if (cst instanceof Float) {
+         * 	// ...
+         * } else if (cst instanceof Long) {
+         * 	// ...
+         * } else if (cst instanceof Double) {
+         * 	// ...
+         * } else if (cst instanceof String) {
+         * 	// ...
+         * } else if (cst instanceof Type) {
+         * 	int sort = ((Type) cst).getSort();
+         * 	if (sort == Type.OBJECT) {
+         * 		// ...
+         *    } else if (sort == Type.ARRAY) {
+         * 		// ...
+         *    } else if (sort == Type.METHOD) {
+         * 		// ...
+         *    } else {
+         * 		// throw an exception
+         *    }
+         * } else if (cst instanceof Handle) {
+         * 	// ...
+         * } else {
+         * 	// throw an exception
+         * }
+         * </pre>
+         *
+         * @param cst the constant to be loaded on the stack. This parameter must be a
+         *            non null {@link Integer}, a {@link Float}, a {@link Long}, a
+         *            {@link Double}, a {@link String}, a {@link Type} of OBJECT or
+         *            ARRAY sort for <tt>.class</tt> constants, for classes whose
+         *            version is 49.0, a {@link Type} of METHOD sort or a {@link Handle}
+         *            for MethodType and MethodHandle constants, for classes whose
+         *            version is 51.0.
+         */
+        public void visitLdcInsn(Object cst) {
+            currBlock.add(currInsn);
+        }
+
+        /**
+         * Visits an IINC instruction.
+         *
+         * @param var       index of the local variable to be incremented.
+         * @param increment amount to increment the local variable by.
+         */
+        public void visitIincInsn(int var, int increment) {
+            currBlock.add(currInsn);
+        }
+        // -------------------------------------------------------------------------
+        // Exceptions table entries, debug information, max stack and max locals
+        // -------------------------------------------------------------------------
+
+        /**
+         * Visits a TABLESWITCH instruction.
+         *
+         * @param min    the minimum key value.
+         * @param max    the maximum key value.
+         * @param dflt   beginning of the default handler block.
+         * @param labels beginnings of the handler blocks. <tt>labels[i]</tt> is the
+         *               beginning of the handler block for the <tt>min + i</tt> key.
+         */
+        public void visitTableSwitchInsn(int min, int max, Label dflt, Label... labels) {
+            currBlock.add(currInsn);
+            currBlock = getBasicBlock(basicBlocks.size());
+            basicBlocks.add(currBlock);
+        }
+
+        /**
+         * Visits a LOOKUPSWITCH instruction.
+         *
+         * @param dflt   beginning of the default handler block.
+         * @param keys   the values of the keys.
+         * @param labels beginnings of the handler blocks. <tt>labels[i]</tt> is the
+         *               beginning of the handler block for the <tt>keys[i]</tt> key.
+         */
+        public void visitLookupSwitchInsn(Label dflt, int[] keys, Label[] labels) {
+            currBlock.add(currInsn);
+            currBlock = getBasicBlock(basicBlocks.size());
+            basicBlocks.add(currBlock);
+        }
+
+        /**
+         * Visits a MULTIANEWARRAY instruction.
+         *
+         * @param desc an array type descriptor (see {@link Type Type}).
+         * @param dims number of dimensions of the array to allocate.
+         */
+        public void visitMultiANewArrayInsn(String desc, int dims) {
+            currBlock.add(currInsn);
+        }
+
+        /**
+         * Visits a local variable declaration.
+         *
+         * @param name      the name of a local variable.
+         * @param desc      the type descriptor of this local variable.
+         * @param signature the type signature of this local variable. May be
+         *                  <tt>null</tt> if the local variable type does not use
+         *                  generic types.
+         * @param start     the first instruction corresponding to the scope of this
+         *                  local variable (inclusive).
+         * @param end       the last instruction corresponding to the scope of this
+         *                  local variable (exclusive).
+         * @param index     the local variable's index.
+         * @throws IllegalArgumentException if one of the labels has not already been
+         *                                  visited by this visitor (by the
+         *                                  {@link #visitLabel visitLabel} method).
+         */
+        public void visitLocalVariable(String name, String desc, String signature, Label start, Label end, int index) {
+            currBlock.add(currInsn);
+        }
+
+        /**
+         * Visits a line number declaration.
+         *
+         * @param line  a line number. This number refers to the source file from which
+         *              the class was compiled.
+         * @param start the first instruction corresponding to this line number.
+         * @throws IllegalArgumentException if <tt>start</tt> has not already been
+         *                                  visited by this visitor (by the
+         *                                  {@link #visitLabel visitLabel} method).
+         */
+        public void visitLineNumber(int line, Label start) {
+            currBlock.add(currInsn);
+        }
+
+        public void setCurrInsn(AbstractInsnNode insn) {
+            currInsn = insn;
+        }
+
+        private BasicBlock getEndBlock() {
+            BasicBlock ret = getBasicBlock(-1);
+            Label l = new Label();
+            ret.add(new LabelNode(l));
+            labelToBB.put(l, ret);
+            return ret;
+        }
+
+        public void visitEnd() {
+            basicBlocks.add(endBlock);
+            getLabelOrder().put(((LabelNode) (endBlock.list.get(0))).getLabel(), count++);
+
+        }
+    }
+
+    private class InsnPass2Visitor extends MethodVisitor {
+        int blockid;
+        Label preLabel;
+        List<TryCatchBlockNode> tryCatchBlocks;
+
+        public InsnPass2Visitor(int api) {
+            super(api);
+        }
+
+        public void addTryCatchNodes() {
+            for (TryCatchBlockNode node : tryCatchBlocks) {
+                Label l1 = node.start.getLabel();
+                Label l2 = node.end.getLabel();
+                Label l3 = node.handler.getLabel();
+                if (inLabel(l1, l2, preLabel))
+                    addEdge(labelToBB.get(preLabel), labelToBB.get(l3));
+            }
+        }
+
+        @Override
+        public void visitLineNumber(int line, Label start) {
+            BasicBlock currBlock = basicBlocks.get(blockid);
+            currBlock.setLineNum(line);
+        }
+
+        @Override
+        public void visitJumpInsn(int opcode, Label label) {
+            BasicBlock currBlock = basicBlocks.get(blockid);
+            BasicBlock targetBlock = labelToBB.get(label);
+            addEdge(currBlock, targetBlock);
+        }
+
+        @Override
+        public void visitTableSwitchInsn(int min, int max, Label dflt, Label... labels) {
+            BasicBlock currBlock = basicBlocks.get(blockid);
+            BasicBlock targetBlock = labelToBB.get(dflt);
+            addEdge(currBlock, targetBlock);
+            for (Label label : labels) {
+                targetBlock = labelToBB.get(label);
+                addEdge(currBlock, targetBlock);
+            }
+        }
+
+        @Override
+
+        public void visitLookupSwitchInsn(Label dflt, int[] keys, Label[] labels) {
+            BasicBlock currBlock = basicBlocks.get(blockid);
+            BasicBlock targetBlock = labelToBB.get(dflt);
+            addEdge(currBlock, targetBlock);
+            for (Label label : labels) {
+                targetBlock = labelToBB.get(label);
+                addEdge(currBlock, targetBlock);
+            }
+        }
+
+        @Override
+        public void visitInvokeDynamicInsn(String name, String desc, Handle bsm, Object... bsmArgs) {
+            addTryCatchNodes();
+        }
+
+        private boolean inLabel(Label start, Label end, Label query) {
+            int s = getLabelOrder().get(start);
+            int e = getLabelOrder().get(end);
+            int m = getLabelOrder().get(query);
+            return (m >= s && m < e);
+        }
+
+        public void visitMethodInsn(int opcode, String owner, String name, String desc) {
+            addTryCatchNodes();
+        }
+
+        public void visitInsn(int opcode) {
+            if (OpInfo.ops[opcode].toString().contains("throw")) {
+                addTryCatchNodes();
+            }
+        }
+    }
+}
diff --git a/src/main/analysis/org/bdware/analysis/CFType.java b/src/main/analysis/org/bdware/analysis/CFType.java
new file mode 100644
index 0000000..82bd336
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/CFType.java
@@ -0,0 +1,10 @@
+package org.bdware.analysis;
+
+public interface CFType {
+	public static final int kInstrCanBranch = 1; // conditional or unconditional branch
+	public static final int kInstrCanContinue = 1 << 1; // flow can continue to next statement
+	public static final int kInstrCanSwitch = 1 << 2; // switch
+	public static final int kInstrCanThrow = 1 << 3; // could cause an exception to be thrown
+	public static final int kInstrCanReturn = 1 << 4; // returns, no additional statements
+	public static final int kInstrInvoke = 1 << 5; // a flavor of invoke
+}
diff --git a/src/main/analysis/org/bdware/analysis/FrontCF.java b/src/main/analysis/org/bdware/analysis/FrontCF.java
new file mode 100644
index 0000000..e7cfb43
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/FrontCF.java
@@ -0,0 +1,138 @@
+package org.bdware.analysis;
+
+import java.io.FileNotFoundException;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.AbstractInsnNode;
+
+import org.bdware.analysis.BasicBlock;
+import org.bdware.analysis.CFGraph;
+import org.bdware.analysis.InsnPrinter;
+import org.bdware.analysis.OpInfo;
+import org.bdware.analysis.taint.TaintBB;
+import org.bdware.analysis.taint.TaintCFG;
+
+public class FrontCF {
+	String methodName;
+	public List<FrontBB> blocks;
+	public List<FrontEdge> edges;
+	public String ret;
+	public String finalRet;
+	transient InsnPrinter printer;
+	transient ArrayPs ps;
+
+	static class ArrayPs extends PrintStream {
+		List<String> content;
+
+		public ArrayPs() throws FileNotFoundException {
+			super("/dev/null");
+		}
+
+		public void println(String str) {
+			if (content != null)
+				content.add(str);
+		}
+	}
+
+	public FrontCF(CFGraph graph) {
+		blocks = new ArrayList<>();
+		edges = new ArrayList<>();
+		try {
+			ps = new ArrayPs();
+		} catch (FileNotFoundException e) {
+			e.printStackTrace();
+		}
+		printer = new InsnPrinter(Opcodes.ASM4, ps);
+		printer.setLabelOrder(graph.getLabelOrder());
+	}
+
+	public static class FrontBB {
+		String type;
+		String name;  //BlockNumber
+		List<String> stmts; //BlockInstructions
+		String original;
+		String result; //preResult
+		String blockDep;
+	}
+
+	public static class EdgeLabel {
+		String label;
+	}
+
+	public static class FrontEdge {
+		String from, to;
+		EdgeLabel label;
+	}
+
+	public void addBB(BasicBlock bb, String original, List<Integer> ids, TaintCFG cfg) {
+		FrontBB fb = new FrontBB();
+		blocks.add(fb);
+		fb.name = "B" + bb.blockID;
+		List<AbstractInsnNode> insnList = bb.getInsn();
+		fb.type = "Continuous";
+		fb.original = original;
+		
+		//added
+		TaintBB b = (TaintBB) bb;
+		//if(b.preResult != null)
+			//b.preResult.printResult();
+		fb.result = b.getResult();
+		if(ids == null)
+			fb.blockDep = "";
+		else{
+			StringBuilder sb = new StringBuilder();
+			//sb.append("Dependence: ");
+			for(Integer id : ids) {			
+				//sb.append("B"+ id +" ");	
+				TaintBB tb = (TaintBB) cfg.getBasicBlockAt(id);
+				sb.append(tb.preResult.frame.getStack(0).toReadableTaint());
+			}
+			fb.blockDep = sb.toString();		
+		}
+		if (insnList != null && insnList.size() > 0) {
+			AbstractInsnNode lastStmt = insnList.get(insnList.size() - 1);
+			if (lastStmt.getOpcode() >= 0) {
+				OpInfo info = OpInfo.ops[lastStmt.getOpcode()];
+				if (info.canBranch() || info.canSwitch()) {
+					fb.type = "Branch";
+				}
+			}
+			fb.stmts = new ArrayList<String>();
+			ps.content = fb.stmts;
+			for (AbstractInsnNode node : insnList) {
+				node.accept(printer);
+			}
+		}
+	}
+
+	public void addEdge(BasicBlock bb, BasicBlock suc) {
+		FrontEdge edge = new FrontEdge();
+		List<AbstractInsnNode> insnList = bb.getInsn();
+		edge.label = new EdgeLabel();
+		edge.label.label = "e";
+		AbstractInsnNode lastStmt = insnList.get(insnList.size() - 1);
+		boolean ignore = false;
+		if (lastStmt.getOpcode() >= 0) {
+			OpInfo info = OpInfo.ops[lastStmt.getOpcode()];
+			if (info.canBranch() && info.toString().startsWith("if")) {
+				if (suc.blockID == bb.blockID + 1)
+					edge.label.label = "false";
+				else
+					edge.label.label = "true";
+			}
+			if (info.canThrow() && info.toString().startsWith("invoke")) {
+				if (suc.blockID != bb.blockID + 1) {
+					ignore = true;
+				}
+			}
+		}
+		edge.from = "B" + bb.blockID;
+		edge.to = "B" + suc.blockID;
+		if (!ignore)
+			edges.add(edge);
+
+	}
+}
diff --git a/src/main/analysis/org/bdware/analysis/InsnPrinter.java b/src/main/analysis/org/bdware/analysis/InsnPrinter.java
new file mode 100644
index 0000000..7079c8e
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/InsnPrinter.java
@@ -0,0 +1,297 @@
+package org.bdware.analysis;
+
+import java.io.PrintStream;
+import java.util.Map;
+
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+
+public class InsnPrinter extends MethodVisitor {
+	PrintStream ps;
+	private Map<Label, Integer> labelOrder;
+
+	public InsnPrinter(int api, PrintStream ps) {
+		super(api);
+		this.ps = ps;
+		// TODO Auto-generated constructor stub
+	}
+	// -------------------------------------------------------------------------
+	// Normal instructions
+	// -------------------------------------------------------------------------
+
+	/**
+	 * Visits a zero operand instruction.
+	 * 
+	 * @param opcode the opcode of the instruction to be visited. This opcode is
+	 *               either NOP, ACONST_NULL, ICONST_M1, ICONST_0, ICONST_1,
+	 *               ICONST_2, ICONST_3, ICONST_4, ICONST_5, LCONST_0, LCONST_1,
+	 *               FCONST_0, FCONST_1, FCONST_2, DCONST_0, DCONST_1, IALOAD,
+	 *               LALOAD, FALOAD, DALOAD, AALOAD, BALOAD, CALOAD, SALOAD,
+	 *               IASTORE, LASTORE, FASTORE, DASTORE, AASTORE, BASTORE, CASTORE,
+	 *               SASTORE, POP, POP2, DUP, DUP_X1, DUP_X2, DUP2, DUP2_X1,
+	 *               DUP2_X2, SWAP, IADD, LADD, FADD, DADD, ISUB, LSUB, FSUB, DSUB,
+	 *               IMUL, LMUL, FMUL, DMUL, IDIV, LDIV, FDIV, DDIV, IREM, LREM,
+	 *               FREM, DREM, INEG, LNEG, FNEG, DNEG, ISHL, LSHL, ISHR, LSHR,
+	 *               IUSHR, LUSHR, IAND, LAND, IOR, LOR, IXOR, LXOR, I2L, I2F, I2D,
+	 *               L2I, L2F, L2D, F2I, F2L, F2D, D2I, D2L, D2F, I2B, I2C, I2S,
+	 *               LCMP, FCMPL, FCMPG, DCMPL, DCMPG, IRETURN, LRETURN, FRETURN,
+	 *               DRETURN, ARETURN, RETURN, ARRAYLENGTH, ATHROW, MONITORENTER, or
+	 *               MONITOREXIT.
+	 */
+	public void visitInsn(int opcode) {
+		ps.println(OpInfo.ops[opcode].toString());
+	}
+
+	/**
+	 * Visits an instruction with a single int operand.
+	 * 
+	 * @param opcode  the opcode of the instruction to be visited. This opcode is
+	 *                either BIPUSH, SIPUSH or NEWARRAY.
+	 * @param operand the operand of the instruction to be visited.<br>
+	 *                When opcode is BIPUSH, operand value should be between
+	 *                Byte.MIN_VALUE and Byte.MAX_VALUE.<br>
+	 *                When opcode is SIPUSH, operand value should be between
+	 *                Short.MIN_VALUE and Short.MAX_VALUE.<br>
+	 *                When opcode is NEWARRAY, operand value should be one of
+	 *                {@link Opcodes#T_BOOLEAN}, {@link Opcodes#T_CHAR},
+	 *                {@link Opcodes#T_FLOAT}, {@link Opcodes#T_DOUBLE},
+	 *                {@link Opcodes#T_BYTE}, {@link Opcodes#T_SHORT},
+	 *                {@link Opcodes#T_INT} or {@link Opcodes#T_LONG}.
+	 */
+	public void visitIntInsn(int opcode, int operand) {
+		ps.println(OpInfo.ops[opcode].toString() + " " + operand);
+	}
+
+	/**
+	 * Visits a local variable instruction. A local variable instruction is an
+	 * instruction that loads or stores the value of a local variable.
+	 * 
+	 * @param opcode the opcode of the local variable instruction to be visited.
+	 *               This opcode is either ILOAD, LLOAD, FLOAD, DLOAD, ALOAD,
+	 *               ISTORE, LSTORE, FSTORE, DSTORE, ASTORE or RET.
+	 * @param var    the operand of the instruction to be visited. This operand is
+	 *               the index of a local variable.
+	 */
+	public void visitVarInsn(int opcode, int var) {
+		ps.println(OpInfo.ops[opcode].toString() + " " + var);
+
+	}
+
+	/**
+	 * Visits a type instruction. A type instruction is an instruction that takes
+	 * the internal name of a class as parameter.
+	 * 
+	 * @param opcode the opcode of the type instruction to be visited. This opcode
+	 *               is either NEW, ANEWARRAY, CHECKCAST or INSTANCEOF.
+	 * @param type   the operand of the instruction to be visited. This operand must
+	 *               be the internal name of an object or array class (see
+	 *               {@link Type#getInternalName() getInternalName}).
+	 */
+	public void visitTypeInsn(int opcode, String type) {
+		ps.println(OpInfo.ops[opcode].toString() + " " + type);
+
+	}
+
+	/**
+	 * Visits a field instruction. A field instruction is an instruction that loads
+	 * or stores the value of a field of an object.
+	 * 
+	 * @param opcode the opcode of the type instruction to be visited. This opcode
+	 *               is either GETSTATIC, PUTSTATIC, GETFIELD or PUTFIELD.
+	 * @param owner  the internal name of the field's owner class (see
+	 *               {@link Type#getInternalName() getInternalName}).
+	 * @param name   the field's name.
+	 * @param desc   the field's descriptor (see {@link Type Type}).
+	 */
+	public void visitFieldInsn(int opcode, String owner, String name, String desc) {
+		ps.println(OpInfo.ops[opcode].toString() + " " + owner + " " + name + " " + desc);
+
+	}
+
+	/**
+	 * Visits a method instruction. A method instruction is an instruction that
+	 * invokes a method.
+	 * 
+	 * @param opcode the opcode of the type instruction to be visited. This opcode
+	 *               is either INVOKEVIRTUAL, INVOKESPECIAL, INVOKESTATIC or
+	 *               INVOKEINTERFACE.
+	 * @param owner  the internal name of the method's owner class (see
+	 *               {@link Type#getInternalName() getInternalName}).
+	 * @param name   the method's name.
+	 * @param desc   the method's descriptor (see {@link Type Type}).
+	 */
+	public void visitMethodInsn(int opcode, String owner, String name, String desc) {
+		ps.println(OpInfo.ops[opcode].toString() + " " + owner + " " + name + " " + desc);
+
+	}
+
+	/**
+	 * Visits an invokedynamic instruction.
+	 * 
+	 * @param name    the method's name.
+	 * @param desc    the method's descriptor (see {@link Type Type}).
+	 * @param bsm     the bootstrap method.
+	 * @param bsmArgs the bootstrap method constant arguments. Each argument must be
+	 *                an {@link Integer}, {@link Float}, {@link Long},
+	 *                {@link Double}, {@link String}, {@link Type} or {@link Handle}
+	 *                value. This method is allowed to modify the content of the
+	 *                array so a caller should expect that this array may change.
+	 */
+	public void visitInvokeDynamicInsn(String name, String desc, Handle bsm, Object... bsmArgs) {
+		ps.println(OpInfo.INVOKEDYNAMIC.toString() + " " + name + " " + desc + " HANDLE:" + bsm.toString() + " "
+				+ objs2Str(bsmArgs));
+
+	}
+
+	private String objs2Str(Object[] bsmArgs) {
+		StringBuilder sb = new StringBuilder();
+		for (Object obj : bsmArgs)
+			sb.append(obj.toString()).append(" ");
+		return sb.toString();
+	}
+
+	/**
+	 * Visits a jump instruction. A jump instruction is an instruction that may jump
+	 * to another instruction.
+	 * 
+	 * @param opcode the opcode of the type instruction to be visited. This opcode
+	 *               is either IFEQ, IFNE, IFLT, IFGE, IFGT, IFLE, IF_ICMPEQ,
+	 *               IF_ICMPNE, IF_ICMPLT, IF_ICMPGE, IF_ICMPGT, IF_ICMPLE,
+	 *               IF_ACMPEQ, IF_ACMPNE, GOTO, JSR, IFNULL or IFNONNULL.
+	 * @param label  the operand of the instruction to be visited. This operand is a
+	 *               label that designates the instruction to which the jump
+	 *               instruction may jump.
+	 */
+	public void visitJumpInsn(int opcode, Label label) {
+		ps.println(OpInfo.ops[opcode].toString() + getLabelStr(label));
+
+	}
+
+	/**
+	 * Visits a label. A label designates the instruction that will be visited just
+	 * after it.
+	 * 
+	 * @param label a {@link Label Label} object.
+	 */
+	private String getLabelStr(Label label) {
+		return "L" + labelOrder.get(label);
+	}
+
+	public void visitLabel(Label label) {
+		ps.println("=" + getLabelStr(label) + "=");
+
+	}
+
+	// -------------------------------------------------------------------------
+	// Special instructions
+	// -------------------------------------------------------------------------
+
+	/**
+	 * Visits a LDC instruction. Note that new constant types may be added in future
+	 * versions of the Java Virtual Machine. To easily detect new constant types,
+	 * implementations of this method should check for unexpected constant types,
+	 * like this:
+	 * 
+	 * <pre>
+	 * if (cst instanceof Integer) {
+	 * 	// ...
+	 * } else if (cst instanceof Float) {
+	 * 	// ...
+	 * } else if (cst instanceof Long) {
+	 * 	// ...
+	 * } else if (cst instanceof Double) {
+	 * 	// ...
+	 * } else if (cst instanceof String) {
+	 * 	// ...
+	 * } else if (cst instanceof Type) {
+	 * 	int sort = ((Type) cst).getSort();
+	 * 	if (sort == Type.OBJECT) {
+	 * 		// ...
+	 * 	} else if (sort == Type.ARRAY) {
+	 * 		// ...
+	 * 	} else if (sort == Type.METHOD) {
+	 * 		// ...
+	 * 	} else {
+	 * 		// throw an exception
+	 * 	}
+	 * } else if (cst instanceof Handle) {
+	 * 	// ...
+	 * } else {
+	 * 	// throw an exception
+	 * }
+	 * </pre>
+	 * 
+	 * @param cst the constant to be loaded on the stack. This parameter must be a
+	 *            non null {@link Integer}, a {@link Float}, a {@link Long}, a
+	 *            {@link Double}, a {@link String}, a {@link Type} of OBJECT or
+	 *            ARRAY sort for <tt>.class</tt> constants, for classes whose
+	 *            version is 49.0, a {@link Type} of METHOD sort or a {@link Handle}
+	 *            for MethodType and MethodHandle constants, for classes whose
+	 *            version is 51.0.
+	 */
+	public void visitLdcInsn(Object cst) {
+		ps.println("ldc " + cst);
+	}
+
+	/**
+	 * Visits an IINC instruction.
+	 * 
+	 * @param var       index of the local variable to be incremented.
+	 * @param increment amount to increment the local variable by.
+	 */
+	public void visitIincInsn(int var, int increment) {
+		ps.println("iinc " + var + " " + increment);
+	}
+
+	/**
+	 * Visits a TABLESWITCH instruction.
+	 * 
+	 * @param min    the minimum key value.
+	 * @param max    the maximum key value.
+	 * @param dflt   beginning of the default handler block.
+	 * @param labels beginnings of the handler blocks. <tt>labels[i]</tt> is the
+	 *               beginning of the handler block for the <tt>min + i</tt> key.
+	 */
+	public void visitTableSwitchInsn(int min, int max, Label dflt, Label... labels) {
+		ps.println(OpInfo.TABLESWITCH.toString() + " labels:" + getLabelStr(dflt) + " " + convertLabels(labels));
+
+	}
+
+	private String convertLabels(Label[] labels) {
+		StringBuilder sb = new StringBuilder();
+		for (Label l : labels)
+			sb.append(getLabelStr(l)).append(" ");
+		return sb.toString();
+	}
+
+	/**
+	 * Visits a LOOKUPSWITCH instruction.
+	 * 
+	 * @param dflt   beginning of the default handler block.
+	 * @param keys   the values of the keys.
+	 * @param labels beginnings of the handler blocks. <tt>labels[i]</tt> is the
+	 *               beginning of the handler block for the <tt>keys[i]</tt> key.
+	 */
+	public void visitLookupSwitchInsn(Label dflt, int[] keys, Label[] labels) {
+		ps.println(OpInfo.LOOKUPSWITCH.toString() + " labels:" + getLabelStr(dflt) + " " + convertLabels(labels));
+
+	}
+
+	/**
+	 * Visits a MULTIANEWARRAY instruction.
+	 * 
+	 * @param desc an array type descriptor (see {@link Type Type}).
+	 * @param dims number of dimensions of the array to allocate.
+	 */
+	public void visitMultiANewArrayInsn(String desc, int dims) {
+		ps.println(OpInfo.MULTIANEWARRAY + " " + desc + " " + dims);
+	}
+
+	public void setLabelOrder(Map<Label, Integer> labelOrder) {
+		this.labelOrder = labelOrder;
+	}
+
+}
diff --git a/src/main/analysis/org/bdware/analysis/OpInfo.java b/src/main/analysis/org/bdware/analysis/OpInfo.java
new file mode 100644
index 0000000..676746d
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/OpInfo.java
@@ -0,0 +1,256 @@
+package org.bdware.analysis;
+
+public enum OpInfo implements CFType {
+	NOP(0x00, "nop", kInstrCanContinue, 0), // --
+	ACONST_NULL(0x01, "aconst_null", kInstrCanContinue, 1), // --
+	ICONST_M1(0x02, "iconst_m1", kInstrCanContinue, 1), // --
+	ICONST_0(0x03, "iconst_0", kInstrCanContinue, 1), // --
+	ICONST_1(0x04, "iconst_1", kInstrCanContinue, 1), // --
+	ICONST_2(0x05, "iconst_2", kInstrCanContinue, 1), // --
+	ICONST_3(0x06, "iconst_3", kInstrCanContinue, 1), // --
+	ICONST_4(0x07, "iconst_4", kInstrCanContinue, 1), // --
+	ICONST_5(0x08, "iconst_5", kInstrCanContinue, 1), // --
+	LCONST_0(0x09, "lconst_0", kInstrCanContinue, 2), // --
+	LCONST_1(0x0a, "lconst_1", kInstrCanContinue, 2), // --
+	FCONST_0(0x0b, "fconst_0", kInstrCanContinue, 1), // --
+	FCONST_1(0x0c, "fconst_1", kInstrCanContinue, 1), // --
+	FCONST_2(0x0d, "fconst_2", kInstrCanContinue, 1), // --
+	DCONST_0(0x0e, "dconst_0", kInstrCanContinue, 2), // --
+	DCONST_1(0x0f, "dconst_1", kInstrCanContinue, 2), // --
+	BIPUSH(0x10, "bipush", kInstrCanContinue, 1), // --
+	SIPUSH(0x11, "sipush", kInstrCanContinue, 1), // --
+	LDC(0x12, "ldc", kInstrCanContinue, 1), // --
+	LDC_W(0x13, "ldc_w", kInstrCanContinue, 1), // --
+	LDC2_W(0x14, "ldc2_w", kInstrCanContinue, 2), // --
+	ILOAD(0x15, "iload", kInstrCanContinue, 1), // --
+	LLOAD(0x16, "lload", kInstrCanContinue, 2), // --
+	FLOAD(0x17, "fload", kInstrCanContinue, 1), // --
+	DLOAD(0x18, "dload", kInstrCanContinue, 2), // --
+	ALOAD(0x19, "aload", kInstrCanContinue, 1), // --
+	ILOAD_0(0x1a, "iload_0", kInstrCanContinue, 1), // --
+	ILOAD_1(0x1b, "iload_1", kInstrCanContinue, 1), // --
+	ILOAD_2(0x1c, "iload_2", kInstrCanContinue, 1), // --
+	ILOAD_3(0x1d, "iload_3", kInstrCanContinue, 1), // --
+	LLOAD_0(0x1e, "lload_0", kInstrCanContinue, 2), // --
+	LLOAD_1(0x1f, "lload_1", kInstrCanContinue, 2), // --
+	LLOAD_2(0x20, "lload_2", kInstrCanContinue, 2), // --
+	LLOAD_3(0x21, "lload_3", kInstrCanContinue, 2), // --
+	FLOAD_0(0x22, "fload_0", kInstrCanContinue, 1), // --
+	FLOAD_1(0x23, "fload_1", kInstrCanContinue, 1), // --
+	FLOAD_2(0x24, "fload_2", kInstrCanContinue, 1), // --
+	FLOAD_3(0x25, "fload_3", kInstrCanContinue, 1), // --
+	DLOAD_0(0x26, "dload_0", kInstrCanContinue, 2), // --
+	DLOAD_1(0x27, "dload_1", kInstrCanContinue, 2), // --
+	DLOAD_2(0x28, "dload_2", kInstrCanContinue, 2), // --
+	DLOAD_3(0x29, "dload_3", kInstrCanContinue, 2), // --
+	ALOAD_0(0x2a, "aload_0", kInstrCanContinue, 1), // --
+	ALOAD_1(0x2b, "aload_1", kInstrCanContinue, 1), // --
+	ALOAD_2(0x2c, "aload_2", kInstrCanContinue, 1), // --
+	ALOAD_3(0x2d, "aload_3", kInstrCanContinue, 1), // --
+	IALOAD(0x2e, "iaload", kInstrCanContinue, -1), // --
+	LALOAD(0x2f, "laload", kInstrCanContinue, 0), // --
+	FALOAD(0x30, "faload", kInstrCanContinue, -1), // --
+	DALOAD(0x31, "daload", kInstrCanContinue, 0), // --
+	AALOAD(0x32, "aaload", kInstrCanContinue, -1), // --
+	BALOAD(0x33, "baload", kInstrCanContinue, -1), // --
+	CALOAD(0x34, "caload", kInstrCanContinue, -1), // --
+	SALOAD(0x35, "saload", kInstrCanContinue, -1), // --
+	ISTORE(0x36, "istore", kInstrCanContinue, -1), // --
+	LSTORE(0x37, "lstore", kInstrCanContinue, -2), // --
+	FSTORE(0x38, "fstore", kInstrCanContinue, -1), // --
+	DSTORE(0x39, "dstore", kInstrCanContinue, -2), // --
+	ASTORE(0x3a, "astore", kInstrCanContinue, -1), // --
+	ISTORE_0(0x3b, "istore_0", kInstrCanContinue, -1), // --
+	ISTORE_1(0x3c, "istore_1", kInstrCanContinue, -1), // --
+	ISTORE_2(0x3d, "istore_2", kInstrCanContinue, -1), // --
+	ISTORE_3(0x3e, "istore_3", kInstrCanContinue, -1), // --
+	LSTORE_0(0x3f, "lstore_0", kInstrCanContinue, -2), // --
+	LSTORE_1(0x40, "lstore_1", kInstrCanContinue, -2), // --
+	LSTORE_2(0x41, "lstore_2", kInstrCanContinue, -2), // --
+	LSTORE_3(0x42, "lstore_3", kInstrCanContinue, -2), // --
+	FSTORE_0(0x43, "fstore_0", kInstrCanContinue, -1), // --
+	FSTORE_1(0x44, "fstore_1", kInstrCanContinue, -1), // --
+	FSTORE_2(0x45, "fstore_2", kInstrCanContinue, -1), // --
+	FSTORE_3(0x46, "fstore_3", kInstrCanContinue, -1), // --
+	DSTORE_0(0x47, "dstore_0", kInstrCanContinue, -2), // --
+	DSTORE_1(0x48, "dstore_1", kInstrCanContinue, -2), // --
+	DSTORE_2(0x49, "dstore_2", kInstrCanContinue, -2), // --
+	DSTORE_3(0x4a, "dstore_3", kInstrCanContinue, -2), // --
+	ASTORE_0(0x4b, "astore_0", kInstrCanContinue, -1), // --
+	ASTORE_1(0x4c, "astore_1", kInstrCanContinue, -1), // --
+	ASTORE_2(0x4d, "astore_2", kInstrCanContinue, -1), // --
+	ASTORE_3(0x4e, "astore_3", kInstrCanContinue, -1), // --
+	IASTORE(0x4f, "iastore", kInstrCanContinue, -3), // --
+	LASTORE(0x50, "lastore", kInstrCanContinue, -4), // --
+	FASTORE(0x51, "fastore", kInstrCanContinue, -3), // --
+	DASTORE(0x52, "dastore", kInstrCanContinue, -4), // --
+	AASTORE(0x53, "aastore", kInstrCanContinue, -3), // --
+	BASTORE(0x54, "bastore", kInstrCanContinue, -3), // --
+	CASTORE(0x55, "castore", kInstrCanContinue, -3), // --
+	SASTORE(0x56, "sastore", kInstrCanContinue, -3), // --
+	POP(0x57, "pop", kInstrCanContinue, -1), // --
+	POP2(0x58, "pop2", kInstrCanContinue, -2), // --
+	DUP(0x59, "dup", kInstrCanContinue, 1), // --
+	DUP_X1(0x5a, "dup_x1", kInstrCanContinue, 1), // --
+	DUP_X2(0x5b, "dup_x2", kInstrCanContinue, 1), // --
+	DUP2(0x5c, "dup2", kInstrCanContinue, 2), // --
+	DUP2_X1(0x5d, "dup2_x1", kInstrCanContinue, 2), // --
+	DUP2_X2(0x5e, "dup2_x2", kInstrCanContinue, 2), // --
+	SWAP(0x5f, "swap", kInstrCanContinue, 0), // --
+	IADD(0x60, "iadd", kInstrCanContinue, -1), // --
+	LADD(0x61, "ladd", kInstrCanContinue, -2), // --
+	FADD(0x62, "fadd", kInstrCanContinue, -1), // --
+	DADD(0x63, "dadd", kInstrCanContinue, -2), // --
+	ISUB(0x64, "isub", kInstrCanContinue, -1), // --
+	LSUB(0x65, "lsub", kInstrCanContinue, -2), // --
+	FSUB(0x66, "fsub", kInstrCanContinue, -1), // --
+	DSUB(0x67, "dsub", kInstrCanContinue, -2), // --
+	IMUL(0x68, "imul", kInstrCanContinue, -1), // --
+	LMUL(0x69, "lmul", kInstrCanContinue, -2), // --
+	FMUL(0x6a, "fmul", kInstrCanContinue, -1), // --
+	DMUL(0x6b, "dmul", kInstrCanContinue, -2), // --
+	IDIV(0x6c, "idiv", kInstrCanContinue, -1), // --
+	LDIV(0x6d, "ldiv", kInstrCanContinue, -2), // --
+	FDIV(0x6e, "fdiv", kInstrCanContinue, -1), // --
+	DDIV(0x6f, "ddiv", kInstrCanContinue, -2), // --
+	IREM(0x70, "irem", kInstrCanContinue, -1), // --
+	LREM(0x71, "lrem", kInstrCanContinue, -2), // --
+	FREM(0x72, "frem", kInstrCanContinue, -1), // --
+	DREM(0x73, "drem", kInstrCanContinue, -2), // --
+	INEG(0x74, "ineg", kInstrCanContinue, 0), // --
+	LNEG(0x75, "lneg", kInstrCanContinue, 0), // --
+	FNEG(0x76, "fneg", kInstrCanContinue, 0), // --
+	DNEG(0x77, "dneg", kInstrCanContinue, 0), // --
+	ISHL(0x78, "ishl", kInstrCanContinue, -1), // --
+	LSHL(0x79, "lshl", kInstrCanContinue, -1), // --
+	ISHR(0x7a, "ishr", kInstrCanContinue, -1), // --
+	LSHR(0x7b, "lshr", kInstrCanContinue, -1), // --
+	IUSHR(0x7c, "iushr", kInstrCanContinue, -1), // --
+	LUSHR(0x7d, "lushr", kInstrCanContinue, -1), // --
+	IAND(0x7e, "iand", kInstrCanContinue, -1), // --
+	LAND(0x7f, "land", kInstrCanContinue, -2), // --
+	IOR(0x80, "ior", kInstrCanContinue, -1), // --
+	LOR(0x81, "lor", kInstrCanContinue, -2), // --
+	IXOR(0x82, "ixor", kInstrCanContinue, -1), // --
+	LXOR(0x83, "lxor", kInstrCanContinue, -2), // --
+	IINC(0x84, "iinc", kInstrCanContinue, 0), // --
+	I2L(0x85, "i2l", kInstrCanContinue, 1), // --
+	I2F(0x86, "i2f", kInstrCanContinue, 0), // --
+	I2D(0x87, "i2d", kInstrCanContinue, 1), // --
+	L2I(0x88, "l2i", kInstrCanContinue, -1), // --
+	L2F(0x89, "l2f", kInstrCanContinue, -1), // --
+	L2D(0x8a, "l2d", kInstrCanContinue, 0), // --
+	F2I(0x8b, "f2i", kInstrCanContinue, 0), // --
+	F2L(0x8c, "f2l", kInstrCanContinue, 1), // --
+	F2D(0x8d, "f2d", kInstrCanContinue, 1), // --
+	D2I(0x8e, "d2i", kInstrCanContinue, -1), // --
+	D2L(0x8f, "d2l", kInstrCanContinue, 0), // --
+	D2F(0x90, "d2f", kInstrCanContinue, -1), // --
+	I2B(0x91, "i2b", kInstrCanContinue, 0), // --
+	I2C(0x92, "i2c", kInstrCanContinue, 0), // --
+	I2S(0x93, "i2s", kInstrCanContinue, 0), // --
+	LCMP(0x94, "lcmp", kInstrCanContinue, -2), // --
+	FCMPL(0x95, "fcmpl", kInstrCanContinue, -1), // --
+	FCMPG(0x96, "fcmpg", kInstrCanContinue, -1), // --
+	DCMPL(0x97, "dcmpl", kInstrCanContinue, -3), // --
+	DCMPG(0x98, "dcmpg", kInstrCanContinue, -3), // --
+	IFEQ(0x99, "ifeq", kInstrCanBranch, -1), // --
+	IFNE(0x9a, "ifne", kInstrCanBranch, -1), // --
+	IFLT(0x9b, "iflt", kInstrCanBranch, -1), // --
+	IFGE(0x9c, "ifge", kInstrCanBranch, -1), // --
+	IFGT(0x9d, "ifgt", kInstrCanBranch, -1), // --
+	IFLE(0x9e, "ifle", kInstrCanBranch, -1), // --
+	IF_ICMPEQ(0x9f, "if_icmpeq", kInstrCanBranch, -2), // --
+	IF_ICMPNE(0xa0, "if_icmpne", kInstrCanBranch, -2), // --
+	IF_ICMPLT(0xa1, "if_icmplt", kInstrCanBranch, -2), // --
+	IF_ICMPGE(0xa2, "if_icmpge", kInstrCanBranch, -2), // --
+	IF_ICMPGT(0xa3, "if_icmpgt", kInstrCanBranch, -2), // --
+	IF_ICMPLE(0xa4, "if_icmple", kInstrCanBranch, -2), // --
+	IF_ACMPEQ(0xa5, "if_acmpeq", kInstrCanBranch, -2), // --
+	IF_ACMPNE(0xa6, "if_acmpne", kInstrCanBranch, -2), // --
+	GOTO(0xa7, "goto", kInstrCanBranch, 0), // --
+	JSR(0xa8, "jsr", kInstrCanContinue, 1), // ??--
+	RET(0xa9, "ret", kInstrCanContinue, -1), // ??--
+	TABLESWITCH(0xaa, "tableswitch", kInstrCanBranch, 1), // --
+	LOOKUPSWITCH(0xab, "lookupswitch", kInstrCanBranch, 0), // --
+	IRETURN(0xac, "ireturn", kInstrCanReturn, -1), // --
+	LRETURN(0xad, "lreturn", kInstrCanReturn, -2), // --
+	FRETURN(0xae, "freturn", kInstrCanReturn, -1), // --
+	DRETURN(0xaf, "dreturn", kInstrCanReturn, -2), // --
+	ARETURN(0xb0, "areturn", kInstrCanReturn, -1), // --
+	RETURN(0xb1, "return", kInstrCanReturn, 0), // --
+	GETSTATIC(0xb2, "getstatic", kInstrCanContinue, 0), // dynamic changing+ --
+	PUTSTATIC(0xb3, "putstatic", kInstrCanContinue, 0), // dynamic changing- --
+	GETFIELD(0xb4, "getfield", kInstrCanContinue, 0), // dynamic changing_+ --
+	PUTFIELD(0xb5, "putfield", kInstrCanContinue, 0), // dynamic changing-- --
+	INVOKEVIRTUAL(0xb6, "invokevirtual", kInstrInvoke | kInstrCanThrow, 0), // dynamic changing-- --
+	INVOKESPECIAL(0xb7, "invokespecial", kInstrInvoke | kInstrCanThrow, 0), // dynamic changing-- --
+	INVOKESTATIC(0xb8, "invokestatic", kInstrInvoke | kInstrCanThrow, 0), // dynamic changing-- --
+	INVOKEINTERFACE(0xb9, "invokeinterface", kInstrInvoke | kInstrCanThrow, 0), // dynamic changing-- --
+	INVOKEDYNAMIC(0xba, "invokedynamic", kInstrInvoke | kInstrCanThrow, 0), // dynamic changing-- --
+	NEW(0xbb, "new", kInstrCanContinue, 1), // --
+	NEWARRAY(0xbc, "newarray", kInstrCanContinue, 0), // --
+	ANEWARRAY(0xbd, "anewarray", kInstrCanContinue, 0), // --
+	ARRAYLENGTH(0xbe, "arraylength", kInstrCanContinue, 0), // --
+	ATHROW(0xbf, "athrow", kInstrCanReturn, 0), // --
+	CHECKCAST(0xc0, "checkcast", kInstrCanContinue, 0), // --
+	INSTANCEOF(0xc1, "instanceof", kInstrCanContinue, 0), // --
+	MONITORENTER(0xc2, "monitorenter", kInstrCanContinue, -1), // --
+	MONITOREXIT(0xc3, "monitorexit", kInstrCanContinue, -1), // --
+	WIDE(0xc4, "wide", kInstrCanContinue, 0), // --
+	MULTIANEWARRAY(0xc5, "multianewarray", kInstrCanContinue, 0), // dynamic changing--
+	IFNULL(0xc6, "ifnull", kInstrCanBranch, -1), // --
+	IFNONNULL(0xc7, "ifnonnull", kInstrCanBranch, -1), // --
+	GOTO_W(0xc8, "goto_w", kInstrCanBranch, 0), // --
+	JSR_W(0xc9, "jsr_w", kInstrCanContinue, 1);// ??--
+	public final static OpInfo ops[] = new OpInfo[256];
+
+	static {
+		OpInfo[] ops = OpInfo.ops;
+		for (OpInfo op : OpInfo.values()) {
+			if (op.opcode >= 0) {
+				ops[op.opcode] = op;
+			}
+		}
+	}
+	public boolean changeFrame;
+	int changeStack;
+	private int flags;
+	private String displayName;
+	private int opcode;
+
+	OpInfo() {
+	}
+
+	OpInfo(int opcode, String displayName, int branchType, int changStack) {
+		flags = branchType;
+		this.displayName = displayName;
+		this.opcode = opcode;
+		this.changeStack = changeStack;
+	}
+
+	public boolean canBranch() {
+		return 0 != (flags & kInstrCanBranch);
+	}
+
+	public boolean canContinue() {
+		return 0 != (flags & kInstrCanContinue);
+	}
+
+	public boolean canReturn() {
+		return 0 != (flags & kInstrCanReturn);
+	}
+
+	public boolean canSwitch() {
+		return 0 != (flags & kInstrCanSwitch);
+	}
+
+	public boolean canThrow() {
+		return 0 != (flags & kInstrCanThrow);
+	}
+	
+
+	public String toString() {
+		return displayName;
+	}
+}
diff --git a/src/main/analysis/org/bdware/analysis/dynamic/FieldSensitiveDynamicTaintAnalysis.java b/src/main/analysis/org/bdware/analysis/dynamic/FieldSensitiveDynamicTaintAnalysis.java
new file mode 100644
index 0000000..7c94c2e
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/dynamic/FieldSensitiveDynamicTaintAnalysis.java
@@ -0,0 +1,193 @@
+package org.bdware.analysis.dynamic;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.bdware.analysis.BasicBlock;
+import org.bdware.analysis.BreadthFirstSearch;
+import org.bdware.analysis.OpInfo;
+import org.bdware.analysis.taint.TaintBB;
+import org.bdware.analysis.taint.TaintCFG;
+import org.bdware.analysis.taint.TaintResult;
+import org.bdware.analysis.taint.TaintValue;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.JumpInsnNode;
+import org.objectweb.asm.tree.LabelNode;
+import org.objectweb.asm.tree.MethodNode;
+
+import java.util.*;
+
+public class FieldSensitiveDynamicTaintAnalysis extends BreadthFirstSearch<TaintResult, TaintBB> {
+    private static final Logger LOGGER = LogManager.getLogger(FieldSensitiveDynamicTaintAnalysis.class);
+    public static boolean isDebug = false;
+    TaintCFG cfg;
+    TracedFile tf;
+    int count = 0;
+
+    public FieldSensitiveDynamicTaintAnalysis(TaintCFG cfg, TracedFile tf) {
+        this.cfg = cfg;
+        this.tf = tf;
+        List<TaintBB> toAnalysis = new ArrayList<>();
+        MethodNode mn = cfg.getMethodNode();
+        LOGGER.info("mn: " + mn.name);
+        String methodDesc = mn.desc;
+        LOGGER.info("method desc: " + methodDesc);
+        methodDesc = methodDesc.replaceAll("\\).*$", ")");
+        LOGGER.info("method desc: " + methodDesc);
+        int pos = 2;
+        if (methodDesc.split(";").length == 3)
+            pos = 1;
+        // TODO add inputBlock!
+        LOGGER.info("p+++ " + pos);
+        TaintBB b = (TaintBB) cfg.getBasicBlockAt(0);
+        b.preResult = new TaintResult();
+        LOGGER.info(TaintResult.nLocals);
+        if (TaintResult.nLocals > 2) {
+            for (int i = 0; i < TaintResult.nLocals; i++)
+                b.preResult.frame.setLocal(i, new TaintValue(1, i == pos ? 1 : 0));
+        }
+        b.preResult.ret = new TaintValue(1);
+        // NaiveTaintResult.printer.setLabelOrder(cfg.getLabelOrder());
+        toAnalysis.add(b);
+        b.setInList(true);
+        setToAnalysis(toAnalysis);
+        if (isDebug) {
+            MethodNode methodNode = cfg.getMethodNode();
+            LOGGER.info("Method: " + methodNode.name + " " + methodNode.desc);
+            LOGGER.info("Local: " + methodNode.maxLocals + " " + methodNode.maxStack);
+        }
+    }
+
+    @Override
+    public TaintResult execute(TaintBB t) {
+        return t.forwardAnalysis();
+    }
+
+    // Current Block is done, merge sucResult to sucBlocks!
+    @Override
+    public Collection<TaintBB> getSuc(TaintBB t) {
+        Set<BasicBlock> subBlock = new HashSet<>();//
+        if (t.list.size() > 0) {
+            AbstractInsnNode insn = t.lastInsn();
+            if (insn != null) {
+                OpInfo info = null;
+                if (insn.getOpcode() >= 0)
+                    info = OpInfo.ops[insn.getOpcode()];
+                if (info == null) {
+                    subBlock.addAll(cfg.getSucBlocks(t));
+                } else if (info.canThrow()) {
+                    // subBlock.clear();
+                    subBlock.add(cfg.getBasicBlockAt(t.blockID + 1));
+                } else if (OpInfo.ops[insn.getOpcode()].canBranch()) {
+//                    subBlock.clear();
+//                    LOGGER.info("can branch " + t.blockID);
+                    int block = handleBranchCase(subBlock, insn, t);
+                    subBlock.add(cfg.getBasicBlockAt(block));
+                } else if (OpInfo.ops[insn.getOpcode()].canSwitch()) {
+                    subBlock.add(cfg.getBasicBlockAt(t.blockID + 1));
+                } else {
+                    subBlock.addAll(cfg.getSucBlocks(t));
+                }
+            }
+        }
+        Set<TaintBB> ret = new HashSet<>();
+//        StringBuilder log = new StringBuilder("nextBB:");
+        for (BasicBlock bb : subBlock) {
+//            log.append("\n\t").append(bb.blockID);
+            TaintBB ntbb = (TaintBB) bb;
+            ntbb.preResult.mergeResult(t.sucResult);
+            ret.add(ntbb);
+        }
+//        LOGGER.info(log.toString());
+        return ret;
+    }
+
+    private int handleBranchCase(Set<BasicBlock> subBlock, AbstractInsnNode insn, TaintBB t) {
+        int blockid = 0;
+        switch (insn.getOpcode()) {
+            case Opcodes.IFNE:// succeeds if and only if value ≠ 0
+                count++;
+                if (tf.trans.get(0).tmToVal.get(0).get(0) != 0) {
+                    // test first tracemark{"traceMark":0, "val":1}
+                    if (insn instanceof JumpInsnNode) {
+                        LabelNode jump = ((JumpInsnNode) insn).label;
+                        blockid = cfg.getBasicBlockByLabel(jump.getLabel()).blockID;
+                    }
+                } else {
+                    blockid = t.blockID + 1;
+                }
+                return blockid;
+            case Opcodes.IFEQ:// succeeds if and only if value = 0
+
+                if (tf.trans.get(0).tmToVal.get(0).get(0) == 0) {
+                    if (insn instanceof JumpInsnNode) {
+                        LabelNode jump = ((JumpInsnNode) insn).label;
+                        blockid = cfg.getBasicBlockByLabel(jump.getLabel()).blockID;
+                    }
+                } else {
+                    blockid = t.blockID + 1;
+                }
+                return blockid;
+            case Opcodes.IFGE:// succeeds if and only if value ≥ 0
+                if (tf.trans.get(0).tmToVal.get(0).get(0) >= 0) {
+                    if (insn instanceof JumpInsnNode) {
+                        LabelNode jump = ((JumpInsnNode) insn).label;
+                        blockid = cfg.getBasicBlockByLabel(jump.getLabel()).blockID;
+                    }
+                } else {
+                    blockid = t.blockID + 1;
+                }
+                return blockid;
+            case Opcodes.IFLE:// succeeds if and only if value ≤ 0
+                if (tf.trans.get(0).tmToVal.get(0).get(0) <= 0) {
+                    if (insn instanceof JumpInsnNode) {
+                        LabelNode jump = ((JumpInsnNode) insn).label;
+                        blockid = cfg.getBasicBlockByLabel(jump.getLabel()).blockID;
+                    }
+                } else {
+                    blockid = t.blockID + 1;
+                }
+                return blockid;
+            case Opcodes.IFLT:// succeeds if and only if value < 0
+                if (tf.trans.get(0).tmToVal.get(0).get(0) < 0) {
+                    if (insn instanceof JumpInsnNode) {
+                        LabelNode jump = ((JumpInsnNode) insn).label;
+                        blockid = cfg.getBasicBlockByLabel(jump.getLabel()).blockID;
+                    }
+                } else {
+                    blockid = t.blockID + 1;
+                }
+                return blockid;
+            case Opcodes.IFGT:// succeeds if and only if value > 0
+                if (tf.trans.get(0).tmToVal.get(0).get(0) < 0) {
+                    if (insn instanceof JumpInsnNode) {
+                        LabelNode jump = ((JumpInsnNode) insn).label;
+                        blockid = cfg.getBasicBlockByLabel(jump.getLabel()).blockID;
+                    }
+                } else {
+                    blockid = t.blockID + 1;
+                }
+                return blockid;
+            case Opcodes.IF_ACMPEQ:// succeeds if and only if value1 = value2
+            case Opcodes.IF_ACMPNE:// succeeds if and only if value1 ≠ value2
+            case Opcodes.IF_ICMPEQ:// succeeds if and only if value1 = value2
+            case Opcodes.IF_ICMPGE:// succeeds if and only if value1 ≠ value2
+            case Opcodes.IF_ICMPGT:// succeeds if and only if value1 > value2
+            case Opcodes.IF_ICMPLE:// succeeds if and only if value1 ≤ value2
+            case Opcodes.IF_ICMPLT:// succeeds if and only if value1 < value2
+
+            case Opcodes.IFNONNULL:
+            case Opcodes.TABLESWITCH:
+            case Opcodes.LOOKUPSWITCH:
+            default:
+                break;
+            case Opcodes.GOTO:
+                if (insn instanceof JumpInsnNode) {
+                    LabelNode jump = ((JumpInsnNode) insn).label;
+                    blockid = cfg.getBasicBlockByLabel(jump.getLabel()).blockID;
+                }
+        }
+        return blockid;
+    }
+
+}
diff --git a/src/main/analysis/org/bdware/analysis/dynamic/NaiveDynamicTaintAnalysis.java b/src/main/analysis/org/bdware/analysis/dynamic/NaiveDynamicTaintAnalysis.java
new file mode 100644
index 0000000..48d6402
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/dynamic/NaiveDynamicTaintAnalysis.java
@@ -0,0 +1,208 @@
+package org.bdware.analysis.dynamic;
+
+import org.bdware.analysis.BasicBlock;
+import org.bdware.analysis.BreadthFirstSearch;
+import org.bdware.analysis.OpInfo;
+import org.bdware.analysis.taint.*;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.*;
+
+import java.util.*;
+
+public class NaiveDynamicTaintAnalysis extends BreadthFirstSearch<TaintResult, TaintBB> {
+
+    TaintCFG cfg;
+    TracedFile tf;
+    public static boolean isDebug = false;
+    int count = 0;
+    String functionGlobel;
+    public static HashMap<String, HashMap<Integer, Integer>> branchCount = new HashMap<>();
+
+    public NaiveDynamicTaintAnalysis(TaintCFG cfg, TracedFile tf) {
+        this.cfg = cfg;
+        this.tf = tf;
+        List<TaintBB> toAnalysis = new ArrayList<>();
+        MethodNode mn = cfg.getMethodNode();
+
+        String methodDesc = mn.desc;
+        methodDesc = methodDesc.replaceAll("\\).*$", ")");
+        int pos = 2;
+        if (methodDesc.split(";").length == 3) pos = 1;
+        // TODO add inputBlock!
+        TaintBB b = (TaintBB) cfg.getBasicBlockAt(0);
+        b.preResult = new TaintResult();
+        int arg = cfg.argsLocal();
+        b.preResult.frame.setLocal(arg, new TaintValue(1, cfg.taintBits.allocate("arg" + arg)));
+        b.preResult.frame.setLocal(0, HeapObject.getRootObject());
+        cfg.executeLocal();
+        TaintResult.interpreter.setTaintBits(cfg.taintBits);
+        functionGlobel = cfg.getMethodNode().name;
+        branchCount.put(functionGlobel, new HashMap<Integer, Integer>());
+        // local0=scriptfuncion, is not tainted;
+        // local1=this, is not tainted;
+        // local2=this, is not tainted;
+        // NaiveTaintResult.printer.setLabelOrder(cfg.getLabelOrder());
+        toAnalysis.add(b);
+        b.setInList(true);
+        setToAnalysis(toAnalysis);
+        if (isDebug) {
+            System.out.println("===Method:" + cfg.getMethodNode().name + cfg.getMethodNode().desc);
+            System.out.println(
+                    "===Local:"
+                            + cfg.getMethodNode().maxLocals
+                            + " "
+                            + cfg.getMethodNode().maxStack);
+        }
+    }
+
+    @Override
+    public TaintResult execute(TaintBB t) {
+        return t.forwardAnalysis();
+    }
+
+    // Current Block is done, merge sucResult to sucBlocks!
+    @Override
+    public Collection<TaintBB> getSuc(TaintBB t) {
+        Set<BasicBlock> subBlock = new HashSet<>(); // bug ! clear() no suc
+        if (t.list.size() > 0) {
+            AbstractInsnNode insn = t.lastInsn();
+            if (insn != null) {
+                OpInfo info = null;
+                if (insn.getOpcode() >= 0) info = OpInfo.ops[insn.getOpcode()];
+                if (info == null) {
+                    subBlock.addAll(cfg.getSucBlocks(t));
+                } else if (info.canThrow()) {
+                    callCount(insn);
+                    subBlock.add(cfg.getBasicBlockAt(t.blockID + 1));
+                } else if (OpInfo.ops[insn.getOpcode()].canBranch()) {
+                    subBlock.clear();
+                    int block = handleBranchCase(subBlock, insn, t);
+                    subBlock.add(cfg.getBasicBlockAt(block));
+                } else if (OpInfo.ops[insn.getOpcode()].canSwitch()) {
+                    subBlock.add(cfg.getBasicBlockAt(t.blockID + 1));
+                } else {
+                    subBlock.addAll(cfg.getSucBlocks(t));
+                }
+            }
+        }
+        Set<TaintBB> ret = new HashSet<>();
+        // System.out.print("[NaiveDynamicTaintAnalysis] nextBB:");
+        for (BasicBlock bb : subBlock) {
+            // System.out.print(" " + bb.blockID);
+            TaintBB ntbb = (TaintBB) bb;
+            ntbb.preResult.mergeResult(t.sucResult);
+            ret.add(ntbb);
+        }
+        // System.out.println();
+        return ret;
+    }
+
+    private void callCount(AbstractInsnNode insn) {
+        if (insn instanceof InvokeDynamicInsnNode) {
+            Object invoke = ((InvokeDynamicInsnNode) insn).bsmArgs[0];
+            String functionName = ((InvokeDynamicInsnNode) insn).name;
+            if (functionName.contains("traceif")) {
+                traceIfNum = (int) invoke;
+                if (branchCount.get(functionGlobel).containsKey(traceIfNum)) {
+                    branchCount
+                            .get(functionGlobel)
+                            .put(traceIfNum, branchCount.get(functionGlobel).get(traceIfNum) + 1);
+                } else {
+                    branchCount.get(functionGlobel).put(traceIfNum, 1);
+                }
+            }
+        }
+    }
+
+    int traceIfNum = 0;
+
+    private int handleBranchCase(Set<BasicBlock> subBlock, AbstractInsnNode insn, TaintBB t) {
+        int blockid = 0;
+        switch (insn.getOpcode()) {
+            case Opcodes.IFNE: // succeeds if and only if value ≠ 0
+                int ifneCount = branchCount.get(functionGlobel).get(traceIfNum);
+                if (tf.trans.get(0).tmToVal.get(traceIfNum).get(ifneCount) != 0) { // test first
+                    if (insn instanceof JumpInsnNode) {
+                        LabelNode jump = ((JumpInsnNode) insn).label;
+                        blockid = cfg.getBasicBlockByLabel(jump.getLabel()).blockID;
+                    }
+                } else {
+                    blockid = t.blockID + 1;
+                }
+                return blockid;
+            case Opcodes.IFEQ: // succeeds if and only if value = 0
+                int ifeqCount = branchCount.get(functionGlobel).get(traceIfNum);
+                if (tf.trans.get(0).tmToVal.get(traceIfNum).get(ifeqCount) == 0) {
+                    if (insn instanceof JumpInsnNode) {
+                        LabelNode jump = ((JumpInsnNode) insn).label;
+                        blockid = cfg.getBasicBlockByLabel(jump.getLabel()).blockID;
+                    }
+                } else {
+                    blockid = t.blockID + 1;
+                }
+                return blockid;
+            case Opcodes.IFGE: // succeeds if and only if value ≥ 0
+                int ifgeCount = branchCount.get(functionGlobel).get(traceIfNum);
+                if (tf.trans.get(0).tmToVal.get(traceIfNum).get(ifgeCount) >= 0) {
+                    if (insn instanceof JumpInsnNode) {
+                        LabelNode jump = ((JumpInsnNode) insn).label;
+                        blockid = cfg.getBasicBlockByLabel(jump.getLabel()).blockID;
+                    }
+                } else {
+                    blockid = t.blockID + 1;
+                }
+                return blockid;
+            case Opcodes.IFLE: // succeeds if and only if value ≤ 0
+                int ifleCount = branchCount.get(functionGlobel).get(traceIfNum);
+                if (tf.trans.get(0).tmToVal.get(traceIfNum).get(ifleCount) <= 0) {
+                    if (insn instanceof JumpInsnNode) {
+                        LabelNode jump = ((JumpInsnNode) insn).label;
+                        blockid = cfg.getBasicBlockByLabel(jump.getLabel()).blockID;
+                    }
+                } else {
+                    blockid = t.blockID + 1;
+                }
+                return blockid;
+            case Opcodes.IFLT: // succeeds if and only if value < 0
+                int ifltCount = branchCount.get(functionGlobel).get(traceIfNum);
+                if (tf.trans.get(0).tmToVal.get(traceIfNum).get(ifltCount) < 0) {
+                    if (insn instanceof JumpInsnNode) {
+                        LabelNode jump = ((JumpInsnNode) insn).label;
+                        blockid = cfg.getBasicBlockByLabel(jump.getLabel()).blockID;
+                    }
+                } else {
+                    blockid = t.blockID + 1;
+                }
+                return blockid;
+            case Opcodes.IFGT: // succeeds if and only if value > 0
+                int ifgtCount = branchCount.get(functionGlobel).get(traceIfNum);
+                if (tf.trans.get(0).tmToVal.get(traceIfNum).get(ifgtCount) < 0) {
+                    if (insn instanceof JumpInsnNode) {
+                        LabelNode jump = ((JumpInsnNode) insn).label;
+                        blockid = cfg.getBasicBlockByLabel(jump.getLabel()).blockID;
+                    }
+                } else {
+                    blockid = t.blockID + 1;
+                }
+                return blockid;
+            case Opcodes.IF_ACMPEQ: // succeeds if and only if value1 = value2
+            case Opcodes.IF_ACMPNE: // succeeds if and only if value1 ≠ value2
+            case Opcodes.IF_ICMPEQ: // succeeds if and only if value1 = value2
+            case Opcodes.IF_ICMPGE: // succeeds if and only if value1 ≠ value2
+            case Opcodes.IF_ICMPGT: // succeeds if and only if value1 > value2
+            case Opcodes.IF_ICMPLE: // succeeds if and only if value1 ≤ value2
+            case Opcodes.IF_ICMPLT: // succeeds if and only if value1 < value2
+            case Opcodes.IFNONNULL:
+            case Opcodes.TABLESWITCH:
+            case Opcodes.LOOKUPSWITCH:
+            default:
+                break;
+            case Opcodes.GOTO:
+                if (insn instanceof JumpInsnNode) {
+                    LabelNode jump = ((JumpInsnNode) insn).label;
+                    blockid = cfg.getBasicBlockByLabel(jump.getLabel()).blockID;
+                }
+        }
+        return blockid;
+    }
+}
diff --git a/src/main/analysis/org/bdware/analysis/dynamic/ProgramPoint.java b/src/main/analysis/org/bdware/analysis/dynamic/ProgramPoint.java
new file mode 100644
index 0000000..f468d71
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/dynamic/ProgramPoint.java
@@ -0,0 +1,91 @@
+package org.bdware.analysis.dynamic;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.io.InputStream;
+import java.util.*;
+
+public class ProgramPoint {
+    private static final Logger LOGGER = LogManager.getLogger(ProgramPoint.class);
+    List<Transaction> trans;
+    List<FunctionTran> functionTrans;
+
+    public ProgramPoint(InputStream in) {
+        Scanner sc = new Scanner(in);
+        trans = new ArrayList<>();
+        functionTrans = new ArrayList<>();
+        Transaction transaction = new Transaction();
+        FunctionTran functionTran = new FunctionTran();
+        transaction.tmToVal = new HashMap<>();
+        functionTran.ppToVal = new HashMap<>();
+        // TODO ignore handle transaction start
+        // TODO ignore handle contractID/method....
+        // TODO ignore handle transaction end
+        while (sc.hasNextLine()) {
+            String string = sc.nextLine().replace("[ProgramPointCounter]", "");
+            LOGGER.debug("[string: ]" + string);
+            if (string.contains("ENTER")) {
+                String[] strings = string.split("_");
+                strings = strings[1].split("[(]");
+                System.out.println("[stringsss: ]" + strings[0]);
+                functionTran.insert(strings[0], "ENTER");
+            }
+            //			if (string.contains("EXIT")) {
+            //				String[] strings = string.split("_");
+            //				strings=strings[1].split("-");
+            //				System.out.println("[stringsss: ]" + strings[0]);
+            //				functionMap.put(strings[1], "EXIT");
+            //			}
+            if (string.contains("traceMark")) {
+                JsonObject jo = JsonParser.parseString(string).getAsJsonObject();
+                if (jo.get("traceMark") != null) {
+                    if (jo.get("lval") != null) {
+                        transaction.insert(
+                                jo.get("traceMark").getAsInt(), jo.get("lval").getAsInt());
+                        transaction.insert(
+                                jo.get("traceMark").getAsInt(), jo.get("rval").getAsInt());
+                    } else {
+                        transaction.insert(
+                                jo.get("traceMark").getAsInt(), jo.get("val").getAsInt());
+                    }
+                }
+            }
+        }
+        LOGGER.info(functionTran.ppToVal);
+        LOGGER.info(transaction.tmToVal);
+        sc.close();
+    }
+
+    static class Transaction {
+        Map<Integer, List<Integer>> tmToVal;
+
+        public void insert(int traceMark, int val) {
+            List<Integer> ret;
+            if (!tmToVal.containsKey(traceMark)) {
+                ret = new ArrayList<>();
+                tmToVal.put(traceMark, ret);
+            } else {
+                ret = tmToVal.get(traceMark);
+            }
+            ret.add(val);
+        }
+    }
+
+    static class FunctionTran {
+        Map<String, List<String>> ppToVal;
+
+        public void insert(String functionID, String val) {
+            List<String> ret;
+            if (!ppToVal.containsKey(functionID)) {
+                ret = new ArrayList<>();
+                ppToVal.put(functionID, ret);
+            } else {
+                ret = ppToVal.get(functionID);
+            }
+            ret.add(val);
+        }
+    }
+}
diff --git a/src/main/analysis/org/bdware/analysis/dynamic/TracedFile.java b/src/main/analysis/org/bdware/analysis/dynamic/TracedFile.java
new file mode 100644
index 0000000..52b3d02
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/dynamic/TracedFile.java
@@ -0,0 +1,49 @@
+package org.bdware.analysis.dynamic;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
+import java.io.InputStream;
+import java.util.*;
+
+public class TracedFile {
+    public List<Transaction> trans;
+
+    public TracedFile(InputStream in) {
+        Scanner sc = new Scanner(in);
+        trans = new ArrayList<>();
+        Transaction transaction = new Transaction();
+        transaction.tmToVal = new HashMap<Integer, List<Integer>>();
+        // TODO ignore handle transaction start
+        // TODO ignore handle contractID/method....
+        // TODO ignore handle transaction end
+        while (sc.hasNextLine()) {
+            JsonObject jo = JsonParser.parseString(sc.nextLine()).getAsJsonObject();
+            if (null != jo.get("traceMark")) {
+                if (null != jo.get("lval")) {
+                    transaction.insert(jo.get("traceMark").getAsInt(), jo.get("lval").getAsInt());
+                    transaction.insert(jo.get("traceMark").getAsInt(), jo.get("rval").getAsInt());
+                } else {
+                    transaction.insert(jo.get("traceMark").getAsInt(), jo.get("val").getAsInt());
+                }
+            }
+        }
+        trans.add(transaction);
+        sc.close();
+    }
+
+    public static class Transaction {
+        public Map<Integer, List<Integer>> tmToVal;
+
+        public void insert(int traceMark, int val) {
+            List<Integer> ret;
+            if (!tmToVal.containsKey(traceMark)) {
+                ret = new ArrayList<>();
+                tmToVal.put(traceMark, ret);
+            } else {
+                ret = tmToVal.get(traceMark);
+            }
+            ret.add(val);
+        }
+    }
+}
diff --git a/src/main/analysis/org/bdware/analysis/example/FieldSensitiveTaintAnalysis.java b/src/main/analysis/org/bdware/analysis/example/FieldSensitiveTaintAnalysis.java
new file mode 100644
index 0000000..a93ed77
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/example/FieldSensitiveTaintAnalysis.java
@@ -0,0 +1,94 @@
+package org.bdware.analysis.example;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.bdware.analysis.BasicBlock;
+import org.bdware.analysis.BreadthFirstSearch;
+import org.bdware.analysis.taint.TaintBB;
+import org.bdware.analysis.taint.TaintCFG;
+import org.bdware.analysis.taint.TaintResult;
+import org.bdware.analysis.taint.TaintValue;
+import org.objectweb.asm.tree.MethodNode;
+
+import java.util.*;
+
+public class FieldSensitiveTaintAnalysis extends BreadthFirstSearch<TaintResult, TaintBB> {
+    private static final Logger LOGGER = LogManager.getLogger(FieldSensitiveTaintAnalysis.class);
+    public static boolean isDebug = false;
+    TaintCFG cfg;
+
+    public FieldSensitiveTaintAnalysis(TaintCFG cfg) {
+        this.cfg = cfg;
+        List<TaintBB> toAnalysis = new ArrayList<>();
+        /*
+         * NaiveTaintBB������ boolean inList NaiveTaintResult preResult NaiveTaintResult
+         * sucResult
+         */
+        TaintBB b = (TaintBB) cfg.getBasicBlockAt(0);
+        /*
+         * NaiveTaintResult�еı����� Frame<TaintValue> frame TaintInterpreter interpreter
+         * TaintValue ret InsnPrinter printer int nLocals int nStack
+         * NaiveTaintResult�е��ࣺ TaintValue int size boolean isTainted
+         * TaintInterpreter() NaiveTaintResult currentResult Frame�еı����� V returnValue
+         * //���������ķ������ͣ����Ϊvoid��Ϊnull V[] values //�ֲ������Ͳ����� int locals
+         * //�ֲ������ĸ��� int top //������ջ��Ԫ�ظ���
+         */
+        b.preResult = new TaintResult();
+        // ��ʼ��
+        int arg = cfg.argsLocal();
+        cfg.executeLocal();
+        TaintResult.interpreter.setTaintBits(cfg.taintBits);
+        b.preResult.frame.setLocal(arg, new TaintValue(1, cfg.taintBits.allocate("arg" + arg)));
+        /*
+         * if (NaiveTaintResult.nLocals > 2) { b.preResult.frame.setLocal(0, new
+         * TaintValue(1, cfg.taintBits.allocate("arg0"))); b.preResult.frame.setLocal(1,
+         * new TaintValue(1, cfg.taintBits.allocate("arg1")));
+         * b.preResult.frame.setLocal(2, new TaintValue(1,
+         * cfg.taintBits.allocate("arg2"))); }
+         */
+        // .ret = TaintValue������size=1
+        b.preResult.ret = new TaintValue(1);
+        TaintResult.printer.setLabelOrder(cfg.getLabelOrder());
+        // ����ǰ��b���뵽�����б���
+        toAnalysis.add(b);
+        b.setInList(true);
+        // ����BreadthFirstSearch���еĺ���setToAnalysis����ʱBreadthFirstSearch�����toAnalysisΪ��ǰ�Ŀ��б�ֻ��һ����B0
+        /*
+         * BreadthFirstSearch���еı����� Map<T, AnalysisResult> results; List<T>
+         * toAnalysis;
+         */
+        setToAnalysis(toAnalysis);
+        if (isDebug) {
+            MethodNode methodNode = cfg.getMethodNode();
+            LOGGER.info("Method: " + methodNode.name + " " + methodNode.desc);
+            LOGGER.info("Local: " + methodNode.maxLocals + " " + methodNode.maxStack);
+        }
+    }
+
+    @Override
+    public TaintResult execute(TaintBB t) {
+        return t.forwardAnalysis();
+    }
+
+    // Current Block is done, merge sucResult to sucBlocks!
+    @Override
+    public Collection<TaintBB> getSuc(TaintBB t) {
+        // System.out.println("---------------------------------");
+        // System.out.println("XXXXXB" + t.blockID + " sucBlock:" +
+        // t.sucResult.frame2Str());
+        Set<BasicBlock> subBlock = cfg.getSucBlocks(t);
+        Set<TaintBB> ret = new HashSet<>();
+        for (BasicBlock bb : subBlock) {
+            TaintBB ntbb = (TaintBB) bb;
+            ntbb.preResult.mergeResult(t.sucResult);
+            // System.out.println(
+            // "XXXXXB" + ntbb.blockID + " mergedBlock:" +
+            // ntbb.preResult.frame2Str() + " "
+            // + ntbb.preResult);
+            ret.add(ntbb);
+        }
+        // System.out.println("---------------------------------");
+        return ret;
+    }
+
+}
diff --git a/src/main/analysis/org/bdware/analysis/example/MultiSourceTaintAnalysis.java b/src/main/analysis/org/bdware/analysis/example/MultiSourceTaintAnalysis.java
new file mode 100644
index 0000000..c5f468e
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/example/MultiSourceTaintAnalysis.java
@@ -0,0 +1,184 @@
+package org.bdware.analysis.example;
+
+import org.bdware.analysis.BasicBlock;
+import org.bdware.analysis.BreadthFirstSearch;
+import org.bdware.analysis.OpInfo;
+import org.bdware.analysis.taint.*;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.InsnNode;
+import org.objectweb.asm.tree.JumpInsnNode;
+
+import java.util.*;
+
+// 1. Dependency Analysis ..
+// 2. Mulitple Source + Muliple Sink
+// 3. Combine Dependency+TaintAnalysis
+public class MultiSourceTaintAnalysis extends BreadthFirstSearch<TaintResult, TaintBB> {
+    TaintCFG cfg;
+
+    public MultiSourceTaintAnalysis(TaintCFG cfg) {
+        this.cfg = cfg;
+        List<TaintBB> toAnalysis = new ArrayList<>();
+        TaintBB b = (TaintBB) cfg.getBasicBlockAt(0);
+        b.preResult = new TaintResult();
+        // Put the RootObject into the index 0 of the Local Variable Table
+        b.preResult.frame.setLocal(0, HeapObject.getRootObject());
+        // The number of parameters of this method minus one
+        int arg = cfg.argsLocal();
+        // Put the arg into the index 2 of the Local Variable Table
+        b.preResult.frame.setLocal(1, new TaintValue(1, cfg.taintBits.allocate("arg")));
+        // Find the executeContract functions and allocate taintBits
+        cfg.executeLocal();
+        TaintResult.interpreter.setTaintBits(cfg.taintBits);
+        b.preResult.ret = new TaintValue(1);
+        TaintResult.printer.setLabelOrder(cfg.getLabelOrder());
+        toAnalysis.add(b);
+        b.setInList(true);
+        setToAnalysis(toAnalysis);
+        if (TaintConfig.isDebug) {
+            System.out.println("===Method:" + cfg.getMethodNode().name + cfg.getMethodNode().desc);
+            System.out.println(
+                    "===Local:"
+                            + cfg.getMethodNode().maxLocals
+                            + " "
+                            + cfg.getMethodNode().maxStack);
+        }
+    }
+
+    @Override
+    public TaintResult execute(TaintBB t) {
+        return t.forwardAnalysis();
+    }
+
+    @Override
+    public Collection<TaintBB> getSuc(TaintBB t) {
+        Set<BasicBlock> subBlock = cfg.getSucBlocks(t);
+        Set<TaintBB> ret = new HashSet<>();
+        for (BasicBlock bb : subBlock) {
+            TaintBB ntbb = (TaintBB) bb;
+            if (TaintConfig.isDebug)
+                System.out.println(
+                        "[MultiSoruceTaintAnalysis] B"
+                                + ntbb.blockID
+                                + " beforeMerge:"
+                                + ntbb.preResult.frame2Str());
+            ntbb.preResult.mergeResult(t.sucResult);
+            if (TaintConfig.isDebug)
+                System.out.println(
+                        "[MultiSoruceTaintAnalysis] B"
+                                + ntbb.blockID
+                                + " afterMerge:"
+                                + ntbb.preResult.frame2Str());
+
+            ret.add(ntbb);
+        }
+        return ret;
+    }
+
+    /*
+     * Dependency Analysis
+     */
+    public static Map<Integer, List<Integer>> depAnalysis(TaintCFG cfg) {
+        // public static Set<Integer> depAnalysis(TaintCFG cfg) {
+        // Step1: Find all the jump blocks
+        Set<Integer> depBlocks = new HashSet<>();
+        for (BasicBlock b : cfg.getBlocks()) {
+            Set<BasicBlock> suc = cfg.getSucBlocks(b);
+            int sucSize = suc.size();
+            // Get rid of some jump nodes such as "GOTO"
+            if (sucSize > 1) {
+                for (AbstractInsnNode an : b.getInsn()) {
+                    if (an instanceof JumpInsnNode) {
+                        int blockID = b.blockID;
+                        depBlocks.add(blockID);
+                    }
+                }
+            }
+        }
+        /*Step2: Traverse all the blocks, for each block, traverse all the depBlocks,
+         * for each depBlock, traverse all the sucBlocks,
+         * if all the sucBlocks are arrival from each block, then the block is dependency with the depBlock.
+         */
+        List<BasicBlock> blocks = cfg.getBlocks();
+        Map<Integer, List<Integer>> map = new HashMap<>();
+        for (BasicBlock bb : blocks) {
+            List<Integer> list = new ArrayList<>();
+            for (int id : depBlocks) {
+                Set<BasicBlock> sucBlocks = cfg.getSucBlocks(cfg.getBasicBlockAt(id));
+                int sucSize = sucBlocks.size();
+                int count = 0;
+                for (BasicBlock sucBlock : sucBlocks) {
+                    if (isArrival(cfg, sucBlock, bb)) count++;
+                }
+                if (count > 0 && count != sucSize) list.add(id);
+            }
+            map.put(bb.blockID, list);
+        }
+
+        Map<Integer, List<Integer>> returnMap = new HashMap<>();
+        for (Map.Entry<Integer, List<Integer>> entry : map.entrySet()) {
+            // System.out.print(entry.getKey() +" : ");
+            BasicBlock tmp = cfg.getBasicBlockAt(entry.getKey());
+            for (AbstractInsnNode an : tmp.getInsn()) {
+                int opcode;
+                if (an instanceof InsnNode) {
+                    opcode = an.getOpcode();
+                    if (OpInfo.ops[opcode].canReturn()) {
+                        returnMap.put(entry.getKey(), entry.getValue());
+                    }
+                }
+            }
+            /*
+            for(int i : entry.getValue())
+            	System.out.print(i+ " ");
+            System.out.println();
+            */
+        }
+
+        // add dependence to the last block
+        if (returnMap != null) {
+            List<Integer> lastBlockDep = new ArrayList<>();
+            for (Map.Entry<Integer, List<Integer>> entry : returnMap.entrySet()) {
+                List<Integer> listID = entry.getValue();
+                for (Integer i : listID) {
+                    if (!lastBlockDep.contains(i)) lastBlockDep.add(i);
+                }
+            }
+            returnMap.put(cfg.getBasicBlockSize() - 1, lastBlockDep);
+        }
+
+        // TODO get value from branch block
+        /*
+        List<Integer> list = returnMap.get(cfg.getBasicBlockSize()-1);
+        for(int i : list) {
+        	System.out.println(i);
+        	TaintBB tb = (TaintBB) cfg.getBasicBlockAt(i);
+        	System.out.println("Test:");
+        	tb.preResult.printResult();
+        }
+        */
+
+        return returnMap;
+    }
+
+    public static boolean isArrival(TaintCFG cfg, BasicBlock suc, BasicBlock bb) {
+        // Test
+        /*
+        if(suc.blockID == bb.blockID)
+        	return true;
+        if(suc.blockID == 7 && bb.blockID == 11)
+        	return true;
+        if(suc.blockID == 9 && bb.blockID == 11)
+        	return true;
+        if(suc.blockID == 7 && bb.blockID == 12)
+        	return true;
+        if(suc.blockID == 9 && bb.blockID == 12)
+        	return true;
+        return false;
+        */
+
+        if (suc.blockID == bb.blockID) return true;
+        DirectGraphDFS dgDFS = new DirectGraphDFS(cfg, suc);
+        return dgDFS.isArrival(bb);
+    }
+}
diff --git a/src/main/analysis/org/bdware/analysis/example/NaiveTaintAnalysis.java b/src/main/analysis/org/bdware/analysis/example/NaiveTaintAnalysis.java
new file mode 100644
index 0000000..11602fc
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/example/NaiveTaintAnalysis.java
@@ -0,0 +1,79 @@
+package org.bdware.analysis.example;
+
+import org.bdware.analysis.BasicBlock;
+import org.bdware.analysis.BreadthFirstSearch;
+import org.bdware.analysis.taint.*;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.LabelNode;
+
+import java.util.*;
+
+public class NaiveTaintAnalysis extends BreadthFirstSearch<TaintResult, TaintBB> {
+    TaintCFG cfg;
+
+    public NaiveTaintAnalysis(TaintCFG cfg) {
+        this.cfg = cfg;
+        List<TaintBB> toAnalysis = new ArrayList<>();
+        // TODO add inputBlock!
+        TaintBB b = (TaintBB) cfg.getBasicBlockAt(0);
+
+        b.preResult = new TaintResult();
+        // local0=scriptfuncion, is not tainted;
+        // local1=this, is not tainted;
+        // local2=this, is not tainted;
+        if (TaintResult.nLocals > 2) {
+            b.preResult.frame.setLocal(0, new TaintValue(1, 0));
+            b.preResult.frame.setLocal(1, new TaintValue(1, 0));
+            b.preResult.frame.setLocal(2, new TaintValue(1, 1));
+        }
+        b.preResult.ret = new TaintValue(1);
+        TaintResult.printer.setLabelOrder(cfg.getLabelOrder());
+        toAnalysis.add(b);
+        b.setInList(true);
+        setToAnalysis(toAnalysis);
+        if (TaintConfig.isDebug) {
+            System.out.println("===Method:" + cfg.getMethodNode().name + cfg.getMethodNode().desc);
+            System.out.println(
+                    "===Local:"
+                            + cfg.getMethodNode().maxLocals
+                            + " "
+                            + cfg.getMethodNode().maxStack);
+        }
+    }
+
+    @Override
+    public TaintResult execute(TaintBB t) {
+        return t.forwardAnalysis();
+    }
+
+    // Current Block is done, merge sucResult to sucBlocks!
+    @Override
+    public Collection<TaintBB> getSuc(TaintBB t) {
+        // System.out.println("---------------------------------");
+        // System.out.println("XXXXXB" + t.blockID + " sucBlock:" +
+        // t.sucResult.frame2Str());
+        Set<BasicBlock> subBlock = cfg.getSucBlocks(t);
+        System.out.println("ttlist" + t.list);
+        System.out.println("subblock" + subBlock.size());
+        Set<TaintBB> ret = new HashSet<>();
+        AbstractInsnNode insn = t.lastInsn();
+        if (insn instanceof LabelNode) {
+            LabelNode label = ((LabelNode) insn);
+            System.out.println("-----");
+            System.out.println("label" + label.getLabel().toString());
+            System.out.println(cfg.getBasicBlockByLabel(label.getLabel()).blockID);
+        }
+
+        for (BasicBlock bb : subBlock) {
+            System.out.println(bb.blockID);
+            TaintBB ntbb = (TaintBB) bb;
+            ntbb.preResult.mergeResult(t.sucResult);
+            // System.out.println(
+            // "XXXXXB" + ntbb.blockID + " mergedBlock:" + ntbb.preResult.frame2Str() + " "
+            // + ntbb.preResult);
+            ret.add(ntbb);
+        }
+        // System.out.println("---------------------------------");
+        return ret;
+    }
+}
diff --git a/src/main/analysis/org/bdware/analysis/gas/BFS.java b/src/main/analysis/org/bdware/analysis/gas/BFS.java
new file mode 100644
index 0000000..235b945
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/gas/BFS.java
@@ -0,0 +1,31 @@
+package org.bdware.analysis.gas;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.bdware.analysis.BasicBlock;
+
+public abstract class BFS {
+	protected List<BasicBlock> toAnalysis;
+	public abstract Collection<BasicBlock> getSuc(BasicBlock BB);
+	public void analysis() {
+		BasicBlock current = null;
+		for (int i = 0; i < toAnalysis.size(); i++) {
+			current = toAnalysis.get(i);
+			//current.setInList(false);
+			if(current.inList()) {
+			Collection<BasicBlock> sucs = getSuc(current);
+			for (BasicBlock next : sucs) {
+					if (!next.inList()) {
+						toAnalysis.add(next);
+						next.setInList(true);
+					}
+				}
+			}
+		}
+	}
+	public void setToAnalysis(List<BasicBlock> l) {
+		toAnalysis = l;
+	}
+	
+}
diff --git a/src/main/analysis/org/bdware/analysis/gas/CostDetail.java b/src/main/analysis/org/bdware/analysis/gas/CostDetail.java
new file mode 100644
index 0000000..9fa2113
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/gas/CostDetail.java
@@ -0,0 +1 @@
+package org.bdware.analysis.gas;
\ No newline at end of file
diff --git a/src/main/analysis/org/bdware/analysis/gas/CountProgramPoint.java b/src/main/analysis/org/bdware/analysis/gas/CountProgramPoint.java
new file mode 100644
index 0000000..5652de5
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/gas/CountProgramPoint.java
@@ -0,0 +1,226 @@
+package org.bdware.analysis.gas;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.bdware.analysis.BasicBlock;
+import org.bdware.analysis.CFGraph;
+import org.bdware.analysis.OpInfo;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.InvokeDynamicInsnNode;
+import org.objectweb.asm.tree.JumpInsnNode;
+
+public class CountProgramPoint {
+	public static HashMap<Integer, Map<String, Integer>> ppcount;
+	CFGraph actionCfg;
+	private String bdName;
+	HashMap<String, CFGraph> cfgraphMap;
+	String actionName;
+	int globalPC;
+
+	public CountProgramPoint(HashMap<String, CFGraph> cfgMap, int startPc, int endPc, String aName,
+			HashMap<Integer, Map<String, Integer>> ppc) {
+		ppcount = ppc;
+		cfgraphMap = cfgMap;
+		actionName = aName;
+		typeCount(startPc, endPc);
+	}
+
+	private HashMap<Integer, Map<String, Integer>> callCount(AbstractInsnNode insn) {
+		if (insn instanceof InvokeDynamicInsnNode) {
+			invoke = ((InvokeDynamicInsnNode) insn).bsmArgs[0];
+			String functionName = ((InvokeDynamicInsnNode) insn).name;
+			dynCount(functionName);
+		} else {
+			normalCount(insn);
+		}
+		return ppcount;
+	}
+
+	Object invoke = 0;
+
+	public HashMap<Integer, Map<String, Integer>> typeCount(int startPc, int endPc) {
+		if (startPc == 0) {
+			ppcount.put(startPc, new HashMap<>());
+			globalPC = startPc;
+		} else {
+			ppcount.put(endPc, new HashMap<>());
+			globalPC = endPc;
+		}
+		actionCfg = cfgraphMap.get(actionName);
+		int blockStart = 0, blockend = 0;
+		if (startPc == 0) {
+			blockStart = 0;
+		} else {
+			OUT: for (int j = 0; j < actionCfg.getBasicBlockSize(); j++) {
+				BasicBlock bb = actionCfg.getBasicBlockAt(j);
+				AbstractInsnNode insnNode = bb.lastInsn();
+				if (insnNode instanceof InvokeDynamicInsnNode) {
+					invoke = ((InvokeDynamicInsnNode) insnNode).bsmArgs[0];
+					if ((int) invoke == startPc) {
+						blockStart = j;
+						break OUT;
+					}
+				}
+			}
+		}
+		OUT: for (int j = 0; j < actionCfg.getBasicBlockSize(); j++) {
+			BasicBlock bb = actionCfg.getBasicBlockAt(j);
+			AbstractInsnNode insnNode = bb.lastInsn();
+			if (insnNode instanceof InvokeDynamicInsnNode) {
+				invoke = ((InvokeDynamicInsnNode) insnNode).bsmArgs[0];
+				if ((int) invoke == endPc) {
+					blockend = j;
+					break OUT;
+				}
+			}
+		}
+
+		return getInsn(blockStart, blockend);
+
+	}
+
+	private HashMap<Integer, Map<String, Integer>> getInsn(int blockStart, int blockend) {
+		BasicBlock t;
+		if (blockend == blockStart && blockStart != 0) {
+			System.out.println("blockend" + blockend);
+			t = actionCfg.getBasicBlockAt(blockend);
+			if (t.list.size() > 0) {
+				List<AbstractInsnNode> insnList = t.getInsn();
+				for (AbstractInsnNode insn : insnList) {
+					if (insn instanceof InvokeDynamicInsnNode) {
+						callCount(insn);
+					} else if (insn instanceof JumpInsnNode) {
+						jumpCount(insn);
+					} else {
+						normalCount(insn);
+					}
+				}
+			}
+			return ppcount;
+		} else if (blockend == 0) {
+			return ppcount;
+		} else if (blockend != blockStart && blockStart != 0) {
+			blockStart = blockStart + 1;
+			blockend = blockend + 1;
+			System.out.println(blockStart);
+		}
+		for (int i = blockStart; i < blockend; i++) {
+			t = actionCfg.getBasicBlockAt(i);
+			System.out.println("[t.blockID]" + t.blockID);
+			if (t.list.size() > 0) {
+				List<AbstractInsnNode> insnList = t.getInsn();
+				for (AbstractInsnNode insn : insnList) {
+					if (insn != null) {
+						OpInfo info = null;
+						if (insn.getOpcode() >= 0) {
+							info = OpInfo.ops[insn.getOpcode()];
+							System.out.println("[info.toString()]" + info.toString());
+						}
+						if (info == null) {
+
+						} else if (info.canThrow()) {
+							callCount(insn);
+						} else if (info.canBranch()) {
+							jumpCount(insn);
+						} else if (info.canContinue()) {
+							normalCount(insn);
+						} else if (info.canReturn()) {
+							normalCount(insn);
+						} else if (info.canSwitch()) {
+							normalCount(insn);
+						} else {
+							System.out.println("[info:else]" + info);
+							normalCount(insn);
+						}
+					}
+				}
+			}
+
+		}
+		return ppcount;
+	}
+
+	private void normalCount(AbstractInsnNode insn) {
+		bdName = FeeSchedule.BDInsn.name();
+		if (ppcount.get(globalPC).containsKey(bdName)) {
+			ppcount.get(globalPC).put(bdName, ppcount.get(globalPC).get(bdName) + 1);
+		} else {
+			ppcount.get(globalPC).put(bdName, 1);
+		}
+
+	}
+
+	private void jumpCount(AbstractInsnNode insn) {
+		bdName = FeeSchedule.BDjump.name();
+		if (ppcount.get(globalPC).containsKey(bdName)) {
+			ppcount.get(globalPC).put(bdName, ppcount.get(globalPC).get(bdName) + 1);
+		} else {
+			ppcount.get(globalPC).put(bdName, 1);
+		}
+	}
+
+	private void dynCount(String functionName) {
+		if (functionName.contains("getProp")) {
+			bdName = FeeSchedule.BDgetMethod.name();
+			if (ppcount.get(globalPC).containsKey(bdName)) {
+				ppcount.get(globalPC).put(bdName, ppcount.get(globalPC).get(bdName) + 1);
+				System.out.println("   function   " + functionName);
+			} else {
+				ppcount.get(globalPC).put(bdName, 1);
+			}
+		} else if (functionName.contains("setProp")) {
+			bdName = FeeSchedule.BDsetMethod.name();
+			if (ppcount.get(globalPC).containsKey(bdName)) {
+				ppcount.get(globalPC).put(bdName, ppcount.get(globalPC).get(bdName) + 1);
+				System.out.println("   function   " + functionName);
+			} else {
+				ppcount.get(globalPC).put(bdName, 1);
+			}
+		} else if (functionName.contains("call") && functionName.contains("Util")) {
+			bdName = FeeSchedule.BDcallUtil.name();
+			if (ppcount.get(globalPC).containsKey(bdName)) {
+				ppcount.get(globalPC).put(bdName, ppcount.get(globalPC).get(bdName) + 1);
+				System.out.println("   function   " + functionName);
+			} else {
+				ppcount.get(globalPC).put(bdName, 1);
+			}
+		} else if (functionName.contains("call") && isInnerfunction(functionName)) {
+			bdName = FeeSchedule.BDcallFuntion.name();
+			if (ppcount.get(globalPC).containsKey(bdName)) {
+				ppcount.get(globalPC).put(bdName, ppcount.get(globalPC).get(bdName) + 1);
+				System.out.println("   function   " + functionName);
+			} else {
+				ppcount.get(globalPC).put(bdName, 1);
+			}
+		} else if (functionName.contains("call")) {
+			bdName = FeeSchedule.BDcallUtil.name();
+			if (ppcount.get(globalPC).containsKey(bdName)) {
+				ppcount.get(globalPC).put(bdName, ppcount.get(globalPC).get(bdName) + 1);
+				System.out.println("   function   " + functionName);
+			} else {
+				ppcount.get(globalPC).put(bdName, 1);
+			}
+
+		} else {
+			bdName = FeeSchedule.BDInsn.name();
+			if (ppcount.get(globalPC).containsKey(bdName)) {
+				ppcount.get(globalPC).put(bdName, ppcount.get(globalPC).get(bdName) + 1);
+			} else {
+				ppcount.get(globalPC).put(bdName, 1);
+			}
+		}
+
+	}
+
+	private boolean isInnerfunction(String functionName) {
+		String string = functionName.split(":")[2];
+		if (cfgraphMap.containsKey(string)) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+}
diff --git a/src/main/analysis/org/bdware/analysis/gas/DFS.java b/src/main/analysis/org/bdware/analysis/gas/DFS.java
new file mode 100644
index 0000000..60d1812
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/gas/DFS.java
@@ -0,0 +1,25 @@
+package org.bdware.analysis.gas;
+
+import org.bdware.analysis.BasicBlock;
+import org.bdware.analysis.CFGraph;
+
+import java.util.Set;
+
+public abstract class DFS {
+    private boolean[] marked = new boolean[2048];
+
+    public abstract Set<BasicBlock> getSuc(BasicBlock BB);
+
+    public void dfs(CFGraph cfg, BasicBlock start) {
+        marked[start.blockID] = true;
+        // System.out.println("[start.blockID]" + start.blockID);
+        Set<BasicBlock> sucBlocks = getSuc(start);
+        for (BasicBlock bb : sucBlocks) {
+            if (!marked[bb.blockID]) dfs(cfg, bb);
+        }
+    }
+
+    public boolean isArrival(BasicBlock end) {
+        return marked[end.blockID];
+    }
+}
diff --git a/src/main/analysis/org/bdware/analysis/gas/Evaluates.java b/src/main/analysis/org/bdware/analysis/gas/Evaluates.java
new file mode 100644
index 0000000..2c797cd
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/gas/Evaluates.java
@@ -0,0 +1,96 @@
+package org.bdware.analysis.gas;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+public class Evaluates {
+    Map<Integer, HashMap<String, Integer>> callFunctionResult;
+    Map<Integer, Long> CountResult = new HashMap<>();
+
+    public Map<Integer, Long> getCallFee() {
+        for (Entry<Integer, HashMap<String, Integer>> c : callFunctionResult.entrySet()) {
+            Integer cfrKey = c.getKey();
+            long value = 0;
+            HashMap<String, Integer> map = c.getValue();
+            for (Entry<String, Integer> cmap : map.entrySet()) {
+
+                long fee = getValue(cmap.getKey());
+                value = fee * cmap.getValue() + value;
+            }
+                CountResult.put(cfrKey, value);
+        }
+        return CountResult;
+    }
+
+    public long getValue(String name) {
+        long value = 0;
+        switch (name) {
+            case "BDgetMethod":
+                value = FeeSchedule.BDgetMethod.getFee();
+                break;
+            case "BDsetMethod":
+                value = FeeSchedule.BDsetMethod.getFee();
+                break;
+            case "BDnew":
+                value = FeeSchedule.BDnew.getFee();
+                break;
+            case "BDcallUtil":
+                value = FeeSchedule.BDcallUtil.getFee();
+                break;
+            case "BDcallFuntion":
+                value = FeeSchedule.BDcallFuntion.getFee();
+                break;
+            case "BDcall":
+                value = FeeSchedule.BDcall.getFee();
+                break;
+            case "BDjump":
+                value = FeeSchedule.BDjump.getFee();
+                break;
+            case "BDInsn":
+                value = FeeSchedule.BDInsn.getFee();
+                break;
+            default:
+                break;
+        }
+        return value;
+    }
+
+    long sum;
+    Set<HashMap<String, Long>> set = new HashSet<>();
+
+    public void getGas(HashMap<String, Set<Map<Integer, HashMap<String, Integer>>>> branchCount) {
+            for (Entry<String, Set<Map<Integer, HashMap<String, Integer>>>> varInsn :
+                    branchCount.entrySet()) {
+                sum = 0;
+                for (Map<Integer, HashMap<String, Integer>> m : varInsn.getValue()) {
+                    blockGas(m);
+                }
+                map.put(varInsn.getKey(), sum);
+            }
+    }
+
+    private void blockGas(Map<Integer, HashMap<String, Integer>> m) {
+        for (Entry<Integer, HashMap<String, Integer>> map : m.entrySet()) {
+            for (Entry<String, Integer> insnMap : map.getValue().entrySet()) {
+                long value = getValue(insnMap.getKey()) * insnMap.getValue();
+                sum = sum + value;
+            }
+        }
+    }
+
+    public static HashMap<String, Long> map = new HashMap<>();
+
+    public void getInsnGas(Map<Integer, Set<Map<Integer, HashMap<String, Integer>>>> ppMap) {
+        for (Entry<Integer, Set<Map<Integer, HashMap<String, Integer>>>> varInsn :
+                ppMap.entrySet()) {
+            sum = 0;
+            for (Map<Integer, HashMap<String, Integer>> m : varInsn.getValue()) {
+                blockGas(m);
+            }
+            map.put(varInsn.getKey().toString(), sum);
+    }
+    }
+}
diff --git a/src/main/analysis/org/bdware/analysis/gas/FeeSchedule.java b/src/main/analysis/org/bdware/analysis/gas/FeeSchedule.java
new file mode 100644
index 0000000..bad8086
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/gas/FeeSchedule.java
@@ -0,0 +1,51 @@
+package org.bdware.analysis.gas;
+
+public enum FeeSchedule {
+	// BDaload(20L),BDstore(200L),
+	BDgetMethod(10L), BDsetMethod(20L), BDnew(20L),BDcallUtil(30L), BDcallFuntion(40L), BDcall(10L), BDjump(15L), BDInsn(1L);
+
+	long fee;
+
+	FeeSchedule(long value) {
+		fee = value;
+	}
+
+	public long getFee() {
+		return fee;
+	}
+
+	public long getValue(String name) {
+		long value=0;
+		switch (name) {
+		case "BDgetMethod":
+			value=BDgetMethod.getFee();
+			break;
+		case "BDsetMethod":
+			value= BDsetMethod.getFee();
+			break;
+		case "BDcallUtil":
+			value= BDcallUtil.getFee();
+			break;
+		case "BDcallFuntion":
+			value= BDcallFuntion.getFee();
+			break;
+		case "BDcall":
+			value= BDcall.getFee();
+			break;
+		case "BDjump":
+			value= BDjump.getFee();
+			break;
+		case "BDInsn":
+			value= BDInsn.getFee();
+			break;
+		default:
+			break;
+		}
+		return value;
+	}
+
+	public String getString(FeeSchedule feeName) {
+		return feeName.toString();
+
+	}
+}
diff --git a/src/main/analysis/org/bdware/analysis/gas/PPCount.java b/src/main/analysis/org/bdware/analysis/gas/PPCount.java
new file mode 100644
index 0000000..c39a887
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/gas/PPCount.java
@@ -0,0 +1,450 @@
+package org.bdware.analysis.gas;
+
+import java.util.ArrayList;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.bdware.analysis.BasicBlock;
+import org.bdware.analysis.CFGraph;
+import org.bdware.analysis.OpInfo;
+import org.bdware.analysis.gas.DFS;
+import org.bdware.analysis.gas.FeeSchedule;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.InvokeDynamicInsnNode;
+import org.objectweb.asm.tree.JumpInsnNode;
+import org.objectweb.asm.tree.LabelNode;
+
+public class PPCount extends DFS {
+    CFGraph cfg;
+    String functionGlobel;
+    private String bdName;
+    private int globalInvoke = 0;
+    static List<String> functionList = new ArrayList<>();
+    private int globalBlockID;
+
+    public static Map<String, HashMap<String, Integer>> varInsnCount = new HashMap<>();
+    public static HashMap<String, Set<Map<Integer, HashMap<String, Integer>>>> branchCount =
+            new HashMap<>();;
+    public static Map<Integer, HashMap<String, Integer>> callFunction = new HashMap<>();
+    public static Map<Integer, HashMap<String, Integer>> BlockInsn = new HashMap<>();
+    public static Map<Integer, Set<Map<Integer, HashMap<String, Integer>>>> ppMap = new HashMap<>();
+    public HashSet<Integer> countBlock = new HashSet<>();
+    boolean[] isBranchBlock;
+
+    public PPCount(CFGraph cfg, int flag) {
+        this.cfg = cfg;
+        functionGlobel = cfg.getMethodNode().name;
+        varInsnCount.put(functionGlobel, new HashMap<>());
+        globalInvoke = flag;
+        ppMap.put(globalInvoke, new HashSet<>());
+        callFunction.put(flag, new HashMap<>());
+        List<BasicBlock> toAnalysis = new ArrayList<>();
+        BasicBlock b = cfg.getBasicBlockAt(0);
+        toAnalysis.add(b);
+        b.setInList(true);
+//        System.out.println("=========:"+cfg.getMethodNode().name);
+        functionList.add(cfg.getMethodNode().name);
+        isBranchBlock = new boolean[cfg.getBasicBlockSize()];
+        // setToAnalysis(toAnalysis);
+    }
+
+    // @Override
+    // public Collection<BasicBlock> getSuc(BasicBlock t) {
+    // System.out.println("++++++++++" + t.blockID);
+    // typeCount(t);
+    // Set<BasicBlock> subBlock = cfg.getSucBlocks(t);
+    // DFS dgDFS = new DFS(cfg, t);
+    //
+    // return subBlock;
+    // }
+
+    @Override
+    public Set<BasicBlock> getSuc(BasicBlock t) {
+        // System.out.println("++++++++++" + t.blockID);
+        Set<BasicBlock> subBlock = cfg.getSucBlocks(t);
+        typeCount(t);
+        return subBlock;
+    }
+
+    private void typeCount(BasicBlock t) { // 一个基本块里面的所有指令
+        int count = 0;
+        countBlock.add(t.blockID);
+        globalBlockID = t.blockID;
+        BlockInsn.put(t.blockID, new HashMap<>());
+        List<AbstractInsnNode> insnList = t.getInsn();
+        OpInfo info = null;
+        if (t.list.size() > 0) {
+            for (AbstractInsnNode ab : insnList) {
+                if (ab != null) {
+                    if (ab.getOpcode() >= 0) {
+                        count++;
+                    }
+                }
+            }
+        }
+        t.insnCount = count;
+        if (t.list.size() > 0) {
+            for (int i = 0; i < insnList.size(); i++) {
+                AbstractInsnNode insn = insnList.get(i);
+                if (insn != null) {
+                    if (insn.getOpcode() >= 0) {
+                        info = OpInfo.ops[insn.getOpcode()];
+                    }
+                    if (info == null) {
+                    } else if (info.canThrow()) {
+                        callCount(insn, t);
+                    } else if (info.canBranch()) {
+                        normalCount(insn, t);
+                        jumpCount(insn, t);
+                    } else if (info.canContinue() || info.canSwitch() || info.canReturn()) {
+                        normalCount(insn, t);
+                    }
+                }
+            }
+        }
+        addBlock(t);
+        removeBranch();
+    }
+
+    int jumpBlockid = -1;
+    int conBlockid = -1;
+    private boolean isBranch = false;
+    private List<Integer> globalBranch = new ArrayList<>();
+
+    private void jumpCount(AbstractInsnNode insn, BasicBlock t) {
+        switch (insn.getOpcode()) {
+            case Opcodes.IFNE: // succeeds if and only if value ≠ 0
+            case Opcodes.IFEQ: // succeeds if and only if value = 0
+            case Opcodes.IFLT: // succeeds if and only if value < 0
+            case Opcodes.IFLE:
+
+            case Opcodes.IFGE: // succeeds if and only if value ≥ 0
+                isBranch = true;
+                globalBranch.add(globalInvoke);
+                Map<Integer, HashMap<String, Integer>> map = new HashMap<>();
+                Map<Integer, HashMap<String, Integer>> map2 = new HashMap<>();
+                Set<Map<Integer, HashMap<String, Integer>>> ret = new HashSet<>();
+                Set<Map<Integer, HashMap<String, Integer>>> ret2 = new HashSet<>();
+                map.put(t.blockID, BlockInsn.get(t.blockID));
+                map2.put(t.blockID - 1, BlockInsn.get(t.blockID - 1));
+                ret.add(map);
+                ret.add(map2);
+                ret2.add(map);
+                ret2.add(map2);
+                if (insn instanceof JumpInsnNode) {
+                    LabelNode jump = ((JumpInsnNode) insn).label;
+                    jumpBlockid = cfg.getBasicBlockByLabel(jump.getLabel()).blockID;
+
+                    branchCount.put(globalInvoke + "false" + jumpBlockid, ret);
+                }
+                conBlockid = t.blockID + 1;
+
+                branchCount.put(globalInvoke + "true" + conBlockid, ret2);
+                // System.out.println(branchCount);
+                break;
+            case Opcodes.IFGT: // succeeds if and only if value > 0
+                if (insn instanceof JumpInsnNode) {
+                    LabelNode jump = ((JumpInsnNode) insn).label;
+                    jumpBlockid = cfg.getBasicBlockByLabel(jump.getLabel()).blockID;
+                    branchCount.put(globalInvoke + "false" + jumpBlockid, new HashSet<>());
+                }
+                conBlockid = t.blockID + 1;
+                branchCount.put(globalInvoke + "true" + conBlockid, new HashSet<>());
+                // System.out.println(branchCount);
+                break;
+            case Opcodes.IF_ACMPEQ: // succeeds if and only if value1 = value2
+            case Opcodes.IF_ACMPNE: // succeeds if and only if value1 ≠ value2
+            case Opcodes.IF_ICMPEQ: // succeeds if and only if value1 = value2
+            case Opcodes.IF_ICMPGE: // succeeds if and only if value1 ≠ value2
+            case Opcodes.IF_ICMPGT: // succeeds if and only if value1 > value2
+            case Opcodes.IF_ICMPLE: // succeeds if and only if value1 ≤ value2
+            case Opcodes.IF_ICMPLT: // succeeds if and only if value1 < value2
+            case Opcodes.IFNONNULL:
+            case Opcodes.TABLESWITCH:
+            case Opcodes.LOOKUPSWITCH:
+            case Opcodes.GOTO:
+                lastBlockId = t.blockID + 1;
+            default:
+                break;
+        }
+    }
+
+    int lastBlockId = 0;
+    int globalBlock = 0;
+
+    private void normalCount(AbstractInsnNode insn, BasicBlock t) {
+        if (t.blockID != lastBlockId) {
+            lastBlockId = t.blockID;
+            globalBlock = 0;
+        }
+        OpInfo info = OpInfo.ops[insn.getOpcode()];
+        bdName = FeeSchedule.BDInsn.name();
+        if (BlockInsn.get(globalBlockID).containsKey(bdName)) {
+            BlockInsn.get(globalBlockID).put(bdName, BlockInsn.get(globalBlockID).get(bdName) + 1);
+        } else {
+            BlockInsn.get(globalBlockID).put(bdName, 1);
+        }
+        globalBlock++;
+
+        if (globalBranch.size() != 0) {
+            int gb = globalBranch.get(globalBranch.size() - 1);
+            if (gb == globalInvoke) {
+                if (globalBlock == t.insnCount && !(insn instanceof JumpInsnNode)) {
+                    chosenBranch(t);
+                }
+            }
+        }
+    }
+
+    private void chosenBranch(BasicBlock t) {
+        if (globalBranch.size() != 0) {
+            int branch = globalBranch.get(globalBranch.size() - 1);
+            Set<Map<Integer, HashMap<String, Integer>>> ret = new HashSet<>();
+            if (isBranch && t.blockID < jumpBlockid) {
+                isBranchBlock[t.blockID] = true;
+                if (branchCount.get(branch + "true" + conBlockid) != null
+                        && !branchCount.get(branch + "true" + conBlockid).isEmpty()) {
+                    ret = branchCount.get(branch + "true" + conBlockid);
+                    Map<Integer, HashMap<String, Integer>> map = new HashMap<>();
+                    map.put(t.blockID, BlockInsn.get(t.blockID));
+                    ret.add(map);
+                    branchCount.put(branch + "true" + conBlockid, ret);
+
+                } else if (branchCount.get(branch + "true" + conBlockid) != null) {
+                    ret = branchCount.get(branch + "true" + conBlockid);
+                    Map<Integer, HashMap<String, Integer>> map = new HashMap<>();
+                    map.put(t.blockID, BlockInsn.get(t.blockID));
+                    branchCount.get(branch + "true" + conBlockid).add(map);
+                }
+            } else if (isBranch && t.blockID >= jumpBlockid) {
+                isBranchBlock[t.blockID] = true;
+                if (branchCount.get(branch + "false" + jumpBlockid) != null
+                        && !branchCount.get(branch + "false" + jumpBlockid).isEmpty()) {
+                    Set<Map<Integer, HashMap<String, Integer>>> list =
+                            branchCount.get(branch + "false" + jumpBlockid);
+                    Map<Integer, HashMap<String, Integer>> map = new HashMap<>();
+                    map.put(t.blockID, BlockInsn.get(t.blockID));
+                    list.add(map);
+                    branchCount.put(branch + "false" + jumpBlockid, list);
+
+                } else if (branchCount.get(branch + "false" + jumpBlockid) != null) {
+                    Map<Integer, HashMap<String, Integer>> map = new HashMap<>();
+                    if (ret.isEmpty()) {
+                        map.put(t.blockID, BlockInsn.get(t.blockID));
+                        branchCount.get(branch + "false" + jumpBlockid).add(map);
+                    }
+                }
+            }
+        }
+    }
+
+    int perBlockId = 0;
+
+    public void removeBranch() {
+        if (!globalBranch.isEmpty()) {
+            for (int i = 0; i < globalBranch.size(); i++) {
+                if (ppMap.containsKey(globalBranch.get(i))) {
+                    ppMap.remove(globalBranch.get(i));
+                }
+            }
+        }
+    }
+
+    private void callCount(AbstractInsnNode insn, BasicBlock t) {
+        boolean isNewCall = false;
+        lastBlockId = t.blockID;
+        if (insn instanceof InvokeDynamicInsnNode) {
+            Object invoke = ((InvokeDynamicInsnNode) insn).bsmArgs[0];
+            String functionName = ((InvokeDynamicInsnNode) insn).name;
+            isNewCall = true;
+            if ((int) invoke > 5) {
+                dynCount(functionName);
+                globalInvoke = (int) invoke;
+                ppMap.put((int) invoke, new HashSet<>());
+                perBlockId = t.blockID;
+            } else {
+                dynCount(functionName);
+            }
+        } else {
+            normalCount(insn, t);
+        }
+        if (!isNewCall || t.blockID == jumpBlockid || t.blockID == conBlockid) {
+            branchEnd = true;
+            chosenBranch(t);
+        }
+    }
+
+    private void addBlock(BasicBlock t) {
+        if (t.list.size() > 0) {
+            Set<Map<Integer, HashMap<String, Integer>>> ret = new HashSet<>();
+            Map<Integer, HashMap<String, Integer>> map = new HashMap<>();
+            map.put(t.blockID, BlockInsn.get(t.blockID));
+            if (!isBranchBlock[t.blockID]) {
+                if (!ppMap.containsKey(globalInvoke)) {
+                    ppMap.put(globalInvoke, new HashSet<>());
+                }
+                ppMap.get(globalInvoke).add(map);
+            }
+        }
+    }
+
+    boolean branchEnd;
+
+    private void dynCount(String functionName) {
+        String function = functionName.split(":")[1];
+        if (function.contains("getProp")) {
+            bdName = FeeSchedule.BDgetMethod.name();
+            if (BlockInsn.get(globalBlockID).containsKey(bdName)) {
+                BlockInsn.get(globalBlockID)
+                        .put(bdName, BlockInsn.get(globalBlockID).get(bdName) + 1);
+            } else {
+                BlockInsn.get(globalBlockID).put(bdName, 1);
+            }
+        } else if (function.contains("setProp")) {
+            bdName = FeeSchedule.BDsetMethod.name();
+            if (BlockInsn.get(globalBlockID).containsKey(bdName)) {
+                BlockInsn.get(globalBlockID)
+                        .put(bdName, BlockInsn.get(globalBlockID).get(bdName) + 1);
+            } else {
+                BlockInsn.get(globalBlockID).put(bdName, 1);
+            }
+        } else if (function.contains("new")) {
+            bdName = FeeSchedule.BDnew.name();
+            if (BlockInsn.get(globalBlockID).containsKey(bdName)) {
+                BlockInsn.get(globalBlockID)
+                        .put(bdName, BlockInsn.get(globalBlockID).get(bdName) + 1);
+            } else {
+                BlockInsn.get(globalBlockID).put(bdName, 1);
+            }
+        } else if (function.contains("call") && functionName.split(":")[2].contains("Util")) {
+            bdName = FeeSchedule.BDcallUtil.name();
+            if (BlockInsn.get(globalBlockID).containsKey(bdName)) {
+                BlockInsn.get(globalBlockID)
+                        .put(bdName, BlockInsn.get(globalBlockID).get(bdName) + 1);
+            } else {
+                BlockInsn.get(globalBlockID).put(bdName, 1);
+            }
+        } else if (function.contains("call") && isInnerfunction(functionName)) {
+           // System.out.println("[call ]" + functionName);
+            String methName = functionName.split(":")[2];
+            bdName = FeeSchedule.BDcallFuntion.name();
+            if (BlockInsn.get(globalBlockID).containsKey(bdName)) {
+                BlockInsn.get(globalBlockID)
+                        .put(
+                                bdName + "," + methName,
+                                BlockInsn.get(globalBlockID).get(bdName + "," + methName) + 1);
+                System.out.println("   function   " + functionName);
+            } else {
+                BlockInsn.get(globalBlockID).put(bdName + "," + methName, 1);
+            }
+
+        } else if (function.contains("call")) {
+            bdName = FeeSchedule.BDcall.name();
+            if (BlockInsn.get(globalBlockID).containsKey(bdName)) {
+                BlockInsn.get(globalBlockID)
+                        .put(bdName, BlockInsn.get(globalBlockID).get(bdName) + 1);
+            } else {
+                BlockInsn.get(globalBlockID).put(bdName, 1);
+            }
+        } else if (functionName.contains("traceif")) {
+            bdName = FeeSchedule.BDjump.name();
+            if (BlockInsn.get(globalBlockID).containsKey(bdName)) {
+                BlockInsn.get(globalBlockID)
+                        .put(bdName, BlockInsn.get(globalBlockID).get(bdName) + 1);
+            } else {
+                BlockInsn.get(globalBlockID).put(bdName, 1);
+            }
+        }
+    }
+
+    private boolean isInnerfunction(String functionName) {
+        String string = functionName.split(":")[2];
+       // System.out.println("++++++++++++++" + functionName);
+       // System.out.println("【function】" + functionList);
+        if (functionList.contains(string)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    //    public static void main(String[] args) throws Exception {
+    //        String path = "/Users/hulingxuan/git/SmartContract/output/main.yjs";
+    //        ContractNode contractNode = null;
+    //        YJSCompiler compiler = new YJSCompiler();
+    //        contractNode = compiler.compile(new FileInputStream(path), null);
+    //        engine = new DesktopEngine();
+    //        engine.loadContract(contractNode, false);
+    //
+    //        Map<String, byte[]> clzs = engine.dumpClass();
+    //        Map<String, MethodNode> methods = new HashMap<>();
+    //        for (byte[] clz : clzs.values()) {
+    //            ClassNode classNode = new ClassNode();
+    //            ClassReader cr = new ClassReader(clz);
+    //            cr.accept(classNode, ClassReader.EXPAND_FRAMES);
+    //            for (MethodNode mn : classNode.methods) {
+    //                methods.put(mn.name, mn);
+    //            }
+    //        }
+    //        int flag = 0;
+    //        for (FunctionNode fn : contractNode.getFunctions()) {
+    //            functionList.add(fn.functionName);
+    //            MethodNode mn = methods.get(fn.functionName);
+    //            if (mn != null) {
+    //                CFGraph cfg = new CFGraph(mn) {
+    //                    @Override
+    //                    public BasicBlock getBasicBlock(int id) {
+    //                        return new BasicBlock(id);
+    //                    }
+    //                };
+    //                // cfg.getLabelOrder();
+    //                PPCount countFee = new PPCount(cfg, flag);
+    //
+    //                BasicBlock bb = cfg.getBasicBlockAt(0);
+    //                countFee.dfs(cfg, bb);
+    //                // cfg.printSelf();
+    //
+    //                Evaluates feEvaluates = new Evaluates();
+    //                feEvaluates.getGas(branchCount);
+    //                feEvaluates.getInsnGas(ppMap);
+    //                countFunction(fn.functionName, Evaluates.map);
+    //                System.out.println("+++++++" + functionSumGas);
+    //                System.out.println("========" + Evaluates.map);
+    //                flag++;
+    //            }
+    //        }
+    //        System.out.println(branchCount);
+    //        System.out.println(BlockInsn);
+    //        System.out.println(ppMap);
+    //
+    //        // System.out.println(feEvaluates.getCallFee());
+    //    }
+
+    public static HashMap<String, Long> functionSumGas = new HashMap<>();
+
+    public static void countFunction(String functionName, HashMap<String, Long> map) {
+        long sumTrue = 0;
+        long sumFalse = 0;
+        long sum = 0;
+
+        for (Map.Entry<String, Long> entry : map.entrySet()) {
+            if (entry.getKey().contains("true")) {
+                sumTrue = entry.getValue();
+            } else if (entry.getKey().contains("false")) {
+                sumFalse = entry.getValue();
+            } else {
+                sum += entry.getValue();
+            }
+        }
+        functionSumGas.put(functionName, sum);
+        functionSumGas.put(functionName + "true", sumTrue);
+        functionSumGas.put(functionName + "false", sumFalse);
+    }
+}
diff --git a/src/main/analysis/org/bdware/analysis/taint/DirectGraphDFS.java b/src/main/analysis/org/bdware/analysis/taint/DirectGraphDFS.java
new file mode 100644
index 0000000..3dcdf70
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/taint/DirectGraphDFS.java
@@ -0,0 +1,28 @@
+package org.bdware.analysis.taint;
+
+import java.util.Set;
+
+import org.bdware.analysis.BasicBlock;
+
+public class DirectGraphDFS {
+	private boolean[] marked;
+	
+	public DirectGraphDFS(TaintCFG cfg, BasicBlock start) {
+		marked = new boolean[cfg.getBlocks().size()];
+		dfs(cfg, start);
+	}
+	
+	private void dfs(TaintCFG cfg, BasicBlock start) {
+		marked[start.blockID] = true;
+		Set<BasicBlock> sucBlocks = cfg.getSucBlocks(start);
+		for(BasicBlock bb : sucBlocks) {
+			if(!marked[bb.blockID])
+				dfs(cfg, bb);
+		}
+	}
+	
+	public boolean isArrival(BasicBlock end) {
+		return marked[end.blockID];
+	}
+ 
+}
diff --git a/src/main/analysis/org/bdware/analysis/taint/HeapObject.java b/src/main/analysis/org/bdware/analysis/taint/HeapObject.java
new file mode 100644
index 0000000..ccee54d
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/taint/HeapObject.java
@@ -0,0 +1,247 @@
+package org.bdware.analysis.taint;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.MethodInsnNode;
+
+import org.objectweb.asm.tree.InvokeDynamicInsnNode;
+
+public class HeapObject extends TaintValue {
+	private Map<String, TaintValue> fields = new HashMap<String, TaintValue>();
+	static int allocatID = 0;
+	int id;
+
+	public HeapObject() {
+		super(1);
+		id = allocatID++;
+	}
+
+	public HeapObject(TaintValue t) {
+		this();
+		if (t != null) {
+			merge(t);
+			size = t.size;
+		} else {
+			isTainted = 0;
+			size = 1;
+		}
+	}
+
+	public static HeapObject getRootObject() {
+		HeapObject ret = new HeapObject();
+		ret.setProp("Global", new HeapObject());
+		ret.setProp("getScope", new HeapObject());
+		return ret;
+	}
+
+	@Override
+	public String toString() {
+		return countSize() + "|" + super.toString();
+	}
+
+	private String countSize() {
+		objSet = new HashSet<>();
+		return countSizeInternal();
+	}
+
+	private String countSizeInternal() {
+		if (objSet.contains(this))
+			return "{H" + id + "}";
+		objSet.add(this);
+		String ret = "{H" + id + ",";
+		for (String field : fields.keySet()) {
+			TaintValue tv = fields.get(field);
+			if (tv instanceof HeapObject)
+				ret += field + ":" + ((HeapObject) tv).countSizeInternal() + ",";
+			else
+				ret += field + ":" + tv.isTainted;
+		}
+		ret += isTainted + "}";
+		return ret;
+	}
+
+	private static HashSet<HeapObject> objSet;
+
+	public static TaintValue operate(AbstractInsnNode insn, List<? extends TaintValue> values,
+			TaintValue calculatedVal) {
+		TaintValue retVal = null;
+		String desc;
+		switch (insn.getOpcode()) {
+		case Opcodes.INVOKEVIRTUAL:
+			desc = ((MethodInsnNode) insn).owner;
+			if (isGetScopeObject((MethodInsnNode) insn) && values.size() != 0) {
+				TaintValue tv = values.get(0);
+				if (tv instanceof HeapObject) {
+					HeapObject heapObject = (HeapObject) tv;
+					retVal = heapObject.getProp("getScope");
+					if (retVal == null) {
+						return calculatedVal;
+					} else
+						return retVal;
+				}
+			}
+			break;
+		case Opcodes.INVOKESPECIAL:
+		case Opcodes.INVOKESTATIC:
+		case Opcodes.INVOKEINTERFACE:
+			break;
+		case Opcodes.INVOKEDYNAMIC:
+			desc = ((InvokeDynamicInsnNode) insn).name;
+			desc = desc.replaceAll(".*:", "");
+			if (isDynGet((InvokeDynamicInsnNode) insn)) {
+				TaintValue tval = values.get(0);
+				if (tval instanceof HeapObject) {
+					HeapObject heapObject = (HeapObject) tval;
+					retVal = heapObject.getProp(desc);
+					if (retVal != null) {
+						if (TaintConfig.isDebug)
+							System.out.println("[HeapObject] get:" + desc + " taintVal:" + retVal);
+						return retVal;
+					} else {
+						if (TaintConfig.isDebug)
+							System.out.println("[HeapObject] get:" + desc + " taintVal: empty");
+						heapObject.setProp(desc, new HeapObject());
+						return heapObject.getProp(desc);
+					}
+				} else {
+					// TODO
+				}
+			} else if (isDynSet((InvokeDynamicInsnNode) insn)) {
+				// TaintValue tv = values.get(0);
+				if (TaintConfig.isDebug)
+					System.out.println("[HeapObject] set:" + desc + " taintVal:" + values.get(1));
+				TaintValue tval = values.get(0);
+				if (tval instanceof HeapObject) {
+					HeapObject heapObject = (HeapObject) tval;
+					// heapObject.merge(values.get(1));
+					heapObject.setProp(desc,
+							values.get(1) instanceof HeapObject ? values.get(1) : new HeapObject(values.get(1)));
+				} else {
+					HeapObject heapObject = new HeapObject(tval);
+					heapObject.merge(tval);
+					// heapObject.merge(values.get(1));
+					heapObject.setProp(desc, values.get(1));
+				}
+			} else {
+				for (TaintValue tv : values) {
+					if (tv instanceof HeapObject) {
+						calculatedVal.isTainted |= ((HeapObject) tv).wholeTaint();
+					}
+				}
+			}
+			break;
+		default:
+		}
+		return calculatedVal;
+
+	}
+
+	private static boolean isDynGet(InvokeDynamicInsnNode insn) {
+		String desc = insn.name;
+		if (desc.contains("getProp") && desc.contains("getMethod") && desc.contains("getElem")) {
+			return true;
+		}
+		return false;
+	}
+
+	private static boolean isDynSet(InvokeDynamicInsnNode insn) {
+		String desc = insn.name;
+		if (desc.contains("setProp") && desc.contains("setElem")) {
+			// System.out.println(desc);
+			return true;
+		}
+		return false;
+	}
+
+	private static boolean isGetScopeObject(MethodInsnNode insn) {
+		if (insn.owner.contains("wrp/jdk/nashorn/internal/runtime/ScriptFunction") && insn.name.equals("getScope"))
+			return true;
+		return false;
+	}
+
+	public TaintValue getProp(String str) {
+		return fields.get(str);
+	}
+
+	public TaintValue setProp(String str, TaintValue val) {
+		return fields.put(str, val);
+	}
+
+	@Override
+	public HeapObject clone() {
+		return this;
+	}
+
+	public HeapObject actualClone() {
+		ccObj = new HashMap<>();
+		return cloneInternal();
+	}
+
+	static Map<HeapObject, HeapObject> ccObj;
+
+	private HeapObject cloneInternal() {
+		if (ccObj.containsKey(this))
+			return ccObj.get(this);
+		HeapObject ho = new HeapObject();
+		ccObj.put(this, ho);
+		ho.isTainted = isTainted;
+		for (String field : fields.keySet()) {
+			TaintValue target = fields.get(field);
+			if (target instanceof HeapObject)
+				ho.fields.put(field, ((HeapObject) target).cloneInternal());
+			else
+				ho.fields.put(field, target.clone());
+		}
+		return ho;
+	}
+
+	// TODO consider the "Cite circle"
+	public void heapMerge(TaintValue target) {
+		merge(target);
+		if (target instanceof HeapObject) {
+			HeapObject targetObject = (HeapObject) target;
+			for (String field : targetObject.fields.keySet()) {
+				if (fields.containsKey(field)) {
+					TaintValue t2 = fields.get(field);
+					TaintValue target2 = targetObject.fields.get(field);
+					// System.out.println("[HeapObject heapMerge]:" + field);
+					if (t2 instanceof HeapObject) {
+						((HeapObject) t2).heapMerge(target2);
+					} else if (target2 instanceof HeapObject) {
+						HeapObject next = ((HeapObject) target2).clone();
+						next.merge(t2);
+						fields.put(field, next);
+					} else
+						t2.merge(target2);
+
+				} else
+					fields.put(field, targetObject.fields.get(field).clone());
+
+			}
+		}
+	}
+
+	public synchronized long wholeTaint() {
+		objSet = new HashSet<>();
+		return wholeTaintInternal();
+	}
+
+	private long wholeTaintInternal() {
+		if (objSet.contains(this))
+			return 0L;
+		objSet.add(this);
+		long ret = isTainted;
+		for (TaintValue tv : fields.values()) {
+			if (tv instanceof HeapObject)
+				ret |= ((HeapObject) tv).wholeTaintInternal();
+			else
+				ret |= tv.isTainted;
+		}
+		return ret;
+	}
+
+}
diff --git a/src/main/analysis/org/bdware/analysis/taint/TaintBB.java b/src/main/analysis/org/bdware/analysis/taint/TaintBB.java
new file mode 100644
index 0000000..d7949fd
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/taint/TaintBB.java
@@ -0,0 +1,70 @@
+package org.bdware.analysis.taint;
+
+import java.util.List;
+
+import org.bdware.analysis.AnalysisTarget;
+import org.bdware.analysis.BasicBlock;
+import org.objectweb.asm.tree.AbstractInsnNode;
+
+public class TaintBB extends BasicBlock implements AnalysisTarget {
+	boolean inList = false;
+
+	public TaintBB(int id) {
+		super(id);
+		preResult = new TaintResult();
+		sucResult = new TaintResult();
+	}
+
+	public TaintResult preResult;
+	public TaintResult sucResult;
+
+	@Override
+	public boolean inList() {
+		return inList;
+	}
+
+	@Override
+	public void setInList(boolean b) {
+		inList = b;
+	}
+	 
+	public String getResult() {
+		return (sucResult.frame2Str() + " Ret:" + sucResult.ret.toString());
+	}
+
+	public String getResultWithTaintBit() {
+		return "Ret:" + sucResult.ret.toReadableTaint();
+	}
+
+	public TaintResult forwardAnalysis() {
+		TaintResult oldSuc = sucResult;
+		sucResult = (TaintResult) preResult.clone();
+		TaintResult currentResult = sucResult;
+		List<AbstractInsnNode> insns = getInsn();
+		if (TaintConfig.isDebug)
+			System.out.println("[TaintBB] Enter B" + blockID + ":" + getResult() + " size:" + insns.size());
+
+		for (int i = 0; i < insns.size(); i++) {
+			currentResult = (TaintResult) currentResult.merge(insns.get(i));
+		}
+		currentResult.mergeResult(oldSuc);
+
+		if (TaintConfig.isDebug)
+			System.out.println("[TaintBB] Leave B" + blockID + ":" + getResult() + " size:" + insns.size());
+		// already done.
+		return currentResult;
+	}
+
+	public AbstractInsnNode lastInsn() {
+		return list.get(list.size() - 1);
+	}
+	public AbstractInsnNode firstInsn() {
+		return list.get(0);
+	}
+	public List<AbstractInsnNode> AllInsn() {
+		return list;
+	}
+	
+
+
+}
diff --git a/src/main/analysis/org/bdware/analysis/taint/TaintBits.java b/src/main/analysis/org/bdware/analysis/taint/TaintBits.java
new file mode 100644
index 0000000..331d179
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/taint/TaintBits.java
@@ -0,0 +1,68 @@
+package org.bdware.analysis.taint;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class TaintBits {
+	Map<Long, String> data;
+	Map<String, Long> type2Taint;
+	long curr;
+	Map<String, String> reallocate;
+	int count = 0;
+
+	public TaintBits() {
+		curr = 1L;
+		data = new HashMap<>();
+		type2Taint = new HashMap<>();
+		reallocate = new HashMap<>();
+	}
+
+	public long allocate(String type) {
+		type = reallocateCall(type);
+		if (type2Taint.containsKey(type))
+			return type2Taint.get(type);
+		long ret = curr;
+		data.put(curr, type);
+		type2Taint.put(type, curr);
+		curr <<= 1;
+		return ret;
+	}
+
+	private String reallocateCall(String type) {
+		if (reallocate.containsKey(type))
+			return reallocate.get(type);
+		if (type.contains("dyn:call:executeContract")) {
+			reallocate.put(type, "executeContract" + (count++));
+			return reallocate.get(type);
+		}
+		return type;
+	}
+
+	public long getTaintValue(String type) {
+		type = reallocateCall(type);
+		if (type2Taint.containsKey(type))
+			return type2Taint.get(type);
+		return -1;
+	}
+
+	public String taintInfo() {
+		String ret = "";
+		long curr = this.curr >> 1;
+		for (; curr >= 1L;) {
+			ret += data.get(curr) + ", ";
+			curr >>= 1;
+		}
+		return ret;
+	}
+
+	public String parse(long isTainted) {
+		String ret = "";
+		long curr = this.curr >> 1;
+		for (; curr >= 1L;) {
+			if ((isTainted & curr) != 0)
+				ret += data.get(curr) + " ";
+			curr >>= 1;
+		}
+		return ret;
+	}
+}
diff --git a/src/main/analysis/org/bdware/analysis/taint/TaintCFG.java b/src/main/analysis/org/bdware/analysis/taint/TaintCFG.java
new file mode 100644
index 0000000..4a62cb8
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/taint/TaintCFG.java
@@ -0,0 +1,84 @@
+package org.bdware.analysis.taint;
+
+import java.util.List;
+
+import org.bdware.analysis.BasicBlock;
+import org.bdware.analysis.CFGraph;
+import org.bdware.analysis.InsnPrinter;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.InvokeDynamicInsnNode;
+import org.objectweb.asm.tree.MethodNode;
+
+public class TaintCFG extends CFGraph {
+	public TaintBits taintBits;
+
+	public TaintCFG(MethodNode mn) {
+		super(mn);
+		taintBits = new TaintBits();
+	}
+
+	@Override
+	public BasicBlock getBasicBlock(int id) {
+		return new TaintBB(id);
+	}
+
+	public int argsLocal() {
+		String desc = getMethodNode().desc;
+		String[] parameters = desc.split("[)]");
+		String parameter = parameters[0];
+		String[] args = parameter.split("[;]");
+		return args.length - 1;
+	}
+
+	public void executeLocal() {
+		for (BasicBlock bb : basicBlocks) {
+			for (AbstractInsnNode an : bb.getInsn()) {
+				if (an instanceof InvokeDynamicInsnNode) {
+					InvokeDynamicInsnNode inDy = (InvokeDynamicInsnNode) an;
+					if (inDy.name.contains("dyn:call:executeContract")) {
+						taintBits.allocate(inDy.name + inDy.hashCode());
+					}
+				}
+			}
+		}
+		return;
+	}
+
+	public void printSelf() {
+		InsnPrinter printer = new InsnPrinter(Opcodes.ASM4, System.out);
+		printer.setLabelOrder(getLabelOrder());
+		System.out.println("======Method:" + getMethodNode().name + getMethodNode().desc + "=======");
+		System.out.println("=====TaintInfo: " + taintBits.taintInfo() + "===========");
+		for (BasicBlock bb : basicBlocks) {
+			System.out.print("==B" + bb.blockID);
+			if (getSucBlocks(bb).size() > 0)
+				System.out.print("-->");
+			for (BasicBlock suc : getSucBlocks(bb))
+				System.out.print(" B" + suc.blockID);
+			System.out.println("==");
+			TaintBB b = (TaintBB) bb;
+			if (b.preResult != null) {
+				System.out.print("前序分析结果：");
+				b.preResult.printResult();
+			    //System.out.println("test:"+b.getResultWithTaintBit());
+			}
+
+			for (AbstractInsnNode an : bb.getInsn()) {
+				an.accept(printer);
+			}
+		}
+
+	}
+
+	public TaintBB getLastBlock() {
+		if (basicBlocks != null && basicBlocks.size() > 0)
+			return (TaintBB) basicBlocks.get(basicBlocks.size() - 1);
+		return null;
+	}
+	
+	public List<BasicBlock> getBlocks() {
+		return basicBlocks;
+	}
+
+}
diff --git a/src/main/analysis/org/bdware/analysis/taint/TaintConfig.java b/src/main/analysis/org/bdware/analysis/taint/TaintConfig.java
new file mode 100644
index 0000000..e51392a
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/taint/TaintConfig.java
@@ -0,0 +1,5 @@
+package org.bdware.analysis.taint;
+
+public class TaintConfig {
+	public static boolean isDebug = false;
+}
diff --git a/src/main/analysis/org/bdware/analysis/taint/TaintInterpreter.java b/src/main/analysis/org/bdware/analysis/taint/TaintInterpreter.java
new file mode 100644
index 0000000..c29ab7a
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/taint/TaintInterpreter.java
@@ -0,0 +1,177 @@
+package org.bdware.analysis.taint;
+
+import java.util.List;
+
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.InvokeDynamicInsnNode;
+import org.objectweb.asm.tree.MethodInsnNode;
+import org.objectweb.asm.tree.TypeInsnNode;
+import org.objectweb.asm.tree.analysis.AnalyzerException;
+import org.objectweb.asm.tree.analysis.Interpreter;
+
+public class TaintInterpreter extends Interpreter<TaintValue> {
+	TaintResult currentResult;
+	TaintBits taintBits;
+
+	public TaintInterpreter(int api) {
+		super(api);
+
+	}
+
+	@Override
+	public TaintValue newValue(Type type) {
+		if (type != null)
+			return new TaintValue(type.getSize());
+		return new TaintValue(1);
+	}
+
+	@Override
+	public TaintValue newOperation(AbstractInsnNode insn) throws AnalyzerException {
+		TaintValue ret;
+		switch (insn.getOpcode()) {
+		case Opcodes.LCONST_0:
+		case Opcodes.LCONST_1:
+		case Opcodes.DCONST_0:
+		case Opcodes.DCONST_1:
+			ret = new TaintValue(2);
+			break;
+		case Opcodes.NEW:
+			TypeInsnNode typeNode = (TypeInsnNode) insn;
+			if (typeNode.desc.startsWith("wrp/jdk/nashorn/internal/scripts/JO")) {
+				ret = new HeapObject();
+			} else {
+				ret = new TaintValue(1);
+			}
+			break;
+		default:
+			ret = new TaintValue(1);
+		}
+		return ret;
+	}
+
+	@Override
+	public TaintValue copyOperation(AbstractInsnNode insn, TaintValue value) throws AnalyzerException {
+		return value;
+	}
+
+	@Override
+	public TaintValue unaryOperation(AbstractInsnNode insn, TaintValue value) throws AnalyzerException {
+		return value;
+	}
+
+	@Override
+	public TaintValue binaryOperation(AbstractInsnNode insn, TaintValue value1, TaintValue value2)
+			throws AnalyzerException {
+		/*
+		 * IALOAD, LALOAD, FALOAD, DALOAD, AALOAD, BALOAD, CALOAD, SALOAD, IADD, LADD,
+		 * FADD, DADD, ISUB, LSUB, FSUB, DSUB, IMUL, LMUL, FMUL, DMUL, IDIV, LDIV, FDIV,
+		 * DDIV, IREM, LREM, FREM, DREM, ISHL, LSHL, ISHR, LSHR, IUSHR, LUSHR, IAND,
+		 * LAND, IOR, LOR, IXOR, LXOR, LCMP, FCMPL, FCMPG, DCMPL, DCMPG, IF_ICMPEQ,
+		 * IF_ICMPNE, IF_ICMPLT, IF_ICMPGE, IF_ICMPGT, IF_ICMPLE, IF_ACMPEQ, IF_ACMPNE,
+		 * PUTFIELD
+		 */
+		TaintValue ret = new TaintValue(1);
+		ret.isTainted = value1.isTainted | value2.isTainted;
+		switch (insn.getOpcode()) {
+		case Opcodes.DALOAD:
+		case Opcodes.DADD:
+		case Opcodes.DSUB:
+		case Opcodes.DMUL:
+		case Opcodes.DDIV:
+		case Opcodes.DREM:
+		case Opcodes.LALOAD:
+		case Opcodes.LADD:
+		case Opcodes.LSUB:
+		case Opcodes.LMUL:
+		case Opcodes.LDIV:
+		case Opcodes.LREM:
+		case Opcodes.LSHL:
+		case Opcodes.LSHR:
+		case Opcodes.LUSHR:
+		case Opcodes.LAND:
+		case Opcodes.LXOR:
+		case Opcodes.LOR:
+			ret.size = 2;
+		default:
+		}
+		return ret;
+	}
+
+	@Override
+	public TaintValue ternaryOperation(AbstractInsnNode insn, TaintValue value1, TaintValue value2, TaintValue value3)
+			throws AnalyzerException {
+		// TODO
+		value1.isTainted |= value3.isTainted;
+		return value1;
+	}
+
+	@Override
+	public TaintValue naryOperation(AbstractInsnNode insn, List<? extends TaintValue> values) throws AnalyzerException {
+		int size = 1;
+		/*
+		 * INVOKEVIRTUAL, INVOKESPECIAL, INVOKESTATIC, INVOKEINTERFACE, MULTIANEWARRAY
+		 * and INVOKEDYNAMIC
+		 */
+		String desc;
+		switch (insn.getOpcode()) {
+		case Opcodes.INVOKEVIRTUAL:
+		case Opcodes.INVOKESPECIAL:
+		case Opcodes.INVOKESTATIC:
+		case Opcodes.INVOKEINTERFACE:
+			desc = ((MethodInsnNode) insn).desc;
+			if (desc != null && (desc.charAt(desc.length() - 1) == 'D' || desc.charAt(desc.length() - 1) == 'J'))
+				size = 2;
+			break;
+		case Opcodes.INVOKEDYNAMIC:
+			desc = ((InvokeDynamicInsnNode) insn).desc;
+			if (desc != null && (desc.charAt(desc.length() - 1) == 'D' || desc.charAt(desc.length() - 1) == 'J'))
+				size = 2;
+
+			// Extra..Judgeffff x
+			if (((InvokeDynamicInsnNode) insn).name.startsWith("dyn:setElem|setProp:")) {
+				if (values.size() == 2) {
+					values.get(0).isTainted |= values.get(1).isTainted;
+				}
+			}
+			break;
+		default:
+		}
+		TaintValue ret = new TaintValue(size);
+		for (TaintValue v : values)
+			if (v != null)
+				ret.isTainted |= v.isTainted;
+		if (insn instanceof InvokeDynamicInsnNode) {
+			long taint = (taintBits.getTaintValue(((InvokeDynamicInsnNode) insn).name + insn.hashCode()));
+
+			if (taint > 0L)
+				ret.isTainted |= taint;
+		}
+		return HeapObject.operate(insn, values, ret);
+	}
+
+	@Override
+	public void returnOperation(AbstractInsnNode insn, TaintValue value, TaintValue expected) throws AnalyzerException {
+		if (value instanceof HeapObject) {
+			currentResult.ret.isTainted |= ((HeapObject) value).wholeTaint();
+		} else if (value!=null)
+			currentResult.ret.isTainted |= value.isTainted;
+	}
+
+	@Override
+	public TaintValue merge(TaintValue v, TaintValue w) {
+		TaintValue ret = new TaintValue(v.getSize());
+		ret.isTainted |= v.isTainted;
+		ret.isTainted |= w.isTainted;
+		return ret;
+	}
+
+	public void setCurrentResult(TaintResult naiveTaintResult) {
+		currentResult = naiveTaintResult;
+	}
+
+	public void setTaintBits(TaintBits tb) {
+		taintBits = tb;
+	}
+}
\ No newline at end of file
diff --git a/src/main/analysis/org/bdware/analysis/taint/TaintResult.java b/src/main/analysis/org/bdware/analysis/taint/TaintResult.java
new file mode 100644
index 0000000..e3025c0
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/taint/TaintResult.java
@@ -0,0 +1,190 @@
+package org.bdware.analysis.taint;
+
+import org.bdware.analysis.AnalysisResult;
+import org.bdware.analysis.InsnPrinter;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.analysis.AnalyzerException;
+import org.objectweb.asm.tree.analysis.Frame;
+
+public class TaintResult extends AnalysisResult {
+	// public HeapObject heapObejct;
+	public Frame<TaintValue> frame;
+	public TaintValue ret;
+	public static int nLocals = 0;
+	public static int nStack = 0;
+	public static InsnPrinter printer = new InsnPrinter(Opcodes.ASM4, System.out);
+	public static TaintInterpreter interpreter = new TaintInterpreter(Opcodes.ASM4);
+
+	public TaintResult() {
+		frame = new Frame<>(nLocals, nStack);
+		ret = new TaintValue(1);
+		ret.isTainted = 0L;
+	}
+
+	@Override
+	public AnalysisResult merge(AbstractInsnNode insn) {
+		interpreter.setCurrentResult(this);
+		try {
+			if (TaintConfig.isDebug && insn.getOpcode() >= 0) {
+				System.out.println("[TaintResult] frameStatus:" + frame2Str());
+				insn.accept(printer);
+			}
+			if (insn.getOpcode() < 0) {
+				// System.out.println("[TaintResult] MetLabel:" +
+				// insn.getClass().getCanonicalName());
+			} else
+				frame.execute(insn, interpreter);
+			if (TaintConfig.isDebug && insn.getOpcode() >= 0) {
+				System.out.println("[TaintResult] frameStatus:" + frame2Str());
+
+			}
+
+		} catch (AnalyzerException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		// we use suc instead,so we don't create new object here.
+		return this;
+	}
+	
+
+	@Override
+	public void printResult() {
+		System.out.println("====" + frame2Str() + " Ret:" + ret.toString() + "====");
+	}
+
+	public String frame2Str() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("Local:");
+		for (int i = 0; i < frame.getLocals(); i++) { // getLocals����local�����size
+			TaintValue t = frame.getLocal(i);
+			if (t != null)
+				sb.append(t.toString());
+			else
+				sb.append("0--");
+		}
+		sb.append(" Stack:");
+		for (int i = 0; i < frame.getStackSize(); i++) { // getStackSize����stack�ĵ�ǰsize
+			TaintValue t = frame.getStack(i);
+			if (t != null)
+				sb.append(t.toString());
+			else
+				sb.append("0--");
+		}
+		return sb.toString();
+	}
+
+	private static boolean cover(TaintValue t1, TaintValue t2) {
+		// if (t2 == null || t2.isTainted == 0)
+		// return true;
+		// TODO whether is cover?
+		if (t1 != null && t1.isTainted != 0) {
+			if (t2 == null || t1.isTainted != t2.isTainted)
+				return true;
+		}
+		return false;
+	}
+
+	/*
+	 * private static boolean isTainted(TaintValue t1) { if (t1 != null &&
+	 * t1.isTainted) { return true; } return false; }
+	 */
+	private static boolean isTainted(TaintValue t1) {
+		if (t1 != null && t1.isTainted != 0) {
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public boolean covers(AnalysisResult result) {
+		TaintResult tr = (TaintResult) result;
+		boolean ret = coversInternal(tr);
+		return ret;
+		// System.out.println("[NaiveTaintResult] Cover:" + ret);
+		// System.out.println("[NaiveTaintResult] " + frame.toString());
+		// System.out.println("[NaiveTaintResult] " + tr.frame.toString());	
+	}
+
+	// preResult cover sucResult means
+	// preResult's taint is large or equals sucResult.
+	public boolean coversInternal(TaintResult tr) {
+		for (int i = 0; i < frame.getLocals() && i < tr.frame.getLocals(); i++)
+			if (cover(tr.frame.getLocal(i), frame.getLocal(i)))
+				return false;
+		// TODO why locals is not equal??
+		for (int i = frame.getLocals(); i < tr.frame.getLocals(); i++)
+			if (isTainted(tr.frame.getLocal(i)))
+				return false;
+		for (int i = 0; i < frame.getStackSize() && i < tr.frame.getStackSize(); i++)
+			if (cover(tr.frame.getStack(i), frame.getStack(i)))
+				return false;
+		for (int i = frame.getStackSize(); i < tr.frame.getStackSize(); i++)
+			if (isTainted(tr.frame.getStack(i)))
+				return false;
+		return true;
+	}
+
+	@Override
+	public void mergeResult(AnalysisResult r) {
+		TaintResult from = (TaintResult) r;
+		for (int i = 0; i < from.frame.getLocals(); i++) {
+			TaintValue target = from.frame.getLocal(i);
+			if (frame.getLocals() > i) {
+				TaintValue t1 = frame.getLocal(i);
+				if (target != null) {
+					if (t1 == null) {
+						t1 = target.clone();
+						frame.setLocal(i, t1);
+					} else {
+						t1.merge(target);
+					}
+				}
+			} else {
+				frame.setLocal(i, target.clone());
+			}
+		}
+
+		for (int i = 0; i < from.frame.getStackSize(); i++) {
+			TaintValue target = from.frame.getStack(i);
+			if (frame.getStackSize() > i) {
+				TaintValue t1 = frame.getStack(i);
+				if (target != null) {
+					if (t1 == null) {
+						t1 = target.clone();
+						frame.setStack(i, t1);
+					} else {
+						t1.merge(target);
+					}
+				}
+
+				t1.merge(from.frame.getStack(i));
+			} else {
+				if (target != null)
+					frame.push(target.clone());
+				else
+					frame.push(new TaintValue(1,0));
+			}
+		}
+		ret.merge(from.ret); 
+	}
+
+	@Override
+	public AnalysisResult clone() {
+		TaintResult ret = new TaintResult();
+		ret.frame = new Frame<>(frame);
+		for (int i = 0; i < ret.frame.getLocals(); i++) {
+			TaintValue t = ret.frame.getLocal(i);
+			if (t != null)
+				ret.frame.setLocal(i, t.clone());
+		}
+		for (int i = 0; i < ret.frame.getStackSize(); i++) {
+			TaintValue t = ret.frame.getStack(i);
+			if (t != null)
+				ret.frame.setStack(i, t.clone());
+		}
+		ret.ret = this.ret.clone();
+		return ret;
+	}
+}
diff --git a/src/main/analysis/org/bdware/analysis/taint/TaintValue.java b/src/main/analysis/org/bdware/analysis/taint/TaintValue.java
new file mode 100644
index 0000000..d01e7df
--- /dev/null
+++ b/src/main/analysis/org/bdware/analysis/taint/TaintValue.java
@@ -0,0 +1,54 @@
+package org.bdware.analysis.taint;
+
+import org.objectweb.asm.tree.analysis.Value;
+
+public class TaintValue implements Value {
+	public int size;
+	// public boolean isTainted;
+	public long isTainted;
+
+	public TaintValue(int size) {
+		this.size = size;
+		isTainted = 0L;
+	}
+
+	public TaintValue(int size, long isTainted) {
+		this.size = size;
+		this.isTainted = isTainted;
+	}
+
+	@Override
+	public int getSize() {
+		return size;
+	}
+
+	@Override
+	public String toString() {
+		String s = Long.toBinaryString(isTainted);
+		char[] c = s.toCharArray();
+		StringBuffer buf = new StringBuffer();
+		for (int i = 0; i < c.length; i++) {
+			if (c[i] == '1')
+				buf.append("1/");
+			else
+				buf.append("0/");
+		}
+		buf.append("--");
+		return buf.toString();
+	}
+
+	public TaintValue clone() {
+		TaintValue ret = new TaintValue(size);
+		ret.isTainted = isTainted;
+		return ret;
+	}
+
+	public String toReadableTaint() {
+		return TaintResult.interpreter.taintBits.parse(isTainted);
+	}
+
+	public void merge(TaintValue target) {
+		if (target != null)
+			isTainted |= target.isTainted;
+	}
+}
diff --git a/src/main/asm/org/objectweb/asm/AnnotationVisitor.java b/src/main/asm/org/objectweb/asm/AnnotationVisitor.java
new file mode 100644
index 0000000..3c8a740
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/AnnotationVisitor.java
@@ -0,0 +1,169 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm;
+
+/**
+ * A visitor to visit a Java annotation. The methods of this class must be
+ * called in the following order: ( <tt>visit</tt> | <tt>visitEnum</tt> |
+ * <tt>visitAnnotation</tt> | <tt>visitArray</tt> )* <tt>visitEnd</tt>.
+ * 
+ * @author Eric Bruneton
+ * @author Eugene Kuleshov
+ */
+public abstract class AnnotationVisitor {
+
+    /**
+     * The ASM API version implemented by this visitor. The value of this field
+     * must be one of {@link Opcodes#ASM4}.
+     */
+    protected final int api;
+
+    /**
+     * The annotation visitor to which this visitor must delegate method calls.
+     * May be null.
+     */
+    protected AnnotationVisitor av;
+
+    /**
+     * Constructs a new {@link AnnotationVisitor}.
+     * 
+     * @param api
+     *            the ASM API version implemented by this visitor. Must be one
+     *            of {@link Opcodes#ASM4}.
+     */
+    public AnnotationVisitor(final int api) {
+        this(api, null);
+    }
+
+    /**
+     * Constructs a new {@link AnnotationVisitor}.
+     * 
+     * @param api
+     *            the ASM API version implemented by this visitor. Must be one
+     *            of {@link Opcodes#ASM4}.
+     * @param av
+     *            the annotation visitor to which this visitor must delegate
+     *            method calls. May be null.
+     */
+    public AnnotationVisitor(final int api, final AnnotationVisitor av) {
+        if (api != Opcodes.ASM4) {
+            throw new IllegalArgumentException();
+        }
+        this.api = api;
+        this.av = av;
+    }
+
+    /**
+     * Visits a primitive value of the annotation.
+     * 
+     * @param name
+     *            the value name.
+     * @param value
+     *            the actual value, whose type must be {@link Byte},
+     *            {@link Boolean}, {@link Character}, {@link Short},
+     *            {@link Integer} , {@link Long}, {@link Float}, {@link Double},
+     *            {@link String} or {@link Type} or OBJECT or ARRAY sort. This
+     *            value can also be an array of byte, boolean, short, char, int,
+     *            long, float or double values (this is equivalent to using
+     *            {@link #visitArray visitArray} and visiting each array element
+     *            in turn, but is more convenient).
+     */
+    public void visit(String name, Object value) {
+        if (av != null) {
+            av.visit(name, value);
+        }
+    }
+
+    /**
+     * Visits an enumeration value of the annotation.
+     * 
+     * @param name
+     *            the value name.
+     * @param desc
+     *            the class descriptor of the enumeration class.
+     * @param value
+     *            the actual enumeration value.
+     */
+    public void visitEnum(String name, String desc, String value) {
+        if (av != null) {
+            av.visitEnum(name, desc, value);
+        }
+    }
+
+    /**
+     * Visits a nested annotation value of the annotation.
+     * 
+     * @param name
+     *            the value name.
+     * @param desc
+     *            the class descriptor of the nested annotation class.
+     * @return a visitor to visit the actual nested annotation value, or
+     *         <tt>null</tt> if this visitor is not interested in visiting this
+     *         nested annotation. <i>The nested annotation value must be fully
+     *         visited before calling other methods on this annotation
+     *         visitor</i>.
+     */
+    public AnnotationVisitor visitAnnotation(String name, String desc) {
+        if (av != null) {
+            return av.visitAnnotation(name, desc);
+        }
+        return null;
+    }
+
+    /**
+     * Visits an array value of the annotation. Note that arrays of primitive
+     * types (such as byte, boolean, short, char, int, long, float or double)
+     * can be passed as value to {@link #visit visit}. This is what
+     * {@link ClassReader} does.
+     * 
+     * @param name
+     *            the value name.
+     * @return a visitor to visit the actual array value elements, or
+     *         <tt>null</tt> if this visitor is not interested in visiting these
+     *         values. The 'name' parameters passed to the methods of this
+     *         visitor are ignored. <i>All the array values must be visited
+     *         before calling other methods on this annotation visitor</i>.
+     */
+    public AnnotationVisitor visitArray(String name) {
+        if (av != null) {
+            return av.visitArray(name);
+        }
+        return null;
+    }
+
+    /**
+     * Visits the end of the annotation.
+     */
+    public void visitEnd() {
+        if (av != null) {
+            av.visitEnd();
+        }
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/AnnotationWriter.java b/src/main/asm/org/objectweb/asm/AnnotationWriter.java
new file mode 100644
index 0000000..4cfa633
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/AnnotationWriter.java
@@ -0,0 +1,378 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm;
+
+/**
+ * An {@link AnnotationVisitor} that generates annotations in bytecode form.
+ * 
+ * @author Eric Bruneton
+ * @author Eugene Kuleshov
+ */
+final class AnnotationWriter extends AnnotationVisitor
+{
+
+	/**
+	 * The class writer to which this annotation must be added.
+	 */
+	private final ClassWriter cw;
+
+	/**
+	 * The number of values in this annotation.
+	 */
+	private int size;
+
+	/**
+	 * <tt>true<tt> if values are named, <tt>false</tt> otherwise. Annotation
+	 * writers used for annotation default and annotation arrays use unnamed
+	 * values.
+	 */
+	private final boolean named;
+
+	/**
+	 * The annotation values in bytecode form. This byte vector only contains
+	 * the values themselves, i.e. the number of values must be stored as a
+	 * unsigned short just before these bytes.
+	 */
+	private final ByteVector bv;
+
+	/**
+	 * The byte vector to be used to store the number of values of this
+	 * annotation. See {@link #bv}.
+	 */
+	private final ByteVector parent;
+
+	/**
+	 * Where the number of values of this annotation must be stored in
+	 * {@link #parent}.
+	 */
+	private final int offset;
+
+	/**
+	 * Next annotation writer. This field is used to store annotation lists.
+	 */
+	AnnotationWriter next;
+
+	/**
+	 * Previous annotation writer. This field is used to store annotation lists.
+	 */
+	AnnotationWriter prev;
+
+	// ------------------------------------------------------------------------
+	// Constructor
+	// ------------------------------------------------------------------------
+
+	/**
+	 * Constructs a new {@link AnnotationWriter}.
+	 * 
+	 * @param cw
+	 *            the class writer to which this annotation must be added.
+	 * @param named
+	 *            <tt>true<tt> if values are named, <tt>false</tt> otherwise.
+	 * @param bv
+	 *            where the annotation values must be stored.
+	 * @param parent
+	 *            where the number of annotation values must be stored.
+	 * @param offset
+	 *            where in <tt>parent</tt> the number of annotation values must
+	 *            be stored.
+	 */
+	AnnotationWriter(final ClassWriter cw, final boolean named,
+			final ByteVector bv, final ByteVector parent, final int offset)
+	{
+		super(Opcodes.ASM4);
+		this.cw = cw;
+		this.named = named;
+		this.bv = bv;
+		this.parent = parent;
+		this.offset = offset;
+	}
+
+	// ------------------------------------------------------------------------
+	// Implementation of the AnnotationVisitor abstract class
+	// ------------------------------------------------------------------------
+
+	@Override
+	public void visit(final String name, final Object value)
+	{
+		++size;
+		if (named)
+		{
+			bv.putShort(cw.newUTF8(name));
+		}
+		if (value instanceof String)
+		{
+			bv.put12('s', cw.newUTF8((String) value));
+		}
+		else if (value instanceof Byte)
+		{
+			bv.put12('B', cw.newInteger(((Byte) value).byteValue()).index);
+		}
+		else if (value instanceof Boolean)
+		{
+			int v = ((Boolean) value).booleanValue() ? 1 : 0;
+			bv.put12('Z', cw.newInteger(v).index);
+		}
+		else if (value instanceof Character)
+		{
+			bv.put12('C', cw.newInteger(((Character) value).charValue()).index);
+		}
+		else if (value instanceof Short)
+		{
+			bv.put12('S', cw.newInteger(((Short) value).shortValue()).index);
+		}
+		else if (value instanceof Type)
+		{
+			bv.put12('c', cw.newUTF8(((Type) value).getDescriptor()));
+		}
+		else if (value instanceof byte[])
+		{
+			byte[] v = (byte[]) value;
+			bv.put12('[', v.length);
+			for (int i = 0; i < v.length; i++)
+			{
+				bv.put12('B', cw.newInteger(v[i]).index);
+			}
+		}
+		else if (value instanceof boolean[])
+		{
+			boolean[] v = (boolean[]) value;
+			bv.put12('[', v.length);
+			for (int i = 0; i < v.length; i++)
+			{
+				bv.put12('Z', cw.newInteger(v[i] ? 1 : 0).index);
+			}
+		}
+		else if (value instanceof short[])
+		{
+			short[] v = (short[]) value;
+			bv.put12('[', v.length);
+			for (int i = 0; i < v.length; i++)
+			{
+				bv.put12('S', cw.newInteger(v[i]).index);
+			}
+		}
+		else if (value instanceof char[])
+		{
+			char[] v = (char[]) value;
+			bv.put12('[', v.length);
+			for (int i = 0; i < v.length; i++)
+			{
+				bv.put12('C', cw.newInteger(v[i]).index);
+			}
+		}
+		else if (value instanceof int[])
+		{
+			int[] v = (int[]) value;
+			bv.put12('[', v.length);
+			for (int i = 0; i < v.length; i++)
+			{
+				bv.put12('I', cw.newInteger(v[i]).index);
+			}
+		}
+		else if (value instanceof long[])
+		{
+			long[] v = (long[]) value;
+			bv.put12('[', v.length);
+			for (int i = 0; i < v.length; i++)
+			{
+				bv.put12('J', cw.newLong(v[i]).index);
+			}
+		}
+		else if (value instanceof float[])
+		{
+			float[] v = (float[]) value;
+			bv.put12('[', v.length);
+			for (int i = 0; i < v.length; i++)
+			{
+				bv.put12('F', cw.newFloat(v[i]).index);
+			}
+		}
+		else if (value instanceof double[])
+		{
+			double[] v = (double[]) value;
+			bv.put12('[', v.length);
+			for (int i = 0; i < v.length; i++)
+			{
+				bv.put12('D', cw.newDouble(v[i]).index);
+			}
+		}
+		else
+		{
+			Item i = cw.newConstItem(value);
+			bv.put12(".s.IFJDCS".charAt(i.type), i.index);
+		}
+	}
+
+	@Override
+	public void visitEnum(final String name, final String desc,
+			final String value)
+	{
+		++size;
+		// TODO add by chq! &&name!=null;
+		if (named && name != null)
+		{
+			bv.putShort(cw.newUTF8(name));
+		}
+		bv.put12('e', cw.newUTF8(desc)).putShort(cw.newUTF8(value));
+	}
+
+	@Override
+	public AnnotationVisitor visitAnnotation(final String name,
+			final String desc)
+	{
+		++size;
+		if (named)
+		{
+			bv.putShort(cw.newUTF8(name));
+		}
+		// write tag and type, and reserve space for values count
+		bv.put12('@', cw.newUTF8(desc)).putShort(0);
+		return new AnnotationWriter(cw, true, bv, bv, bv.length - 2);
+	}
+
+	@Override
+	public AnnotationVisitor visitArray(final String name)
+	{
+		++size;
+		if (named)
+		{
+			bv.putShort(cw.newUTF8(name));
+		}
+		// write tag, and reserve space for array size
+		bv.put12('[', 0);
+		return new AnnotationWriter(cw, false, bv, bv, bv.length - 2);
+	}
+
+	@Override
+	public void visitEnd()
+	{
+		if (parent != null)
+		{
+			byte[] data = parent.data;
+			data[offset] = (byte) (size >>> 8);
+			data[offset + 1] = (byte) size;
+		}
+	}
+
+	// ------------------------------------------------------------------------
+	// Utility methods
+	// ------------------------------------------------------------------------
+
+	/**
+	 * Returns the size of this annotation writer list.
+	 * 
+	 * @return the size of this annotation writer list.
+	 */
+	int getSize()
+	{
+		int size = 0;
+		AnnotationWriter aw = this;
+		while (aw != null)
+		{
+			size += aw.bv.length;
+			aw = aw.next;
+		}
+		return size;
+	}
+
+	/**
+	 * Puts the annotations of this annotation writer list into the given byte
+	 * vector.
+	 * 
+	 * @param out
+	 *            where the annotations must be put.
+	 */
+	void put(final ByteVector out)
+	{
+		int n = 0;
+		int size = 2;
+		AnnotationWriter aw = this;
+		AnnotationWriter last = null;
+		while (aw != null)
+		{
+			++n;
+			size += aw.bv.length;
+			aw.visitEnd(); // in case user forgot to call visitEnd
+			aw.prev = last;
+			last = aw;
+			aw = aw.next;
+		}
+		out.putInt(size);
+		out.putShort(n);
+		aw = last;
+		while (aw != null)
+		{
+			out.putByteArray(aw.bv.data, 0, aw.bv.length);
+			aw = aw.prev;
+		}
+	}
+
+	/**
+	 * Puts the given annotation lists into the given byte vector.
+	 * 
+	 * @param panns
+	 *            an array of annotation writer lists.
+	 * @param off
+	 *            index of the first annotation to be written.
+	 * @param out
+	 *            where the annotations must be put.
+	 */
+	static void put(final AnnotationWriter[] panns, final int off,
+			final ByteVector out)
+	{
+		int size = 1 + 2 * (panns.length - off);
+		for (int i = off; i < panns.length; ++i)
+		{
+			size += panns[i] == null ? 0 : panns[i].getSize();
+		}
+		out.putInt(size).putByte(panns.length - off);
+		for (int i = off; i < panns.length; ++i)
+		{
+			AnnotationWriter aw = panns[i];
+			AnnotationWriter last = null;
+			int n = 0;
+			while (aw != null)
+			{
+				++n;
+				aw.visitEnd(); // in case user forgot to call visitEnd
+				aw.prev = last;
+				last = aw;
+				aw = aw.next;
+			}
+			out.putShort(n);
+			aw = last;
+			while (aw != null)
+			{
+				out.putByteArray(aw.bv.data, 0, aw.bv.length);
+				aw = aw.prev;
+			}
+		}
+	}
+}
diff --git a/src/main/asm/org/objectweb/asm/Attribute.java b/src/main/asm/org/objectweb/asm/Attribute.java
new file mode 100644
index 0000000..8a2a882
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/Attribute.java
@@ -0,0 +1,255 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm;
+
+/**
+ * A non standard class, field, method or code attribute.
+ * 
+ * @author Eric Bruneton
+ * @author Eugene Kuleshov
+ */
+public class Attribute {
+
+    /**
+     * The type of this attribute.
+     */
+    public final String type;
+
+    /**
+     * The raw value of this attribute, used only for unknown attributes.
+     */
+    byte[] value;
+
+    /**
+     * The next attribute in this attribute list. May be <tt>null</tt>.
+     */
+    Attribute next;
+
+    /**
+     * Constructs a new empty attribute.
+     * 
+     * @param type
+     *            the type of the attribute.
+     */
+    protected Attribute(final String type) {
+        this.type = type;
+    }
+
+    /**
+     * Returns <tt>true</tt> if this type of attribute is unknown. The default
+     * implementation of this method always returns <tt>true</tt>.
+     * 
+     * @return <tt>true</tt> if this type of attribute is unknown.
+     */
+    public boolean isUnknown() {
+        return true;
+    }
+
+    /**
+     * Returns <tt>true</tt> if this type of attribute is a code attribute.
+     * 
+     * @return <tt>true</tt> if this type of attribute is a code attribute.
+     */
+    public boolean isCodeAttribute() {
+        return false;
+    }
+
+    /**
+     * Returns the labels corresponding to this attribute.
+     * 
+     * @return the labels corresponding to this attribute, or <tt>null</tt> if
+     *         this attribute is not a code attribute that contains labels.
+     */
+    protected Label[] getLabels() {
+        return null;
+    }
+
+    /**
+     * Reads a {@link #type type} attribute. This method must return a
+     * <i>new</i> {@link Attribute} object, of type {@link #type type},
+     * corresponding to the <tt>len</tt> bytes starting at the given offset, in
+     * the given class reader.
+     * 
+     * @param cr
+     *            the class that contains the attribute to be read.
+     * @param off
+     *            index of the first byte of the attribute's content in
+     *            {@link ClassReader#b cr.b}. The 6 attribute header bytes,
+     *            containing the type and the length of the attribute, are not
+     *            taken into account here.
+     * @param len
+     *            the length of the attribute's content.
+     * @param buf
+     *            buffer to be used to call {@link ClassReader#readUTF8
+     *            readUTF8}, {@link ClassReader#readClass(int,char[]) readClass}
+     *            or {@link ClassReader#readConst readConst}.
+     * @param codeOff
+     *            index of the first byte of code's attribute content in
+     *            {@link ClassReader#b cr.b}, or -1 if the attribute to be read
+     *            is not a code attribute. The 6 attribute header bytes,
+     *            containing the type and the length of the attribute, are not
+     *            taken into account here.
+     * @param labels
+     *            the labels of the method's code, or <tt>null</tt> if the
+     *            attribute to be read is not a code attribute.
+     * @return a <i>new</i> {@link Attribute} object corresponding to the given
+     *         bytes.
+     */
+    protected Attribute read(final ClassReader cr, final int off,
+            final int len, final char[] buf, final int codeOff,
+            final Label[] labels) {
+        Attribute attr = new Attribute(type);
+        attr.value = new byte[len];
+        System.arraycopy(cr.b, off, attr.value, 0, len);
+        return attr;
+    }
+
+    /**
+     * Returns the byte array form of this attribute.
+     * 
+     * @param cw
+     *            the class to which this attribute must be added. This
+     *            parameter can be used to add to the constant pool of this
+     *            class the items that corresponds to this attribute.
+     * @param code
+     *            the bytecode of the method corresponding to this code
+     *            attribute, or <tt>null</tt> if this attribute is not a code
+     *            attributes.
+     * @param len
+     *            the length of the bytecode of the method corresponding to this
+     *            code attribute, or <tt>null</tt> if this attribute is not a
+     *            code attribute.
+     * @param maxStack
+     *            the maximum stack size of the method corresponding to this
+     *            code attribute, or -1 if this attribute is not a code
+     *            attribute.
+     * @param maxLocals
+     *            the maximum number of local variables of the method
+     *            corresponding to this code attribute, or -1 if this attribute
+     *            is not a code attribute.
+     * @return the byte array form of this attribute.
+     */
+    protected ByteVector write(final ClassWriter cw, final byte[] code,
+            final int len, final int maxStack, final int maxLocals) {
+        ByteVector v = new ByteVector();
+        v.data = value;
+        v.length = value.length;
+        return v;
+    }
+
+    /**
+     * Returns the length of the attribute list that begins with this attribute.
+     * 
+     * @return the length of the attribute list that begins with this attribute.
+     */
+    final int getCount() {
+        int count = 0;
+        Attribute attr = this;
+        while (attr != null) {
+            count += 1;
+            attr = attr.next;
+        }
+        return count;
+    }
+
+    /**
+     * Returns the size of all the attributes in this attribute list.
+     * 
+     * @param cw
+     *            the class writer to be used to convert the attributes into
+     *            byte arrays, with the {@link #write write} method.
+     * @param code
+     *            the bytecode of the method corresponding to these code
+     *            attributes, or <tt>null</tt> if these attributes are not code
+     *            attributes.
+     * @param len
+     *            the length of the bytecode of the method corresponding to
+     *            these code attributes, or <tt>null</tt> if these attributes
+     *            are not code attributes.
+     * @param maxStack
+     *            the maximum stack size of the method corresponding to these
+     *            code attributes, or -1 if these attributes are not code
+     *            attributes.
+     * @param maxLocals
+     *            the maximum number of local variables of the method
+     *            corresponding to these code attributes, or -1 if these
+     *            attributes are not code attributes.
+     * @return the size of all the attributes in this attribute list. This size
+     *         includes the size of the attribute headers.
+     */
+    final int getSize(final ClassWriter cw, final byte[] code, final int len,
+            final int maxStack, final int maxLocals) {
+        Attribute attr = this;
+        int size = 0;
+        while (attr != null) {
+            cw.newUTF8(attr.type);
+            size += attr.write(cw, code, len, maxStack, maxLocals).length + 6;
+            attr = attr.next;
+        }
+        return size;
+    }
+
+    /**
+     * Writes all the attributes of this attribute list in the given byte
+     * vector.
+     * 
+     * @param cw
+     *            the class writer to be used to convert the attributes into
+     *            byte arrays, with the {@link #write write} method.
+     * @param code
+     *            the bytecode of the method corresponding to these code
+     *            attributes, or <tt>null</tt> if these attributes are not code
+     *            attributes.
+     * @param len
+     *            the length of the bytecode of the method corresponding to
+     *            these code attributes, or <tt>null</tt> if these attributes
+     *            are not code attributes.
+     * @param maxStack
+     *            the maximum stack size of the method corresponding to these
+     *            code attributes, or -1 if these attributes are not code
+     *            attributes.
+     * @param maxLocals
+     *            the maximum number of local variables of the method
+     *            corresponding to these code attributes, or -1 if these
+     *            attributes are not code attributes.
+     * @param out
+     *            where the attributes must be written.
+     */
+    final void put(final ClassWriter cw, final byte[] code, final int len,
+            final int maxStack, final int maxLocals, final ByteVector out) {
+        Attribute attr = this;
+        while (attr != null) {
+            ByteVector b = attr.write(cw, code, len, maxStack, maxLocals);
+            out.putShort(cw.newUTF8(attr.type)).putInt(b.length);
+            out.putByteArray(b.data, 0, b.length);
+            attr = attr.next;
+        }
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/ByteVector.java b/src/main/asm/org/objectweb/asm/ByteVector.java
new file mode 100644
index 0000000..f1e2da1
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/ByteVector.java
@@ -0,0 +1,312 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm;
+
+/**
+ * A dynamically extensible vector of bytes. This class is roughly equivalent to
+ * a DataOutputStream on top of a ByteArrayOutputStream, but is more efficient.
+ * 
+ * @author Eric Bruneton
+ */
+public class ByteVector {
+
+    /**
+     * The content of this vector.
+     */
+    byte[] data;
+
+    /**
+     * Actual number of bytes in this vector.
+     */
+    int length;
+
+    /**
+     * Constructs a new {@link ByteVector ByteVector} with a default initial
+     * size.
+     */
+    public ByteVector() {
+        data = new byte[64];
+    }
+
+    /**
+     * Constructs a new {@link ByteVector ByteVector} with the given initial
+     * size.
+     * 
+     * @param initialSize
+     *            the initial size of the byte vector to be constructed.
+     */
+    public ByteVector(final int initialSize) {
+        data = new byte[initialSize];
+    }
+
+    /**
+     * Puts a byte into this byte vector. The byte vector is automatically
+     * enlarged if necessary.
+     * 
+     * @param b
+     *            a byte.
+     * @return this byte vector.
+     */
+    public ByteVector putByte(final int b) {
+        int length = this.length;
+        if (length + 1 > data.length) {
+            enlarge(1);
+        }
+        data[length++] = (byte) b;
+        this.length = length;
+        return this;
+    }
+
+    /**
+     * Puts two bytes into this byte vector. The byte vector is automatically
+     * enlarged if necessary.
+     * 
+     * @param b1
+     *            a byte.
+     * @param b2
+     *            another byte.
+     * @return this byte vector.
+     */
+    ByteVector put11(final int b1, final int b2) {
+        int length = this.length;
+        if (length + 2 > data.length) {
+            enlarge(2);
+        }
+        byte[] data = this.data;
+        data[length++] = (byte) b1;
+        data[length++] = (byte) b2;
+        this.length = length;
+        return this;
+    }
+
+    /**
+     * Puts a short into this byte vector. The byte vector is automatically
+     * enlarged if necessary.
+     * 
+     * @param s
+     *            a short.
+     * @return this byte vector.
+     */
+    public ByteVector putShort(final int s) {
+        int length = this.length;
+        if (length + 2 > data.length) {
+            enlarge(2);
+        }
+        byte[] data = this.data;
+        data[length++] = (byte) (s >>> 8);
+        data[length++] = (byte) s;
+        this.length = length;
+        return this;
+    }
+
+    /**
+     * Puts a byte and a short into this byte vector. The byte vector is
+     * automatically enlarged if necessary.
+     * 
+     * @param b
+     *            a byte.
+     * @param s
+     *            a short.
+     * @return this byte vector.
+     */
+    ByteVector put12(final int b, final int s) {
+        int length = this.length;
+        if (length + 3 > data.length) {
+            enlarge(3);
+        }
+        byte[] data = this.data;
+        data[length++] = (byte) b;
+        data[length++] = (byte) (s >>> 8);
+        data[length++] = (byte) s;
+        this.length = length;
+        return this;
+    }
+
+    /**
+     * Puts an int into this byte vector. The byte vector is automatically
+     * enlarged if necessary.
+     * 
+     * @param i
+     *            an int.
+     * @return this byte vector.
+     */
+    public ByteVector putInt(final int i) {
+        int length = this.length;
+        if (length + 4 > data.length) {
+            enlarge(4);
+        }
+        byte[] data = this.data;
+        data[length++] = (byte) (i >>> 24);
+        data[length++] = (byte) (i >>> 16);
+        data[length++] = (byte) (i >>> 8);
+        data[length++] = (byte) i;
+        this.length = length;
+        return this;
+    }
+
+    /**
+     * Puts a long into this byte vector. The byte vector is automatically
+     * enlarged if necessary.
+     * 
+     * @param l
+     *            a long.
+     * @return this byte vector.
+     */
+    public ByteVector putLong(final long l) {
+        int length = this.length;
+        if (length + 8 > data.length) {
+            enlarge(8);
+        }
+        byte[] data = this.data;
+        int i = (int) (l >>> 32);
+        data[length++] = (byte) (i >>> 24);
+        data[length++] = (byte) (i >>> 16);
+        data[length++] = (byte) (i >>> 8);
+        data[length++] = (byte) i;
+        i = (int) l;
+        data[length++] = (byte) (i >>> 24);
+        data[length++] = (byte) (i >>> 16);
+        data[length++] = (byte) (i >>> 8);
+        data[length++] = (byte) i;
+        this.length = length;
+        return this;
+    }
+
+    /**
+     * Puts an UTF8 string into this byte vector. The byte vector is
+     * automatically enlarged if necessary.
+     * 
+     * @param s
+     *            a String whose UTF8 encoded length must be less than 65536.
+     * @return this byte vector.
+     */
+    public ByteVector putUTF8(final String s) {
+        int charLength = s.length();
+        if (charLength > 65535) {
+            throw new IllegalArgumentException();
+        }
+        int len = length;
+        if (len + 2 + charLength > data.length) {
+            enlarge(2 + charLength);
+        }
+        byte[] data = this.data;
+        // optimistic algorithm: instead of computing the byte length and then
+        // serializing the string (which requires two loops), we assume the byte
+        // length is equal to char length (which is the most frequent case), and
+        // we start serializing the string right away. During the serialization,
+        // if we find that this assumption is wrong, we continue with the
+        // general method.
+        data[len++] = (byte) (charLength >>> 8);
+        data[len++] = (byte) charLength;
+        for (int i = 0; i < charLength; ++i) {
+            char c = s.charAt(i);
+            if (c >= '\001' && c <= '\177') {
+                data[len++] = (byte) c;
+            } else {
+                int byteLength = i;
+                for (int j = i; j < charLength; ++j) {
+                    c = s.charAt(j);
+                    if (c >= '\001' && c <= '\177') {
+                        byteLength++;
+                    } else if (c > '\u07FF') {
+                        byteLength += 3;
+                    } else {
+                        byteLength += 2;
+                    }
+                }
+                if (byteLength > 65535) {
+                    throw new IllegalArgumentException();
+                }
+                data[length] = (byte) (byteLength >>> 8);
+                data[length + 1] = (byte) byteLength;
+                if (length + 2 + byteLength > data.length) {
+                    length = len;
+                    enlarge(2 + byteLength);
+                    data = this.data;
+                }
+                for (int j = i; j < charLength; ++j) {
+                    c = s.charAt(j);
+                    if (c >= '\001' && c <= '\177') {
+                        data[len++] = (byte) c;
+                    } else if (c > '\u07FF') {
+                        data[len++] = (byte) (0xE0 | c >> 12 & 0xF);
+                        data[len++] = (byte) (0x80 | c >> 6 & 0x3F);
+                        data[len++] = (byte) (0x80 | c & 0x3F);
+                    } else {
+                        data[len++] = (byte) (0xC0 | c >> 6 & 0x1F);
+                        data[len++] = (byte) (0x80 | c & 0x3F);
+                    }
+                }
+                break;
+            }
+        }
+        length = len;
+        return this;
+    }
+
+    /**
+     * Puts an array of bytes into this byte vector. The byte vector is
+     * automatically enlarged if necessary.
+     * 
+     * @param b
+     *            an array of bytes. May be <tt>null</tt> to put <tt>len</tt>
+     *            null bytes into this byte vector.
+     * @param off
+     *            index of the fist byte of b that must be copied.
+     * @param len
+     *            number of bytes of b that must be copied.
+     * @return this byte vector.
+     */
+    public ByteVector putByteArray(final byte[] b, final int off, final int len) {
+        if (length + len > data.length) {
+            enlarge(len);
+        }
+        if (b != null) {
+            System.arraycopy(b, off, data, length, len);
+        }
+        length += len;
+        return this;
+    }
+
+    /**
+     * Enlarge this byte vector so that it can receive n more bytes.
+     * 
+     * @param size
+     *            number of additional bytes that this byte vector should be
+     *            able to receive.
+     */
+    private void enlarge(final int size) {
+        int length1 = 2 * data.length;
+        int length2 = length + size;
+        byte[] newData = new byte[length1 > length2 ? length1 : length2];
+        System.arraycopy(data, 0, newData, 0, length);
+        data = newData;
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/ClassReader.java b/src/main/asm/org/objectweb/asm/ClassReader.java
new file mode 100644
index 0000000..5341e0d
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/ClassReader.java
@@ -0,0 +1,2518 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * A Java class parser to make a {@link ClassVisitor} visit an existing class.
+ * This class parses a byte array conforming to the Java class file format and
+ * calls the appropriate visit methods of a given class visitor for each field,
+ * method and bytecode instruction encountered.
+ * 
+ * @author Eric Bruneton
+ * @author Eugene Kuleshov
+ */
+public class ClassReader
+{
+
+	/**
+	 * True to enable signatures support.
+	 */
+	static final boolean SIGNATURES = true;
+
+	/**
+	 * True to enable annotations support.
+	 */
+	static final boolean ANNOTATIONS = true;
+
+	/**
+	 * True to enable stack map frames support.
+	 */
+	static final boolean FRAMES = true;
+
+	/**
+	 * True to enable bytecode writing support.
+	 */
+	static final boolean WRITER = true;
+
+	/**
+	 * True to enable JSR_W and GOTO_W support.
+	 */
+	static final boolean RESIZE = true;
+
+	/**
+	 * Flag to skip method code. If this class is set <code>CODE</code>
+	 * attribute won't be visited. This can be used, for example, to retrieve
+	 * annotations for methods and method parameters.
+	 */
+	public static final int SKIP_CODE = 1;
+
+	/**
+	 * Flag to skip the debug information in the class. If this flag is set the
+	 * debug information of the class is not visited, i.e. the
+	 * {@link MethodVisitor#visitLocalVariable visitLocalVariable} and
+	 * {@link MethodVisitor#visitLineNumber visitLineNumber} methods will not be
+	 * called.
+	 */
+	public static final int SKIP_DEBUG = 2;
+
+	/**
+	 * Flag to skip the stack map frames in the class. If this flag is set the
+	 * stack map frames of the class is not visited, i.e. the
+	 * {@link MethodVisitor#visitFrame visitFrame} method will not be called.
+	 * This flag is useful when the {@link ClassWriter#COMPUTE_FRAMES} option is
+	 * used: it avoids visiting frames that will be ignored and recomputed from
+	 * scratch in the class writer.
+	 */
+	public static final int SKIP_FRAMES = 4;
+
+	/**
+	 * Flag to expand the stack map frames. By default stack map frames are
+	 * visited in their original format (i.e. "expanded" for classes whose
+	 * version is less than V1_6, and "compressed" for the other classes). If
+	 * this flag is set, stack map frames are always visited in expanded format
+	 * (this option adds a decompression/recompression step in ClassReader and
+	 * ClassWriter which degrades performances quite a lot).
+	 */
+	public static final int EXPAND_FRAMES = 8;
+
+	/**
+	 * The class to be parsed. <i>The content of this array must not be
+	 * modified. This field is intended for {@link Attribute} sub classes, and
+	 * is normally not needed by class generators or adapters.</i>
+	 */
+	public final byte[] b;
+
+	/**
+	 * The start index of each constant pool item in {@link #b b}, plus one. The
+	 * one byte offset skips the constant pool item tag that indicates its type.
+	 */
+	private final int[] items;
+
+	/**
+	 * The String objects corresponding to the CONSTANT_Utf8 items. This cache
+	 * avoids multiple parsing of a given CONSTANT_Utf8 constant pool item,
+	 * which GREATLY improves performances (by a factor 2 to 3). This caching
+	 * strategy could be extended to all constant pool items, but its benefit
+	 * would not be so great for these items (because they are much less
+	 * expensive to parse than CONSTANT_Utf8 items).
+	 */
+	private final String[] strings;
+
+	/**
+	 * Maximum length of the strings contained in the constant pool of the
+	 * class.
+	 */
+	private final int maxStringLength;
+
+	/**
+	 * Start index of the class header information (access, name...) in
+	 * {@link #b b}.
+	 */
+	public final int header;
+
+	// ------------------------------------------------------------------------
+	// Constructors
+	// ------------------------------------------------------------------------
+
+	/**
+	 * Constructs a new {@link ClassReader} object.
+	 * 
+	 * @param b
+	 *            the bytecode of the class to be read.
+	 */
+	public ClassReader(final byte[] b)
+	{
+		this(b, 0, b.length);
+	}
+
+	/**
+	 * Constructs a new {@link ClassReader} object.
+	 * 
+	 * @param b
+	 *            the bytecode of the class to be read.
+	 * @param off
+	 *            the start offset of the class data.
+	 * @param len
+	 *            the length of the class data.
+	 */
+	public ClassReader(final byte[] b, final int off, final int len)
+	{
+		this.b = b;
+		// checks the class version
+		if (readShort(off + 6) > Opcodes.V1_8)
+		{
+			throw new IllegalArgumentException();
+		}
+		// parses the constant pool
+		items = new int[readUnsignedShort(off + 8)];
+		int n = items.length;
+		strings = new String[n];
+		int max = 0;
+		int index = off + 10;
+		for (int i = 1; i < n; ++i)
+		{
+			items[i] = index + 1;
+			int size;
+			switch (b[index])
+			{
+			case ClassWriter.FIELD:
+			case ClassWriter.METH:
+			case ClassWriter.IMETH:
+			case ClassWriter.INT:
+			case ClassWriter.FLOAT:
+			case ClassWriter.NAME_TYPE:
+			case ClassWriter.INDY:
+				size = 5;
+				break;
+			case ClassWriter.LONG:
+			case ClassWriter.DOUBLE:
+				size = 9;
+				++i;
+				break;
+			case ClassWriter.UTF8:
+				size = 3 + readUnsignedShort(index + 1);
+				if (size > max)
+				{
+					max = size;
+				}
+				break;
+			case ClassWriter.HANDLE:
+				size = 4;
+				break;
+			// case ClassWriter.CLASS:
+			// case ClassWriter.STR:
+			// case ClassWriter.MTYPE
+			default:
+				size = 3;
+				break;
+			}
+			index += size;
+		}
+		maxStringLength = max;
+		// the class header information starts just after the constant pool
+		header = index;
+	}
+
+	/**
+	 * Returns the class's access flags (see {@link Opcodes}). This value may
+	 * not reflect Deprecated and Synthetic flags when bytecode is before 1.5
+	 * and those flags are represented by attributes.
+	 * 
+	 * @return the class access flags
+	 * 
+	 * @see ClassVisitor#visit(int, int, String, String, String, String[])
+	 */
+	public int getAccess()
+	{
+		return readUnsignedShort(header);
+	}
+
+	/**
+	 * Returns the internal name of the class (see
+	 * {@link Type#getInternalName() getInternalName}).
+	 * 
+	 * @return the internal class name
+	 * 
+	 * @see ClassVisitor#visit(int, int, String, String, String, String[])
+	 */
+	public String getClassName()
+	{
+		return readClass(header + 2, new char[maxStringLength]);
+	}
+
+	/**
+	 * Returns the internal of name of the super class (see
+	 * {@link Type#getInternalName() getInternalName}). For interfaces, the
+	 * super class is {@link Object}.
+	 * 
+	 * @return the internal name of super class, or <tt>null</tt> for
+	 *         {@link Object} class.
+	 * 
+	 * @see ClassVisitor#visit(int, int, String, String, String, String[])
+	 */
+	public String getSuperName()
+	{
+		return readClass(header + 4, new char[maxStringLength]);
+	}
+
+	/**
+	 * Returns the internal names of the class's interfaces (see
+	 * {@link Type#getInternalName() getInternalName}).
+	 * 
+	 * @return the array of internal names for all implemented interfaces or
+	 *         <tt>null</tt>.
+	 * 
+	 * @see ClassVisitor#visit(int, int, String, String, String, String[])
+	 */
+	public String[] getInterfaces()
+	{
+		int index = header + 6;
+		int n = readUnsignedShort(index);
+		String[] interfaces = new String[n];
+		if (n > 0)
+		{
+			char[] buf = new char[maxStringLength];
+			for (int i = 0; i < n; ++i)
+			{
+				index += 2;
+				interfaces[i] = readClass(index, buf);
+			}
+		}
+		return interfaces;
+	}
+
+	/**
+	 * Copies the constant pool data into the given {@link ClassWriter}. Should
+	 * be called before the {@link #accept(ClassVisitor,int)} method.
+	 * 
+	 * @param classWriter
+	 *            the {@link ClassWriter} to copy constant pool into.
+	 */
+	void copyPool(final ClassWriter classWriter)
+	{
+		char[] buf = new char[maxStringLength];
+		int ll = items.length;
+		Item[] items2 = new Item[ll];
+		for (int i = 1; i < ll; i++)
+		{
+			int index = items[i];
+			int tag = b[index - 1];
+			Item item = new Item(i);
+			int nameType;
+			switch (tag)
+			{
+			case ClassWriter.FIELD:
+			case ClassWriter.METH:
+			case ClassWriter.IMETH:
+				nameType = items[readUnsignedShort(index + 2)];
+				item.set(tag, readClass(index, buf), readUTF8(nameType, buf),
+						readUTF8(nameType + 2, buf));
+				break;
+			case ClassWriter.INT:
+				item.set(readInt(index));
+				break;
+			case ClassWriter.FLOAT:
+				item.set(Float.intBitsToFloat(readInt(index)));
+				break;
+			case ClassWriter.NAME_TYPE:
+				item.set(tag, readUTF8(index, buf), readUTF8(index + 2, buf),
+						null);
+				break;
+			case ClassWriter.LONG:
+				item.set(readLong(index));
+				++i;
+				break;
+			case ClassWriter.DOUBLE:
+				item.set(Double.longBitsToDouble(readLong(index)));
+				++i;
+				break;
+			case ClassWriter.UTF8:
+			{
+				String s = strings[i];
+				if (s == null)
+				{
+					index = items[i];
+					s = strings[i] = readUTF(index + 2,
+							readUnsignedShort(index), buf);
+				}
+				item.set(tag, s, null, null);
+				break;
+			}
+			case ClassWriter.HANDLE:
+			{
+				int fieldOrMethodRef = items[readUnsignedShort(index + 1)];
+				nameType = items[readUnsignedShort(fieldOrMethodRef + 2)];
+				item.set(ClassWriter.HANDLE_BASE + readByte(index),
+						readClass(fieldOrMethodRef, buf),
+						readUTF8(nameType, buf), readUTF8(nameType + 2, buf));
+				break;
+			}
+			case ClassWriter.INDY:
+				if (classWriter.bootstrapMethods == null)
+				{
+					copyBootstrapMethods(classWriter, items2, buf);
+				}
+				nameType = items[readUnsignedShort(index + 2)];
+				item.set(readUTF8(nameType, buf), readUTF8(nameType + 2, buf),
+						readUnsignedShort(index));
+				break;
+			// case ClassWriter.STR:
+			// case ClassWriter.CLASS:
+			// case ClassWriter.MTYPE
+			default:
+				item.set(tag, readUTF8(index, buf), null, null);
+				break;
+			}
+
+			int index2 = item.hashCode % items2.length;
+			item.next = items2[index2];
+			items2[index2] = item;
+		}
+
+		int off = items[1] - 1;
+		classWriter.pool.putByteArray(b, off, header - off);
+		classWriter.items = items2;
+		classWriter.threshold = (int) (0.75d * ll);
+		classWriter.index = ll;
+	}
+
+	/**
+	 * Copies the bootstrap method data into the given {@link ClassWriter}.
+	 * Should be called before the {@link #accept(ClassVisitor,int)} method.
+	 * 
+	 * @param classWriter
+	 *            the {@link ClassWriter} to copy bootstrap methods into.
+	 */
+	private void copyBootstrapMethods(final ClassWriter classWriter,
+			final Item[] items, final char[] c)
+	{
+		// finds the "BootstrapMethods" attribute
+		int u = getAttributes();
+		boolean found = false;
+		for (int i = readUnsignedShort(u); i > 0; --i)
+		{
+			String attrName = readUTF8(u + 2, c);
+			if ("BootstrapMethods".equals(attrName))
+			{
+				found = true;
+				break;
+			}
+			u += 6 + readInt(u + 4);
+		}
+		if (!found)
+		{
+			return;
+		}
+		// copies the bootstrap methods in the class writer
+		int boostrapMethodCount = readUnsignedShort(u + 8);
+		for (int j = 0, v = u + 10; j < boostrapMethodCount; j++)
+		{
+			int position = v - u - 10;
+			int hashCode = readConst(readUnsignedShort(v), c).hashCode();
+			for (int k = readUnsignedShort(v + 2); k > 0; --k)
+			{
+				hashCode ^= readConst(readUnsignedShort(v + 4), c).hashCode();
+				v += 2;
+			}
+			v += 4;
+			Item item = new Item(j);
+			item.set(position, hashCode & 0x7FFFFFFF);
+			int index = item.hashCode % items.length;
+			item.next = items[index];
+			items[index] = item;
+		}
+		int attrSize = readInt(u + 4);
+		ByteVector bootstrapMethods = new ByteVector(attrSize + 62);
+		bootstrapMethods.putByteArray(b, u + 10, attrSize - 2);
+		classWriter.bootstrapMethodsCount = boostrapMethodCount;
+		classWriter.bootstrapMethods = bootstrapMethods;
+	}
+
+	/**
+	 * Constructs a new {@link ClassReader} object.
+	 * 
+	 * @param is
+	 *            an input stream from which to read the class.
+	 * @throws IOException
+	 *             if a problem occurs during reading.
+	 */
+	public ClassReader(final InputStream is) throws IOException
+	{
+		this(readClass(is, false));
+	}
+
+	/**
+	 * Constructs a new {@link ClassReader} object.
+	 * 
+	 * @param name
+	 *            the binary qualified name of the class to be read.
+	 * @throws IOException
+	 *             if an exception occurs during reading.
+	 */
+	public ClassReader(final String name) throws IOException
+	{
+		this(readClass(
+				ClassLoader.getSystemResourceAsStream(name.replace('.', '/')
+						+ ".class"), true));
+	}
+
+	/**
+	 * Reads the bytecode of a class.
+	 * 
+	 * @param is
+	 *            an input stream from which to read the class.
+	 * @param close
+	 *            true to close the input stream after reading.
+	 * @return the bytecode read from the given input stream.
+	 * @throws IOException
+	 *             if a problem occurs during reading.
+	 */
+	private static byte[] readClass(final InputStream is, boolean close)
+			throws IOException
+	{
+		if (is == null)
+		{
+			throw new IOException("Class not found");
+		}
+		try
+		{
+			byte[] b = new byte[is.available()];
+			int len = 0;
+			while (true)
+			{
+				int n = is.read(b, len, b.length - len);
+				if (n == -1)
+				{
+					if (len < b.length)
+					{
+						byte[] c = new byte[len];
+						System.arraycopy(b, 0, c, 0, len);
+						b = c;
+					}
+					return b;
+				}
+				len += n;
+				if (len == b.length)
+				{
+					int last = is.read();
+					if (last < 0)
+					{
+						return b;
+					}
+					byte[] c = new byte[b.length + 1000];
+					System.arraycopy(b, 0, c, 0, len);
+					c[len++] = (byte) last;
+					b = c;
+				}
+			}
+		}
+		finally
+		{
+			if (close)
+			{
+				is.close();
+			}
+		}
+	}
+
+	// ------------------------------------------------------------------------
+	// Public methods
+	// ------------------------------------------------------------------------
+
+	/**
+	 * Makes the given visitor visit the Java class of this {@link ClassReader}
+	 * . This class is the one specified in the constructor (see
+	 * {@link #ClassReader(byte[]) ClassReader}).
+	 * 
+	 * @param classVisitor
+	 *            the visitor that must visit this class.
+	 * @param flags
+	 *            option flags that can be used to modify the default behavior
+	 *            of this class. See {@link #SKIP_DEBUG}, {@link #EXPAND_FRAMES}
+	 *            , {@link #SKIP_FRAMES}, {@link #SKIP_CODE}.
+	 */
+	public void accept(final ClassVisitor classVisitor, final int flags)
+	{
+		accept(classVisitor, new Attribute[0], flags);
+	}
+
+	/**
+	 * Makes the given visitor visit the Java class of this {@link ClassReader}.
+	 * This class is the one specified in the constructor (see
+	 * {@link #ClassReader(byte[]) ClassReader}).
+	 * 
+	 * @param classVisitor
+	 *            the visitor that must visit this class.
+	 * @param attrs
+	 *            prototypes of the attributes that must be parsed during the
+	 *            visit of the class. Any attribute whose type is not equal to
+	 *            the type of one the prototypes will not be parsed: its byte
+	 *            array value will be passed unchanged to the ClassWriter.
+	 *            <i>This may corrupt it if this value contains references to
+	 *            the constant pool, or has syntactic or semantic links with a
+	 *            class element that has been transformed by a class adapter
+	 *            between the reader and the writer</i>.
+	 * @param flags
+	 *            option flags that can be used to modify the default behavior
+	 *            of this class. See {@link #SKIP_DEBUG}, {@link #EXPAND_FRAMES}
+	 *            , {@link #SKIP_FRAMES}, {@link #SKIP_CODE}.
+	 */
+	public void accept(final ClassVisitor classVisitor,
+			final Attribute[] attrs, final int flags)
+	{
+		int u = header; // current offset in the class file
+		char[] c = new char[maxStringLength]; // buffer used to read strings
+
+		Context context = new Context();
+		context.attrs = attrs;
+		context.flags = flags;
+		context.buffer = c;
+
+		// reads the class declaration
+		int access = readUnsignedShort(u);
+		String name = readClass(u + 2, c);
+		String superClass = readClass(u + 4, c);
+		String[] interfaces = new String[readUnsignedShort(u + 6)];
+		u += 8;
+		for (int i = 0; i < interfaces.length; ++i)
+		{
+			interfaces[i] = readClass(u, c);
+			u += 2;
+		}
+
+		// reads the class attributes
+		String signature = null;
+		String sourceFile = null;
+		String sourceDebug = null;
+		String enclosingOwner = null;
+		String enclosingName = null;
+		String enclosingDesc = null;
+		int anns = 0;
+		int ianns = 0;
+		int innerClasses = 0;
+		Attribute attributes = null;
+
+		u = getAttributes();
+		for (int i = readUnsignedShort(u); i > 0; --i)
+		{
+			String attrName = readUTF8(u + 2, c);
+			// tests are sorted in decreasing frequency order
+			// (based on frequencies observed on typical classes)
+			if ("SourceFile".equals(attrName))
+			{
+				sourceFile = readUTF8(u + 8, c);
+			}
+			else if ("InnerClasses".equals(attrName))
+			{
+				innerClasses = u + 8;
+			}
+			else if ("EnclosingMethod".equals(attrName))
+			{
+				enclosingOwner = readClass(u + 8, c);
+				int item = readUnsignedShort(u + 10);
+				if (item != 0)
+				{
+					enclosingName = readUTF8(items[item], c);
+					enclosingDesc = readUTF8(items[item] + 2, c);
+				}
+			}
+			else if (SIGNATURES && "Signature".equals(attrName))
+			{
+				signature = readUTF8(u + 8, c);
+			}
+			else if (ANNOTATIONS
+					&& "RuntimeVisibleAnnotations".equals(attrName))
+			{
+				anns = u + 8;
+			}
+			else if ("Deprecated".equals(attrName))
+			{
+				access |= Opcodes.ACC_DEPRECATED;
+			}
+			else if ("Synthetic".equals(attrName))
+			{
+				access |= Opcodes.ACC_SYNTHETIC
+						| ClassWriter.ACC_SYNTHETIC_ATTRIBUTE;
+			}
+			else if ("SourceDebugExtension".equals(attrName))
+			{
+				int len = readInt(u + 4);
+				sourceDebug = readUTF(u + 8, len, new char[len]);
+			}
+			else if (ANNOTATIONS
+					&& "RuntimeInvisibleAnnotations".equals(attrName))
+			{
+				ianns = u + 8;
+			}
+			else if ("BootstrapMethods".equals(attrName))
+			{
+				int[] bootstrapMethods = new int[readUnsignedShort(u + 8)];
+				for (int j = 0, v = u + 10; j < bootstrapMethods.length; j++)
+				{
+					bootstrapMethods[j] = v;
+					v += 2 + readUnsignedShort(v + 2) << 1;
+				}
+				context.bootstrapMethods = bootstrapMethods;
+			}
+			else
+			{
+				Attribute attr = readAttribute(attrs, attrName, u + 8,
+						readInt(u + 4), c, -1, null);
+				if (attr != null)
+				{
+					attr.next = attributes;
+					attributes = attr;
+				}
+			}
+			u += 6 + readInt(u + 4);
+		}
+
+		// visits the class declaration
+		classVisitor.visit(readInt(items[1] - 7), access, name, signature,
+				superClass, interfaces);
+
+		// visits the source and debug info
+		if ((flags & SKIP_DEBUG) == 0
+				&& (sourceFile != null || sourceDebug != null))
+		{
+			classVisitor.visitSource(sourceFile, sourceDebug);
+		}
+
+		// visits the outer class
+		if (enclosingOwner != null)
+		{
+			classVisitor.visitOuterClass(enclosingOwner, enclosingName,
+					enclosingDesc);
+		}
+
+		// visits the class annotations
+		if (ANNOTATIONS && anns != 0)
+		{
+			for (int i = readUnsignedShort(anns), v = anns + 2; i > 0; --i)
+			{
+				v = readAnnotationValues(v + 2, c, true,
+						classVisitor.visitAnnotation(readUTF8(v, c), true));
+			}
+		}
+		if (ANNOTATIONS && ianns != 0)
+		{
+			for (int i = readUnsignedShort(ianns), v = ianns + 2; i > 0; --i)
+			{
+				v = readAnnotationValues(v + 2, c, true,
+						classVisitor.visitAnnotation(readUTF8(v, c), false));
+			}
+		}
+
+		// visits the attributes
+		while (attributes != null)
+		{
+			Attribute attr = attributes.next;
+			attributes.next = null;
+			classVisitor.visitAttribute(attributes);
+			attributes = attr;
+		}
+
+		// visits the inner classes
+		if (innerClasses != 0)
+		{
+			int v = innerClasses + 2;
+			for (int i = readUnsignedShort(innerClasses); i > 0; --i)
+			{
+				classVisitor.visitInnerClass(readClass(v, c),
+						readClass(v + 2, c), readUTF8(v + 4, c),
+						readUnsignedShort(v + 6));
+				v += 8;
+			}
+		}
+
+		// visits the fields and methods
+		u = header + 10 + 2 * interfaces.length;
+		for (int i = readUnsignedShort(u - 2); i > 0; --i)
+		{
+			u = readField(classVisitor, context, u);
+		}
+		u += 2;
+		for (int i = readUnsignedShort(u - 2); i > 0; --i)
+		{
+			u = readMethod(classVisitor, context, u);
+		}
+
+		// visits the end of the class
+		classVisitor.visitEnd();
+	}
+
+	/**
+	 * Reads a field and makes the given visitor visit it.
+	 * 
+	 * @param classVisitor
+	 *            the visitor that must visit the field.
+	 * @param context
+	 *            information about the class being parsed.
+	 * @param u
+	 *            the start offset of the field in the class file.
+	 * @return the offset of the first byte following the field in the class.
+	 */
+	private int readField(final ClassVisitor classVisitor,
+			final Context context, int u)
+	{
+		// reads the field declaration
+		char[] c = context.buffer;
+		int access = readUnsignedShort(u);
+		String name = readUTF8(u + 2, c);
+		String desc = readUTF8(u + 4, c);
+		u += 6;
+
+		// reads the field attributes
+		String signature = null;
+		int anns = 0;
+		int ianns = 0;
+		Object value = null;
+		Attribute attributes = null;
+
+		for (int i = readUnsignedShort(u); i > 0; --i)
+		{
+			String attrName = readUTF8(u + 2, c);
+			// tests are sorted in decreasing frequency order
+			// (based on frequencies observed on typical classes)
+			if ("ConstantValue".equals(attrName))
+			{
+				int item = readUnsignedShort(u + 8);
+				value = item == 0 ? null : readConst(item, c);
+			}
+			else if (SIGNATURES && "Signature".equals(attrName))
+			{
+				signature = readUTF8(u + 8, c);
+			}
+			else if ("Deprecated".equals(attrName))
+			{
+				access |= Opcodes.ACC_DEPRECATED;
+			}
+			else if ("Synthetic".equals(attrName))
+			{
+				access |= Opcodes.ACC_SYNTHETIC
+						| ClassWriter.ACC_SYNTHETIC_ATTRIBUTE;
+			}
+			else if (ANNOTATIONS
+					&& "RuntimeVisibleAnnotations".equals(attrName))
+			{
+				anns = u + 8;
+			}
+			else if (ANNOTATIONS
+					&& "RuntimeInvisibleAnnotations".equals(attrName))
+			{
+				ianns = u + 8;
+			}
+			else
+			{
+				Attribute attr = readAttribute(context.attrs, attrName, u + 8,
+						readInt(u + 4), c, -1, null);
+				if (attr != null)
+				{
+					attr.next = attributes;
+					attributes = attr;
+				}
+			}
+			u += 6 + readInt(u + 4);
+		}
+		u += 2;
+
+		// visits the field declaration
+		FieldVisitor fv = classVisitor.visitField(access, name, desc,
+				signature, value);
+		if (fv == null)
+		{
+			return u;
+		}
+
+		// visits the field annotations
+		if (ANNOTATIONS && anns != 0)
+		{
+			for (int i = readUnsignedShort(anns), v = anns + 2; i > 0; --i)
+			{
+				v = readAnnotationValues(v + 2, c, true,
+						fv.visitAnnotation(readUTF8(v, c), true));
+			}
+		}
+		if (ANNOTATIONS && ianns != 0)
+		{
+			for (int i = readUnsignedShort(ianns), v = ianns + 2; i > 0; --i)
+			{
+				v = readAnnotationValues(v + 2, c, true,
+						fv.visitAnnotation(readUTF8(v, c), false));
+			}
+		}
+
+		// visits the field attributes
+		while (attributes != null)
+		{
+			Attribute attr = attributes.next;
+			attributes.next = null;
+			fv.visitAttribute(attributes);
+			attributes = attr;
+		}
+
+		// visits the end of the field
+		fv.visitEnd();
+
+		return u;
+	}
+
+	/**
+	 * Reads a method and makes the given visitor visit it.
+	 * 
+	 * @param classVisitor
+	 *            the visitor that must visit the method.
+	 * @param context
+	 *            information about the class being parsed.
+	 * @param u
+	 *            the start offset of the method in the class file.
+	 * @return the offset of the first byte following the method in the class.
+	 */
+	private int readMethod(final ClassVisitor classVisitor,
+			final Context context, int u)
+	{
+		// reads the method declaration
+		char[] c = context.buffer;
+		int access = readUnsignedShort(u);
+		String name = readUTF8(u + 2, c);
+		String desc = readUTF8(u + 4, c);
+		u += 6;
+
+		// reads the method attributes
+		int code = 0;
+		int exception = 0;
+		String[] exceptions = null;
+		String signature = null;
+		int anns = 0;
+		int ianns = 0;
+		int dann = 0;
+		int mpanns = 0;
+		int impanns = 0;
+		int firstAttribute = u;
+		Attribute attributes = null;
+
+		for (int i = readUnsignedShort(u); i > 0; --i)
+		{
+			String attrName = readUTF8(u + 2, c);
+			// tests are sorted in decreasing frequency order
+			// (based on frequencies observed on typical classes)
+			if ("Code".equals(attrName))
+			{
+				if ((context.flags & SKIP_CODE) == 0)
+				{
+					code = u + 8;
+				}
+			}
+			else if ("Exceptions".equals(attrName))
+			{
+				exceptions = new String[readUnsignedShort(u + 8)];
+				exception = u + 10;
+				for (int j = 0; j < exceptions.length; ++j)
+				{
+					exceptions[j] = readClass(exception, c);
+					exception += 2;
+				}
+			}
+			else if (SIGNATURES && "Signature".equals(attrName))
+			{
+				signature = readUTF8(u + 8, c);
+			}
+			else if ("Deprecated".equals(attrName))
+			{
+				access |= Opcodes.ACC_DEPRECATED;
+			}
+			else if (ANNOTATIONS
+					&& "RuntimeVisibleAnnotations".equals(attrName))
+			{
+				anns = u + 8;
+			}
+			else if (ANNOTATIONS && "AnnotationDefault".equals(attrName))
+			{
+				dann = u + 8;
+			}
+			else if ("Synthetic".equals(attrName))
+			{
+				access |= Opcodes.ACC_SYNTHETIC
+						| ClassWriter.ACC_SYNTHETIC_ATTRIBUTE;
+			}
+			else if (ANNOTATIONS
+					&& "RuntimeInvisibleAnnotations".equals(attrName))
+			{
+				ianns = u + 8;
+			}
+			else if (ANNOTATIONS
+					&& "RuntimeVisibleParameterAnnotations".equals(attrName))
+			{
+				mpanns = u + 8;
+			}
+			else if (ANNOTATIONS
+					&& "RuntimeInvisibleParameterAnnotations".equals(attrName))
+			{
+				impanns = u + 8;
+			}
+			else
+			{
+				Attribute attr = readAttribute(context.attrs, attrName, u + 8,
+						readInt(u + 4), c, -1, null);
+				if (attr != null)
+				{
+					attr.next = attributes;
+					attributes = attr;
+				}
+			}
+			u += 6 + readInt(u + 4);
+		}
+		u += 2;
+
+		// visits the method declaration
+		MethodVisitor mv = classVisitor.visitMethod(access, name, desc,
+				signature, exceptions);
+		if (mv == null)
+		{
+			return u;
+		}
+
+		/*
+		 * if the returned MethodVisitor is in fact a MethodWriter, it means
+		 * there is no method adapter between the reader and the writer. If, in
+		 * addition, the writer's constant pool was copied from this reader
+		 * (mw.cw.cr == this), and the signature and exceptions of the method
+		 * have not been changed, then it is possible to skip all visit events
+		 * and just copy the original code of the method to the writer (the
+		 * access, name and descriptor can have been changed, this is not
+		 * important since they are not copied as is from the reader).
+		 */
+		if (WRITER && mv instanceof MethodWriter)
+		{
+			MethodWriter mw = (MethodWriter) mv;
+			if (mw.cw.cr == this && signature == mw.signature)
+			{
+				boolean sameExceptions = false;
+				if (exceptions == null)
+				{
+					sameExceptions = mw.exceptionCount == 0;
+				}
+				else if (exceptions.length == mw.exceptionCount)
+				{
+					sameExceptions = true;
+					for (int j = exceptions.length - 1; j >= 0; --j)
+					{
+						exception -= 2;
+						if (mw.exceptions[j] != readUnsignedShort(exception))
+						{
+							sameExceptions = false;
+							break;
+						}
+					}
+				}
+				if (sameExceptions)
+				{
+					/*
+					 * we do not copy directly the code into MethodWriter to
+					 * save a byte array copy operation. The real copy will be
+					 * done in ClassWriter.toByteArray().
+					 */
+					mw.classReaderOffset = firstAttribute;
+					mw.classReaderLength = u - firstAttribute;
+					return u;
+				}
+			}
+		}
+
+		// visits the method annotations
+		if (ANNOTATIONS && dann != 0)
+		{
+			AnnotationVisitor dv = mv.visitAnnotationDefault();
+			readAnnotationValue(dann, c, null, dv);
+			if (dv != null)
+			{
+				dv.visitEnd();
+			}
+		}
+		if (ANNOTATIONS && anns != 0)
+		{
+			for (int i = readUnsignedShort(anns), v = anns + 2; i > 0; --i)
+			{
+				v = readAnnotationValues(v + 2, c, true,
+						mv.visitAnnotation(readUTF8(v, c), true));
+			}
+		}
+		if (ANNOTATIONS && ianns != 0)
+		{
+			for (int i = readUnsignedShort(ianns), v = ianns + 2; i > 0; --i)
+			{
+				v = readAnnotationValues(v + 2, c, true,
+						mv.visitAnnotation(readUTF8(v, c), false));
+			}
+		}
+		if (ANNOTATIONS && mpanns != 0)
+		{
+			readParameterAnnotations(mpanns, desc, c, true, mv);
+		}
+		if (ANNOTATIONS && impanns != 0)
+		{
+			readParameterAnnotations(impanns, desc, c, false, mv);
+		}
+
+		// visits the method attributes
+		while (attributes != null)
+		{
+			Attribute attr = attributes.next;
+			attributes.next = null;
+			mv.visitAttribute(attributes);
+			attributes = attr;
+		}
+
+		// visits the method code
+		if (code != 0)
+		{
+			context.access = access;
+			context.name = name;
+			context.desc = desc;
+			mv.visitCode();
+			readCode(mv, context, code);
+		}
+
+		// visits the end of the method
+		mv.visitEnd();
+
+		return u;
+	}
+
+	/**
+	 * Reads the bytecode of a method and makes the given visitor visit it.
+	 * 
+	 * @param mv
+	 *            the visitor that must visit the method's code.
+	 * @param context
+	 *            information about the class being parsed.
+	 * @param u
+	 *            the start offset of the code attribute in the class file.
+	 */
+	private void readCode(final MethodVisitor mv, final Context context, int u)
+	{
+		// reads the header
+		byte[] b = this.b;
+		char[] c = context.buffer;
+		int maxStack = readUnsignedShort(u);
+		int maxLocals = readUnsignedShort(u + 2);
+		int codeLength = readInt(u + 4);
+		u += 8;
+
+		// reads the bytecode to find the labels
+		int codeStart = u;
+		int codeEnd = u + codeLength;
+		Label[] labels = new Label[codeLength + 2];
+		readLabel(codeLength + 1, labels);
+		while (u < codeEnd)
+		{
+			int offset = u - codeStart;
+			int opcode = b[u] & 0xFF;
+			switch (ClassWriter.TYPE[opcode])
+			{
+			case ClassWriter.NOARG_INSN:
+			case ClassWriter.IMPLVAR_INSN:
+				u += 1;
+				break;
+			case ClassWriter.LABEL_INSN:
+				readLabel(offset + readShort(u + 1), labels);
+				u += 3;
+				break;
+			case ClassWriter.LABELW_INSN:
+				readLabel(offset + readInt(u + 1), labels);
+				u += 5;
+				break;
+			case ClassWriter.WIDE_INSN:
+				opcode = b[u + 1] & 0xFF;
+				if (opcode == Opcodes.IINC)
+				{
+					u += 6;
+				}
+				else
+				{
+					u += 4;
+				}
+				break;
+			case ClassWriter.TABL_INSN:
+				// skips 0 to 3 padding bytes
+				u = u + 4 - (offset & 3);
+				// reads instruction
+				readLabel(offset + readInt(u), labels);
+				for (int i = readInt(u + 8) - readInt(u + 4) + 1; i > 0; --i)
+				{
+					readLabel(offset + readInt(u + 12), labels);
+					u += 4;
+				}
+				u += 12;
+				break;
+			case ClassWriter.LOOK_INSN:
+				// skips 0 to 3 padding bytes
+				u = u + 4 - (offset & 3);
+				// reads instruction
+				readLabel(offset + readInt(u), labels);
+				for (int i = readInt(u + 4); i > 0; --i)
+				{
+					readLabel(offset + readInt(u + 12), labels);
+					u += 8;
+				}
+				u += 8;
+				break;
+			case ClassWriter.VAR_INSN:
+			case ClassWriter.SBYTE_INSN:
+			case ClassWriter.LDC_INSN:
+				u += 2;
+				break;
+			case ClassWriter.SHORT_INSN:
+			case ClassWriter.LDCW_INSN:
+			case ClassWriter.FIELDORMETH_INSN:
+			case ClassWriter.TYPE_INSN:
+			case ClassWriter.IINC_INSN:
+				u += 3;
+				break;
+			case ClassWriter.ITFMETH_INSN:
+			case ClassWriter.INDYMETH_INSN:
+				u += 5;
+				break;
+			// case MANA_INSN:
+			default:
+				u += 4;
+				break;
+			}
+		}
+
+		// reads the try catch entries to find the labels, and also visits them
+		for (int i = readUnsignedShort(u); i > 0; --i)
+		{
+			Label start = readLabel(readUnsignedShort(u + 2), labels);
+			Label end = readLabel(readUnsignedShort(u + 4), labels);
+			Label handler = readLabel(readUnsignedShort(u + 6), labels);
+			String type = readUTF8(items[readUnsignedShort(u + 8)], c);
+			mv.visitTryCatchBlock(start, end, handler, type);
+			u += 8;
+		}
+		u += 2;
+
+		// reads the code attributes
+		int varTable = 0;
+		int varTypeTable = 0;
+		boolean zip = true;
+		boolean unzip = (context.flags & EXPAND_FRAMES) != 0;
+		int stackMap = 0;
+		int stackMapSize = 0;
+		int frameCount = 0;
+		Context frame = null;
+		Attribute attributes = null;
+
+		for (int i = readUnsignedShort(u); i > 0; --i)
+		{
+			String attrName = readUTF8(u + 2, c);
+			if ("LocalVariableTable".equals(attrName))
+			{
+				if ((context.flags & SKIP_DEBUG) == 0)
+				{
+					varTable = u + 8;
+					for (int j = readUnsignedShort(u + 8), v = u; j > 0; --j)
+					{
+						int label = readUnsignedShort(v + 10);
+						if (labels[label] == null)
+						{
+							readLabel(label, labels).status |= Label.DEBUG;
+						}
+						label += readUnsignedShort(v + 12);
+						if (labels[label] == null)
+						{
+							readLabel(label, labels).status |= Label.DEBUG;
+						}
+						v += 10;
+					}
+				}
+			}
+			else if ("LocalVariableTypeTable".equals(attrName))
+			{
+				varTypeTable = u + 8;
+			}
+			else if ("LineNumberTable".equals(attrName))
+			{
+				if ((context.flags & SKIP_DEBUG) == 0)
+				{
+					for (int j = readUnsignedShort(u + 8), v = u; j > 0; --j)
+					{
+						int label = readUnsignedShort(v + 10);
+						if (labels[label] == null)
+						{
+							readLabel(label, labels).status |= Label.DEBUG;
+						}
+						labels[label].line = readUnsignedShort(v + 12);
+						v += 4;
+					}
+				}
+			}
+			else if (FRAMES && "StackMapTable".equals(attrName))
+			{
+				if ((context.flags & SKIP_FRAMES) == 0)
+				{
+					stackMap = u + 10;
+					stackMapSize = readInt(u + 4);
+					frameCount = readUnsignedShort(u + 8);
+				}
+				/*
+				 * here we do not extract the labels corresponding to the
+				 * attribute content. This would require a full parsing of the
+				 * attribute, which would need to be repeated in the second
+				 * phase (see below). Instead the content of the attribute is
+				 * read one frame at a time (i.e. after a frame has been
+				 * visited, the next frame is read), and the labels it contains
+				 * are also extracted one frame at a time. Thanks to the
+				 * ordering of frames, having only a "one frame lookahead" is
+				 * not a problem, i.e. it is not possible to see an offset
+				 * smaller than the offset of the current insn and for which no
+				 * Label exist.
+				 */
+				/*
+				 * This is not true for UNINITIALIZED type offsets. We solve
+				 * this by parsing the stack map table without a full decoding
+				 * (see below).
+				 */
+			}
+			else if (FRAMES && "StackMap".equals(attrName))
+			{
+				if ((context.flags & SKIP_FRAMES) == 0)
+				{
+					zip = false;
+					stackMap = u + 10;
+					stackMapSize = readInt(u + 4);
+					frameCount = readUnsignedShort(u + 8);
+				}
+				/*
+				 * IMPORTANT! here we assume that the frames are ordered, as in
+				 * the StackMapTable attribute, although this is not guaranteed
+				 * by the attribute format.
+				 */
+			}
+			else
+			{
+				for (int j = 0; j < context.attrs.length; ++j)
+				{
+					if (context.attrs[j].type.equals(attrName))
+					{
+						Attribute attr = context.attrs[j].read(this, u + 8,
+								readInt(u + 4), c, codeStart - 8, labels);
+						if (attr != null)
+						{
+							attr.next = attributes;
+							attributes = attr;
+						}
+					}
+				}
+			}
+			u += 6 + readInt(u + 4);
+		}
+		u += 2;
+
+		// generates the first (implicit) stack map frame
+		if (FRAMES && stackMap != 0)
+		{
+			/*
+			 * for the first explicit frame the offset is not offset_delta + 1
+			 * but only offset_delta; setting the implicit frame offset to -1
+			 * allow the use of the "offset_delta + 1" rule in all cases
+			 */
+			frame = context;
+			frame.offset = -1;
+			frame.mode = 0;
+			frame.localCount = 0;
+			frame.localDiff = 0;
+			frame.stackCount = 0;
+			frame.local = new Object[maxLocals];
+			frame.stack = new Object[maxStack];
+			if (unzip)
+			{
+				getImplicitFrame(context);
+			}
+			/*
+			 * Finds labels for UNINITIALIZED frame types. Instead of decoding
+			 * each element of the stack map table, we look for 3 consecutive
+			 * bytes that "look like" an UNINITIALIZED type (tag 8, offset
+			 * within code bounds, NEW instruction at this offset). We may find
+			 * false positives (i.e. not real UNINITIALIZED types), but this
+			 * should be rare, and the only consequence will be the creation of
+			 * an unneeded label. This is better than creating a label for each
+			 * NEW instruction, and faster than fully decoding the whole stack
+			 * map table.
+			 */
+			for (int i = stackMap; i < stackMap + stackMapSize - 2; ++i)
+			{
+				if (b[i] == 8)
+				{ // UNINITIALIZED FRAME TYPE
+					int v = readUnsignedShort(i + 1);
+					if (v >= 0 && v < codeLength)
+					{
+						if ((b[codeStart + v] & 0xFF) == Opcodes.NEW)
+						{
+							readLabel(v, labels);
+						}
+					}
+				}
+			}
+		}
+
+		// visits the instructions
+		u = codeStart;
+		while (u < codeEnd)
+		{
+			int offset = u - codeStart;
+
+			// visits the label and line number for this offset, if any
+			Label l = labels[offset];
+			if (l != null)
+			{
+				mv.visitLabel(l);
+				if ((context.flags & SKIP_DEBUG) == 0 && l.line > 0)
+				{
+					mv.visitLineNumber(l.line, l);
+				}
+			}
+
+			// visits the frame for this offset, if any
+			while (FRAMES && frame != null
+					&& (frame.offset == offset || frame.offset == -1))
+			{
+				// if there is a frame for this offset, makes the visitor visit
+				// it, and reads the next frame if there is one.
+				if (frame.offset != -1)
+				{
+					if (!zip || unzip)
+					{
+						mv.visitFrame(Opcodes.F_NEW, frame.localCount,
+								frame.local, frame.stackCount, frame.stack);
+					}
+					else
+					{
+						mv.visitFrame(frame.mode, frame.localDiff, frame.local,
+								frame.stackCount, frame.stack);
+					}
+				}
+				if (frameCount > 0)
+				{
+					stackMap = readFrame(stackMap, zip, unzip, labels, frame);
+					--frameCount;
+				}
+				else
+				{
+					frame = null;
+				}
+			}
+
+			// visits the instruction at this offset
+			int opcode = b[u] & 0xFF;
+			switch (ClassWriter.TYPE[opcode])
+			{
+			case ClassWriter.NOARG_INSN:
+				mv.visitInsn(opcode);
+				u += 1;
+				break;
+			case ClassWriter.IMPLVAR_INSN:
+				if (opcode > Opcodes.ISTORE)
+				{
+					opcode -= 59; // ISTORE_0
+					mv.visitVarInsn(Opcodes.ISTORE + (opcode >> 2),
+							opcode & 0x3);
+				}
+				else
+				{
+					opcode -= 26; // ILOAD_0
+					mv.visitVarInsn(Opcodes.ILOAD + (opcode >> 2), opcode & 0x3);
+				}
+				u += 1;
+				break;
+			case ClassWriter.LABEL_INSN:
+				mv.visitJumpInsn(opcode, labels[offset + readShort(u + 1)]);
+				u += 3;
+				break;
+			case ClassWriter.LABELW_INSN:
+				mv.visitJumpInsn(opcode - 33, labels[offset + readInt(u + 1)]);
+				u += 5;
+				break;
+			case ClassWriter.WIDE_INSN:
+				opcode = b[u + 1] & 0xFF;
+				if (opcode == Opcodes.IINC)
+				{
+					mv.visitIincInsn(readUnsignedShort(u + 2), readShort(u + 4));
+					u += 6;
+				}
+				else
+				{
+					mv.visitVarInsn(opcode, readUnsignedShort(u + 2));
+					u += 4;
+				}
+				break;
+			case ClassWriter.TABL_INSN:
+			{
+				// skips 0 to 3 padding bytes
+				u = u + 4 - (offset & 3);
+				// reads instruction
+				int label = offset + readInt(u);
+				int min = readInt(u + 4);
+				int max = readInt(u + 8);
+				Label[] table = new Label[max - min + 1];
+				u += 12;
+				for (int i = 0; i < table.length; ++i)
+				{
+					table[i] = labels[offset + readInt(u)];
+					u += 4;
+				}
+				mv.visitTableSwitchInsn(min, max, labels[label], table);
+				break;
+			}
+			case ClassWriter.LOOK_INSN:
+			{
+				// skips 0 to 3 padding bytes
+				u = u + 4 - (offset & 3);
+				// reads instruction
+				int label = offset + readInt(u);
+				int len = readInt(u + 4);
+				int[] keys = new int[len];
+				Label[] values = new Label[len];
+				u += 8;
+				for (int i = 0; i < len; ++i)
+				{
+					keys[i] = readInt(u);
+					values[i] = labels[offset + readInt(u + 4)];
+					u += 8;
+				}
+				mv.visitLookupSwitchInsn(labels[label], keys, values);
+				break;
+			}
+			case ClassWriter.VAR_INSN:
+				mv.visitVarInsn(opcode, b[u + 1] & 0xFF);
+				u += 2;
+				break;
+			case ClassWriter.SBYTE_INSN:
+				mv.visitIntInsn(opcode, b[u + 1]);
+				u += 2;
+				break;
+			case ClassWriter.SHORT_INSN:
+				mv.visitIntInsn(opcode, readShort(u + 1));
+				u += 3;
+				break;
+			case ClassWriter.LDC_INSN:
+				mv.visitLdcInsn(readConst(b[u + 1] & 0xFF, c));
+				u += 2;
+				break;
+			case ClassWriter.LDCW_INSN:
+				mv.visitLdcInsn(readConst(readUnsignedShort(u + 1), c));
+				u += 3;
+				break;
+			case ClassWriter.FIELDORMETH_INSN:
+			case ClassWriter.ITFMETH_INSN:
+			{
+				int cpIndex = items[readUnsignedShort(u + 1)];
+				String iowner = readClass(cpIndex, c);
+				cpIndex = items[readUnsignedShort(cpIndex + 2)];
+				String iname = readUTF8(cpIndex, c);
+				String idesc = readUTF8(cpIndex + 2, c);
+				if (opcode < Opcodes.INVOKEVIRTUAL)
+				{
+					mv.visitFieldInsn(opcode, iowner, iname, idesc);
+				}
+				else
+				{
+					mv.visitMethodInsn(opcode, iowner, iname, idesc);
+				}
+				if (opcode == Opcodes.INVOKEINTERFACE)
+				{
+					u += 5;
+				}
+				else
+				{
+					u += 3;
+				}
+				break;
+			}
+			case ClassWriter.INDYMETH_INSN:
+			{
+				int cpIndex = items[readUnsignedShort(u + 1)];
+				int bsmIndex = context.bootstrapMethods[readUnsignedShort(cpIndex)];
+				Handle bsm = (Handle) readConst(readUnsignedShort(bsmIndex), c);
+				int bsmArgCount = readUnsignedShort(bsmIndex + 2);
+				Object[] bsmArgs = new Object[bsmArgCount];
+				bsmIndex += 4;
+				for (int i = 0; i < bsmArgCount; i++)
+				{
+					bsmArgs[i] = readConst(readUnsignedShort(bsmIndex), c);
+					bsmIndex += 2;
+				}
+				cpIndex = items[readUnsignedShort(cpIndex + 2)];
+				String iname = readUTF8(cpIndex, c);
+				String idesc = readUTF8(cpIndex + 2, c);
+				mv.visitInvokeDynamicInsn(iname, idesc, bsm, bsmArgs);
+				u += 5;
+				break;
+			}
+			case ClassWriter.TYPE_INSN:
+				mv.visitTypeInsn(opcode, readClass(u + 1, c));
+				u += 3;
+				break;
+			case ClassWriter.IINC_INSN:
+				mv.visitIincInsn(b[u + 1] & 0xFF, b[u + 2]);
+				u += 3;
+				break;
+			// case MANA_INSN:
+			default:
+				mv.visitMultiANewArrayInsn(readClass(u + 1, c), b[u + 3] & 0xFF);
+				u += 4;
+				break;
+			}
+		}
+		if (labels[codeLength] != null)
+		{
+			mv.visitLabel(labels[codeLength]);
+		}
+
+		// visits the local variable tables
+		if ((context.flags & SKIP_DEBUG) == 0 && varTable != 0)
+		{
+			int[] typeTable = null;
+			if (varTypeTable != 0)
+			{
+				u = varTypeTable + 2;
+				typeTable = new int[readUnsignedShort(varTypeTable) * 3];
+				for (int i = typeTable.length; i > 0;)
+				{
+					typeTable[--i] = u + 6; // signature
+					typeTable[--i] = readUnsignedShort(u + 8); // index
+					typeTable[--i] = readUnsignedShort(u); // start
+					u += 10;
+				}
+			}
+			u = varTable + 2;
+			for (int i = readUnsignedShort(varTable); i > 0; --i)
+			{
+				int start = readUnsignedShort(u);
+				int length = readUnsignedShort(u + 2);
+				int index = readUnsignedShort(u + 8);
+				String vsignature = null;
+				if (typeTable != null)
+				{
+					for (int j = 0; j < typeTable.length; j += 3)
+					{
+						if (typeTable[j] == start && typeTable[j + 1] == index)
+						{
+							vsignature = readUTF8(typeTable[j + 2], c);
+							break;
+						}
+					}
+				}
+				mv.visitLocalVariable(readUTF8(u + 4, c), readUTF8(u + 6, c),
+						vsignature, labels[start], labels[start + length],
+						index);
+				u += 10;
+			}
+		}
+
+		// visits the code attributes
+		while (attributes != null)
+		{
+			Attribute attr = attributes.next;
+			attributes.next = null;
+			mv.visitAttribute(attributes);
+			attributes = attr;
+		}
+
+		// visits the max stack and max locals values
+		mv.visitMaxs(maxStack, maxLocals);
+	}
+
+	/**
+	 * Reads parameter annotations and makes the given visitor visit them.
+	 * 
+	 * @param v
+	 *            start offset in {@link #b b} of the annotations to be read.
+	 * @param desc
+	 *            the method descriptor.
+	 * @param buf
+	 *            buffer to be used to call {@link #readUTF8 readUTF8},
+	 *            {@link #readClass(int,char[]) readClass} or {@link #readConst
+	 *            readConst}.
+	 * @param visible
+	 *            <tt>true</tt> if the annotations to be read are visible at
+	 *            runtime.
+	 * @param mv
+	 *            the visitor that must visit the annotations.
+	 */
+	private void readParameterAnnotations(int v, final String desc,
+			final char[] buf, final boolean visible, final MethodVisitor mv)
+	{
+		int i;
+		int n = b[v++] & 0xFF;
+		// workaround for a bug in javac (javac compiler generates a parameter
+		// annotation array whose size is equal to the number of parameters in
+		// the Java source file, while it should generate an array whose size is
+		// equal to the number of parameters in the method descriptor - which
+		// includes the synthetic parameters added by the compiler). This work-
+		// around supposes that the synthetic parameters are the first ones.
+		int synthetics = Type.getArgumentTypes(desc).length - n;
+		AnnotationVisitor av;
+		for (i = 0; i < synthetics; ++i)
+		{
+			// virtual annotation to detect synthetic parameters in MethodWriter
+			av = mv.visitParameterAnnotation(i, "Ljava/lang/Synthetic;", false);
+			if (av != null)
+			{
+				av.visitEnd();
+			}
+		}
+		for (; i < n + synthetics; ++i)
+		{
+			int j = readUnsignedShort(v);
+			v += 2;
+			for (; j > 0; --j)
+			{
+				av = mv.visitParameterAnnotation(i, readUTF8(v, buf), visible);
+				v = readAnnotationValues(v + 2, buf, true, av);
+			}
+		}
+	}
+
+	/**
+	 * Reads the values of an annotation and makes the given visitor visit them.
+	 * 
+	 * @param v
+	 *            the start offset in {@link #b b} of the values to be read
+	 *            (including the unsigned short that gives the number of
+	 *            values).
+	 * @param buf
+	 *            buffer to be used to call {@link #readUTF8 readUTF8},
+	 *            {@link #readClass(int,char[]) readClass} or {@link #readConst
+	 *            readConst}.
+	 * @param named
+	 *            if the annotation values are named or not.
+	 * @param av
+	 *            the visitor that must visit the values.
+	 * @return the end offset of the annotation values.
+	 */
+	private int readAnnotationValues(int v, final char[] buf,
+			final boolean named, final AnnotationVisitor av)
+	{
+		int i = readUnsignedShort(v);
+		v += 2;
+		if (named)
+		{
+			for (; i > 0; --i)
+			{
+				v = readAnnotationValue(v + 2, buf, readUTF8(v, buf), av);
+			}
+		}
+		else
+		{
+			for (; i > 0; --i)
+			{
+				v = readAnnotationValue(v, buf, null, av);
+			}
+		}
+		if (av != null)
+		{
+			av.visitEnd();
+		}
+		return v;
+	}
+
+	/**
+	 * Reads a value of an annotation and makes the given visitor visit it.
+	 * 
+	 * @param v
+	 *            the start offset in {@link #b b} of the value to be read
+	 *            (<i>not including the value name constant pool index</i>).
+	 * @param buf
+	 *            buffer to be used to call {@link #readUTF8 readUTF8},
+	 *            {@link #readClass(int,char[]) readClass} or {@link #readConst
+	 *            readConst}.
+	 * @param name
+	 *            the name of the value to be read.
+	 * @param av
+	 *            the visitor that must visit the value.
+	 * @return the end offset of the annotation value.
+	 */
+	private int readAnnotationValue(int v, final char[] buf, final String name,
+			final AnnotationVisitor av)
+	{
+		int i;
+		if (av == null)
+		{
+			switch (b[v] & 0xFF)
+			{
+			case 'e': // enum_const_value
+				return v + 5;
+			case '@': // annotation_value
+				return readAnnotationValues(v + 3, buf, true, null);
+			case '[': // array_value
+				return readAnnotationValues(v + 1, buf, false, null);
+			default:
+				return v + 3;
+			}
+		}
+		switch (b[v++] & 0xFF)
+		{
+		case 'I': // pointer to CONSTANT_Integer
+		case 'J': // pointer to CONSTANT_Long
+		case 'F': // pointer to CONSTANT_Float
+		case 'D': // pointer to CONSTANT_Double
+			av.visit(name, readConst(readUnsignedShort(v), buf));
+			v += 2;
+			break;
+		case 'B': // pointer to CONSTANT_Byte
+			av.visit(name,
+					new Byte((byte) readInt(items[readUnsignedShort(v)])));
+			v += 2;
+			break;
+		case 'Z': // pointer to CONSTANT_Boolean
+			av.visit(name,
+					readInt(items[readUnsignedShort(v)]) == 0 ? Boolean.FALSE
+							: Boolean.TRUE);
+			v += 2;
+			break;
+		case 'S': // pointer to CONSTANT_Short
+			av.visit(name, new Short(
+					(short) readInt(items[readUnsignedShort(v)])));
+			v += 2;
+			break;
+		case 'C': // pointer to CONSTANT_Char
+			av.visit(name, new Character(
+					(char) readInt(items[readUnsignedShort(v)])));
+			v += 2;
+			break;
+		case 's': // pointer to CONSTANT_Utf8
+			av.visit(name, readUTF8(v, buf));
+			v += 2;
+			break;
+		case 'e': // enum_const_value
+			av.visitEnum(name, readUTF8(v, buf), readUTF8(v + 2, buf));
+			v += 4;
+			break;
+		case 'c': // class_info
+			av.visit(name, Type.getType(readUTF8(v, buf)));
+			v += 2;
+			break;
+		case '@': // annotation_value
+			v = readAnnotationValues(v + 2, buf, true,
+					av.visitAnnotation(name, readUTF8(v, buf)));
+			break;
+		case '[': // array_value
+			int size = readUnsignedShort(v);
+			v += 2;
+			if (size == 0)
+			{
+				return readAnnotationValues(v - 2, buf, false,
+						av.visitArray(name));
+			}
+			switch (this.b[v++] & 0xFF)
+			{
+			case 'B':
+				byte[] bv = new byte[size];
+				for (i = 0; i < size; i++)
+				{
+					bv[i] = (byte) readInt(items[readUnsignedShort(v)]);
+					v += 3;
+				}
+				av.visit(name, bv);
+				--v;
+				break;
+			case 'Z':
+				boolean[] zv = new boolean[size];
+				for (i = 0; i < size; i++)
+				{
+					zv[i] = readInt(items[readUnsignedShort(v)]) != 0;
+					v += 3;
+				}
+				av.visit(name, zv);
+				--v;
+				break;
+			case 'S':
+				short[] sv = new short[size];
+				for (i = 0; i < size; i++)
+				{
+					sv[i] = (short) readInt(items[readUnsignedShort(v)]);
+					v += 3;
+				}
+				av.visit(name, sv);
+				--v;
+				break;
+			case 'C':
+				char[] cv = new char[size];
+				for (i = 0; i < size; i++)
+				{
+					cv[i] = (char) readInt(items[readUnsignedShort(v)]);
+					v += 3;
+				}
+				av.visit(name, cv);
+				--v;
+				break;
+			case 'I':
+				int[] iv = new int[size];
+				for (i = 0; i < size; i++)
+				{
+					iv[i] = readInt(items[readUnsignedShort(v)]);
+					v += 3;
+				}
+				av.visit(name, iv);
+				--v;
+				break;
+			case 'J':
+				long[] lv = new long[size];
+				for (i = 0; i < size; i++)
+				{
+					lv[i] = readLong(items[readUnsignedShort(v)]);
+					v += 3;
+				}
+				av.visit(name, lv);
+				--v;
+				break;
+			case 'F':
+				float[] fv = new float[size];
+				for (i = 0; i < size; i++)
+				{
+					fv[i] = Float
+							.intBitsToFloat(readInt(items[readUnsignedShort(v)]));
+					v += 3;
+				}
+				av.visit(name, fv);
+				--v;
+				break;
+			case 'D':
+				double[] dv = new double[size];
+				for (i = 0; i < size; i++)
+				{
+					dv[i] = Double
+							.longBitsToDouble(readLong(items[readUnsignedShort(v)]));
+					v += 3;
+				}
+				av.visit(name, dv);
+				--v;
+				break;
+			default:
+				v = readAnnotationValues(v - 3, buf, false, av.visitArray(name));
+			}
+		}
+		return v;
+	}
+
+	/**
+	 * Computes the implicit frame of the method currently being parsed (as
+	 * defined in the given {@link Context}) and stores it in the given context.
+	 * 
+	 * @param frame
+	 *            information about the class being parsed.
+	 */
+	private void getImplicitFrame(final Context frame)
+	{
+		String desc = frame.desc;
+		Object[] locals = frame.local;
+		int local = 0;
+		if ((frame.access & Opcodes.ACC_STATIC) == 0)
+		{
+			if ("<init>".equals(frame.name))
+			{
+				locals[local++] = Opcodes.UNINITIALIZED_THIS;
+			}
+			else
+			{
+				locals[local++] = readClass(header + 2, frame.buffer);
+			}
+		}
+		int i = 1;
+		loop: while (true)
+		{
+			int j = i;
+			switch (desc.charAt(i++))
+			{
+			case 'Z':
+			case 'C':
+			case 'B':
+			case 'S':
+			case 'I':
+				locals[local++] = Opcodes.INTEGER;
+				break;
+			case 'F':
+				locals[local++] = Opcodes.FLOAT;
+				break;
+			case 'J':
+				locals[local++] = Opcodes.LONG;
+				break;
+			case 'D':
+				locals[local++] = Opcodes.DOUBLE;
+				break;
+			case '[':
+				while (desc.charAt(i) == '[')
+				{
+					++i;
+				}
+				if (desc.charAt(i) == 'L')
+				{
+					++i;
+					while (desc.charAt(i) != ';')
+					{
+						++i;
+					}
+				}
+				locals[local++] = desc.substring(j, ++i);
+				break;
+			case 'L':
+				while (desc.charAt(i) != ';')
+				{
+					++i;
+				}
+				locals[local++] = desc.substring(j + 1, i++);
+				break;
+			default:
+				break loop;
+			}
+		}
+		frame.localCount = local;
+	}
+
+	/**
+	 * Reads a stack map frame and stores the result in the given
+	 * {@link Context} object.
+	 * 
+	 * @param stackMap
+	 *            the start offset of a stack map frame in the class file.
+	 * @param zip
+	 *            if the stack map frame at stackMap is compressed or not.
+	 * @param unzip
+	 *            if the stack map frame must be uncompressed.
+	 * @param labels
+	 *            the labels of the method currently being parsed, indexed by
+	 *            their offset. A new label for the parsed stack map frame is
+	 *            stored in this array if it does not already exist.
+	 * @param frame
+	 *            where the parsed stack map frame must be stored.
+	 * @return the offset of the first byte following the parsed frame.
+	 */
+	private int readFrame(int stackMap, boolean zip, boolean unzip,
+			Label[] labels, Context frame)
+	{
+		char[] c = frame.buffer;
+		int tag;
+		int delta;
+		if (zip)
+		{
+			tag = b[stackMap++] & 0xFF;
+		}
+		else
+		{
+			tag = MethodWriter.FULL_FRAME;
+			frame.offset = -1;
+		}
+		frame.localDiff = 0;
+		if (tag < MethodWriter.SAME_LOCALS_1_STACK_ITEM_FRAME)
+		{
+			delta = tag;
+			frame.mode = Opcodes.F_SAME;
+			frame.stackCount = 0;
+		}
+		else if (tag < MethodWriter.RESERVED)
+		{
+			delta = tag - MethodWriter.SAME_LOCALS_1_STACK_ITEM_FRAME;
+			stackMap = readFrameType(frame.stack, 0, stackMap, c, labels);
+			frame.mode = Opcodes.F_SAME1;
+			frame.stackCount = 1;
+		}
+		else
+		{
+			delta = readUnsignedShort(stackMap);
+			stackMap += 2;
+			if (tag == MethodWriter.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED)
+			{
+				stackMap = readFrameType(frame.stack, 0, stackMap, c, labels);
+				frame.mode = Opcodes.F_SAME1;
+				frame.stackCount = 1;
+			}
+			else if (tag >= MethodWriter.CHOP_FRAME
+					&& tag < MethodWriter.SAME_FRAME_EXTENDED)
+			{
+				frame.mode = Opcodes.F_CHOP;
+				frame.localDiff = MethodWriter.SAME_FRAME_EXTENDED - tag;
+				frame.localCount -= frame.localDiff;
+				frame.stackCount = 0;
+			}
+			else if (tag == MethodWriter.SAME_FRAME_EXTENDED)
+			{
+				frame.mode = Opcodes.F_SAME;
+				frame.stackCount = 0;
+			}
+			else if (tag < MethodWriter.FULL_FRAME)
+			{
+				int local = unzip ? frame.localCount : 0;
+				for (int i = tag - MethodWriter.SAME_FRAME_EXTENDED; i > 0; i--)
+				{
+					stackMap = readFrameType(frame.local, local++, stackMap, c,
+							labels);
+				}
+				frame.mode = Opcodes.F_APPEND;
+				frame.localDiff = tag - MethodWriter.SAME_FRAME_EXTENDED;
+				frame.localCount += frame.localDiff;
+				frame.stackCount = 0;
+			}
+			else
+			{ // if (tag == FULL_FRAME) {
+				frame.mode = Opcodes.F_FULL;
+				int n = readUnsignedShort(stackMap);
+				stackMap += 2;
+				frame.localDiff = n;
+				frame.localCount = n;
+				for (int local = 0; n > 0; n--)
+				{
+					stackMap = readFrameType(frame.local, local++, stackMap, c,
+							labels);
+				}
+				n = readUnsignedShort(stackMap);
+				stackMap += 2;
+				frame.stackCount = n;
+				for (int stack = 0; n > 0; n--)
+				{
+					stackMap = readFrameType(frame.stack, stack++, stackMap, c,
+							labels);
+				}
+			}
+		}
+		frame.offset += delta + 1;
+		readLabel(frame.offset, labels);
+		return stackMap;
+	}
+
+	/**
+	 * Reads a stack map frame type and stores it at the given index in the
+	 * given array.
+	 * 
+	 * @param frame
+	 *            the array where the parsed type must be stored.
+	 * @param index
+	 *            the index in 'frame' where the parsed type must be stored.
+	 * @param v
+	 *            the start offset of the stack map frame type to read.
+	 * @param buf
+	 *            a buffer to read strings.
+	 * @param labels
+	 *            the labels of the method currently being parsed, indexed by
+	 *            their offset. If the parsed type is an Uninitialized type, a
+	 *            new label for the corresponding NEW instruction is stored in
+	 *            this array if it does not already exist.
+	 * @return the offset of the first byte after the parsed type.
+	 */
+	private int readFrameType(final Object[] frame, final int index, int v,
+			final char[] buf, final Label[] labels)
+	{
+		int type = b[v++] & 0xFF;
+		switch (type)
+		{
+		case 0:
+			frame[index] = Opcodes.TOP;
+			break;
+		case 1:
+			frame[index] = Opcodes.INTEGER;
+			break;
+		case 2:
+			frame[index] = Opcodes.FLOAT;
+			break;
+		case 3:
+			frame[index] = Opcodes.DOUBLE;
+			break;
+		case 4:
+			frame[index] = Opcodes.LONG;
+			break;
+		case 5:
+			frame[index] = Opcodes.NULL;
+			break;
+		case 6:
+			frame[index] = Opcodes.UNINITIALIZED_THIS;
+			break;
+		case 7: // Object
+			frame[index] = readClass(v, buf);
+			v += 2;
+			break;
+		default: // Uninitialized
+			frame[index] = readLabel(readUnsignedShort(v), labels);
+			v += 2;
+		}
+		return v;
+	}
+
+	/**
+	 * Returns the label corresponding to the given offset. The default
+	 * implementation of this method creates a label for the given offset if it
+	 * has not been already created.
+	 * 
+	 * @param offset
+	 *            a bytecode offset in a method.
+	 * @param labels
+	 *            the already created labels, indexed by their offset. If a
+	 *            label already exists for offset this method must not create a
+	 *            new one. Otherwise it must store the new label in this array.
+	 * @return a non null Label, which must be equal to labels[offset].
+	 */
+	protected Label readLabel(int offset, Label[] labels)
+	{
+		if (labels[offset] == null)
+		{
+			labels[offset] = new Label();
+		}
+		return labels[offset];
+	}
+
+	/**
+	 * Returns the start index of the attribute_info structure of this class.
+	 * 
+	 * @return the start index of the attribute_info structure of this class.
+	 */
+	private int getAttributes()
+	{
+		// skips the header
+		int u = header + 8 + readUnsignedShort(header + 6) * 2;
+		// skips fields and methods
+		for (int i = readUnsignedShort(u); i > 0; --i)
+		{
+			for (int j = readUnsignedShort(u + 8); j > 0; --j)
+			{
+				u += 6 + readInt(u + 12);
+			}
+			u += 8;
+		}
+		u += 2;
+		for (int i = readUnsignedShort(u); i > 0; --i)
+		{
+			for (int j = readUnsignedShort(u + 8); j > 0; --j)
+			{
+				u += 6 + readInt(u + 12);
+			}
+			u += 8;
+		}
+		// the attribute_info structure starts just after the methods
+		return u + 2;
+	}
+
+	/**
+	 * Reads an attribute in {@link #b b}.
+	 * 
+	 * @param attrs
+	 *            prototypes of the attributes that must be parsed during the
+	 *            visit of the class. Any attribute whose type is not equal to
+	 *            the type of one the prototypes is ignored (i.e. an empty
+	 *            {@link Attribute} instance is returned).
+	 * @param type
+	 *            the type of the attribute.
+	 * @param off
+	 *            index of the first byte of the attribute's content in
+	 *            {@link #b b}. The 6 attribute header bytes, containing the
+	 *            type and the length of the attribute, are not taken into
+	 *            account here (they have already been read).
+	 * @param len
+	 *            the length of the attribute's content.
+	 * @param buf
+	 *            buffer to be used to call {@link #readUTF8 readUTF8},
+	 *            {@link #readClass(int,char[]) readClass} or {@link #readConst
+	 *            readConst}.
+	 * @param codeOff
+	 *            index of the first byte of code's attribute content in
+	 *            {@link #b b}, or -1 if the attribute to be read is not a code
+	 *            attribute. The 6 attribute header bytes, containing the type
+	 *            and the length of the attribute, are not taken into account
+	 *            here.
+	 * @param labels
+	 *            the labels of the method's code, or <tt>null</tt> if the
+	 *            attribute to be read is not a code attribute.
+	 * @return the attribute that has been read, or <tt>null</tt> to skip this
+	 *         attribute.
+	 */
+	private Attribute readAttribute(final Attribute[] attrs, final String type,
+			final int off, final int len, final char[] buf, final int codeOff,
+			final Label[] labels)
+	{
+		for (int i = 0; i < attrs.length; ++i)
+		{
+			if (attrs[i].type.equals(type))
+			{
+				return attrs[i].read(this, off, len, buf, codeOff, labels);
+			}
+		}
+		return new Attribute(type).read(this, off, len, null, -1, null);
+	}
+
+	// ------------------------------------------------------------------------
+	// Utility methods: low level parsing
+	// ------------------------------------------------------------------------
+
+	/**
+	 * Returns the number of constant pool items in {@link #b b}.
+	 * 
+	 * @return the number of constant pool items in {@link #b b}.
+	 */
+	public int getItemCount()
+	{
+		return items.length;
+	}
+
+	/**
+	 * Returns the start index of the constant pool item in {@link #b b}, plus
+	 * one. <i>This method is intended for {@link Attribute} sub classes, and is
+	 * normally not needed by class generators or adapters.</i>
+	 * 
+	 * @param item
+	 *            the index a constant pool item.
+	 * @return the start index of the constant pool item in {@link #b b}, plus
+	 *         one.
+	 */
+	public int getItem(final int item)
+	{
+		return items[item];
+	}
+
+	/**
+	 * Returns the maximum length of the strings contained in the constant pool
+	 * of the class.
+	 * 
+	 * @return the maximum length of the strings contained in the constant pool
+	 *         of the class.
+	 */
+	public int getMaxStringLength()
+	{
+		return maxStringLength;
+	}
+
+	/**
+	 * Reads a byte value in {@link #b b}. <i>This method is intended for
+	 * {@link Attribute} sub classes, and is normally not needed by class
+	 * generators or adapters.</i>
+	 * 
+	 * @param index
+	 *            the start index of the value to be read in {@link #b b}.
+	 * @return the read value.
+	 */
+	public int readByte(final int index)
+	{
+		return b[index] & 0xFF;
+	}
+
+	/**
+	 * Reads an unsigned short value in {@link #b b}. <i>This method is intended
+	 * for {@link Attribute} sub classes, and is normally not needed by class
+	 * generators or adapters.</i>
+	 * 
+	 * @param index
+	 *            the start index of the value to be read in {@link #b b}.
+	 * @return the read value.
+	 */
+	public int readUnsignedShort(final int index)
+	{
+		byte[] b = this.b;
+		return ((b[index] & 0xFF) << 8) | (b[index + 1] & 0xFF);
+	}
+
+	/**
+	 * Reads a signed short value in {@link #b b}. <i>This method is intended
+	 * for {@link Attribute} sub classes, and is normally not needed by class
+	 * generators or adapters.</i>
+	 * 
+	 * @param index
+	 *            the start index of the value to be read in {@link #b b}.
+	 * @return the read value.
+	 */
+	public short readShort(final int index)
+	{
+		byte[] b = this.b;
+		return (short) (((b[index] & 0xFF) << 8) | (b[index + 1] & 0xFF));
+	}
+
+	/**
+	 * Reads a signed int value in {@link #b b}. <i>This method is intended for
+	 * {@link Attribute} sub classes, and is normally not needed by class
+	 * generators or adapters.</i>
+	 * 
+	 * @param index
+	 *            the start index of the value to be read in {@link #b b}.
+	 * @return the read value.
+	 */
+	public int readInt(final int index)
+	{
+		byte[] b = this.b;
+		return ((b[index] & 0xFF) << 24) | ((b[index + 1] & 0xFF) << 16)
+				| ((b[index + 2] & 0xFF) << 8) | (b[index + 3] & 0xFF);
+	}
+
+	/**
+	 * Reads a signed long value in {@link #b b}. <i>This method is intended for
+	 * {@link Attribute} sub classes, and is normally not needed by class
+	 * generators or adapters.</i>
+	 * 
+	 * @param index
+	 *            the start index of the value to be read in {@link #b b}.
+	 * @return the read value.
+	 */
+	public long readLong(final int index)
+	{
+		long l1 = readInt(index);
+		long l0 = readInt(index + 4) & 0xFFFFFFFFL;
+		return (l1 << 32) | l0;
+	}
+
+	/**
+	 * Reads an UTF8 string constant pool item in {@link #b b}. <i>This method
+	 * is intended for {@link Attribute} sub classes, and is normally not needed
+	 * by class generators or adapters.</i>
+	 * 
+	 * @param index
+	 *            the start index of an unsigned short value in {@link #b b},
+	 *            whose value is the index of an UTF8 constant pool item.
+	 * @param buf
+	 *            buffer to be used to read the item. This buffer must be
+	 *            sufficiently large. It is not automatically resized.
+	 * @return the String corresponding to the specified UTF8 item.
+	 */
+	public String readUTF8(int index, final char[] buf)
+	{
+		int item = readUnsignedShort(index);
+		if (index == 0 || item == 0 || item > strings.length)
+		{
+			return null;
+		}
+		String s = strings[item];
+		if (s != null)
+		{
+			return s;
+		}
+		index = items[item];
+		return strings[item] = readUTF(index + 2, readUnsignedShort(index), buf);
+	}
+
+	/**
+	 * Reads UTF8 string in {@link #b b}.
+	 * 
+	 * @param index
+	 *            start offset of the UTF8 string to be read.
+	 * @param utfLen
+	 *            length of the UTF8 string to be read.
+	 * @param buf
+	 *            buffer to be used to read the string. This buffer must be
+	 *            sufficiently large. It is not automatically resized.
+	 * @return the String corresponding to the specified UTF8 string.
+	 */
+	private String readUTF(int index, final int utfLen, final char[] buf)
+	{
+		int endIndex = index + utfLen;
+		byte[] b = this.b;
+		int strLen = 0;
+		int c;
+		int st = 0;
+		char cc = 0;
+		while (index < endIndex)
+		{
+			c = b[index++];
+			switch (st)
+			{
+			case 0:
+				c = c & 0xFF;
+				if (c < 0x80)
+				{ // 0xxxxxxx
+					buf[strLen++] = (char) c;
+				}
+				else if (c < 0xE0 && c > 0xBF)
+				{ // 110x xxxx 10xx xxxx
+					cc = (char) (c & 0x1F);
+					st = 1;
+				}
+				else
+				{ // 1110 xxxx 10xx xxxx 10xx xxxx
+					cc = (char) (c & 0x0F);
+					st = 2;
+				}
+				break;
+
+			case 1: // byte 2 of 2-byte char or byte 3 of 3-byte char
+				buf[strLen++] = (char) ((cc << 6) | (c & 0x3F));
+				st = 0;
+				break;
+
+			case 2: // byte 2 of 3-byte char
+				cc = (char) ((cc << 6) | (c & 0x3F));
+				st = 1;
+				break;
+			}
+		}
+		return new String(buf, 0, strLen);
+	}
+
+	/**
+	 * Reads a class constant pool item in {@link #b b}. <i>This method is
+	 * intended for {@link Attribute} sub classes, and is normally not needed by
+	 * class generators or adapters.</i>
+	 * 
+	 * @param index
+	 *            the start index of an unsigned short value in {@link #b b},
+	 *            whose value is the index of a class constant pool item.
+	 * @param buf
+	 *            buffer to be used to read the item. This buffer must be
+	 *            sufficiently large. It is not automatically resized.
+	 * @return the String corresponding to the specified class item.
+	 */
+	public String readClass(final int index, final char[] buf)
+	{
+		// computes the start index of the CONSTANT_Class item in b
+		// and reads the CONSTANT_Utf8 item designated by
+		// the first two bytes of this CONSTANT_Class item
+		return readUTF8(items[readUnsignedShort(index)], buf);
+	}
+
+	/**
+	 * Reads a numeric or string constant pool item in {@link #b b}. <i>This
+	 * method is intended for {@link Attribute} sub classes, and is normally not
+	 * needed by class generators or adapters.</i>
+	 * 
+	 * @param item
+	 *            the index of a constant pool item.
+	 * @param buf
+	 *            buffer to be used to read the item. This buffer must be
+	 *            sufficiently large. It is not automatically resized.
+	 * @return the {@link Integer}, {@link Float}, {@link Long}, {@link Double},
+	 *         {@link String}, {@link Type} or {@link Handle} corresponding to
+	 *         the given constant pool item.
+	 */
+	public Object readConst(final int item, final char[] buf)
+	{
+		int index = items[item];
+		switch (b[index - 1])
+		{
+		case ClassWriter.INT:
+			return new Integer(readInt(index));
+		case ClassWriter.FLOAT:
+			return new Float(Float.intBitsToFloat(readInt(index)));
+		case ClassWriter.LONG:
+			return new Long(readLong(index));
+		case ClassWriter.DOUBLE:
+			return new Double(Double.longBitsToDouble(readLong(index)));
+		case ClassWriter.CLASS:
+			return Type.getObjectType(readUTF8(index, buf));
+		case ClassWriter.STR:
+			return readUTF8(index, buf);
+		case ClassWriter.MTYPE:
+			return Type.getMethodType(readUTF8(index, buf));
+		default: // case ClassWriter.HANDLE_BASE + [1..9]:
+			int tag = readByte(index);
+			int[] items = this.items;
+			int cpIndex = items[readUnsignedShort(index + 1)];
+			String owner = readClass(cpIndex, buf);
+			cpIndex = items[readUnsignedShort(cpIndex + 2)];
+			String name = readUTF8(cpIndex, buf);
+			String desc = readUTF8(cpIndex + 2, buf);
+			return new Handle(tag, owner, name, desc);
+		}
+	}
+}
diff --git a/src/main/asm/org/objectweb/asm/ClassVisitor.java b/src/main/asm/org/objectweb/asm/ClassVisitor.java
new file mode 100644
index 0000000..cf3366c
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/ClassVisitor.java
@@ -0,0 +1,286 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm;
+
+/**
+ * A visitor to visit a Java class. The methods of this class must be called in
+ * the following order: <tt>visit</tt> [ <tt>visitSource</tt> ] [
+ * <tt>visitOuterClass</tt> ] ( <tt>visitAnnotation</tt> |
+ * <tt>visitAttribute</tt> )* ( <tt>visitInnerClass</tt> | <tt>visitField</tt> |
+ * <tt>visitMethod</tt> )* <tt>visitEnd</tt>.
+ * 
+ * @author Eric Bruneton
+ */
+public abstract class ClassVisitor {
+
+    /**
+     * The ASM API version implemented by this visitor. The value of this field
+     * must be one of {@link Opcodes#ASM4}.
+     */
+    protected final int api;
+
+    /**
+     * The class visitor to which this visitor must delegate method calls. May
+     * be null.
+     */
+    protected ClassVisitor cv;
+
+    /**
+     * Constructs a new {@link ClassVisitor}.
+     * 
+     * @param api
+     *            the ASM API version implemented by this visitor. Must be one
+     *            of {@link Opcodes#ASM4}.
+     */
+    public ClassVisitor(final int api) {
+        this(api, null);
+    }
+
+    /**
+     * Constructs a new {@link ClassVisitor}.
+     * 
+     * @param api
+     *            the ASM API version implemented by this visitor. Must be one
+     *            of {@link Opcodes#ASM4}.
+     * @param cv
+     *            the class visitor to which this visitor must delegate method
+     *            calls. May be null.
+     */
+    public ClassVisitor(final int api, final ClassVisitor cv) {
+        if (api != Opcodes.ASM4) {
+            throw new IllegalArgumentException();
+        }
+        this.api = api;
+        this.cv = cv;
+    }
+
+    /**
+     * Visits the header of the class.
+     * 
+     * @param version
+     *            the class version.
+     * @param access
+     *            the class's access flags (see {@link Opcodes}). This parameter
+     *            also indicates if the class is deprecated.
+     * @param name
+     *            the internal name of the class (see
+     *            {@link Type#getInternalName() getInternalName}).
+     * @param signature
+     *            the signature of this class. May be <tt>null</tt> if the class
+     *            is not a generic one, and does not extend or implement generic
+     *            classes or interfaces.
+     * @param superName
+     *            the internal of name of the super class (see
+     *            {@link Type#getInternalName() getInternalName}). For
+     *            interfaces, the super class is {@link Object}. May be
+     *            <tt>null</tt>, but only for the {@link Object} class.
+     * @param interfaces
+     *            the internal names of the class's interfaces (see
+     *            {@link Type#getInternalName() getInternalName}). May be
+     *            <tt>null</tt>.
+     */
+    public void visit(int version, int access, String name, String signature,
+            String superName, String[] interfaces) {
+        if (cv != null) {
+            cv.visit(version, access, name, signature, superName, interfaces);
+        }
+    }
+
+    /**
+     * Visits the source of the class.
+     * 
+     * @param source
+     *            the name of the source file from which the class was compiled.
+     *            May be <tt>null</tt>.
+     * @param debug
+     *            additional debug information to compute the correspondance
+     *            between source and compiled elements of the class. May be
+     *            <tt>null</tt>.
+     */
+    public void visitSource(String source, String debug) {
+        if (cv != null) {
+            cv.visitSource(source, debug);
+        }
+    }
+
+    /**
+     * Visits the enclosing class of the class. This method must be called only
+     * if the class has an enclosing class.
+     * 
+     * @param owner
+     *            internal name of the enclosing class of the class.
+     * @param name
+     *            the name of the method that contains the class, or
+     *            <tt>null</tt> if the class is not enclosed in a method of its
+     *            enclosing class.
+     * @param desc
+     *            the descriptor of the method that contains the class, or
+     *            <tt>null</tt> if the class is not enclosed in a method of its
+     *            enclosing class.
+     */
+    public void visitOuterClass(String owner, String name, String desc) {
+        if (cv != null) {
+            cv.visitOuterClass(owner, name, desc);
+        }
+    }
+
+    /**
+     * Visits an annotation of the class.
+     * 
+     * @param desc
+     *            the class descriptor of the annotation class.
+     * @param visible
+     *            <tt>true</tt> if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values, or <tt>null</tt> if
+     *         this visitor is not interested in visiting this annotation.
+     */
+    public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+        if (cv != null) {
+            return cv.visitAnnotation(desc, visible);
+        }
+        return null;
+    }
+
+    /**
+     * Visits a non standard attribute of the class.
+     * 
+     * @param attr
+     *            an attribute.
+     */
+    public void visitAttribute(Attribute attr) {
+        if (cv != null) {
+            cv.visitAttribute(attr);
+        }
+    }
+
+    /**
+     * Visits information about an inner class. This inner class is not
+     * necessarily a member of the class being visited.
+     * 
+     * @param name
+     *            the internal name of an inner class (see
+     *            {@link Type#getInternalName() getInternalName}).
+     * @param outerName
+     *            the internal name of the class to which the inner class
+     *            belongs (see {@link Type#getInternalName() getInternalName}).
+     *            May be <tt>null</tt> for not member classes.
+     * @param innerName
+     *            the (simple) name of the inner class inside its enclosing
+     *            class. May be <tt>null</tt> for anonymous inner classes.
+     * @param access
+     *            the access flags of the inner class as originally declared in
+     *            the enclosing class.
+     */
+    public void visitInnerClass(String name, String outerName,
+            String innerName, int access) {
+        if (cv != null) {
+            cv.visitInnerClass(name, outerName, innerName, access);
+        }
+    }
+
+    /**
+     * Visits a field of the class.
+     * 
+     * @param access
+     *            the field's access flags (see {@link Opcodes}). This parameter
+     *            also indicates if the field is synthetic and/or deprecated.
+     * @param name
+     *            the field's name.
+     * @param desc
+     *            the field's descriptor (see {@link Type Type}).
+     * @param signature
+     *            the field's signature. May be <tt>null</tt> if the field's
+     *            type does not use generic types.
+     * @param value
+     *            the field's initial value. This parameter, which may be
+     *            <tt>null</tt> if the field does not have an initial value,
+     *            must be an {@link Integer}, a {@link Float}, a {@link Long}, a
+     *            {@link Double} or a {@link String} (for <tt>int</tt>,
+     *            <tt>float</tt>, <tt>long</tt> or <tt>String</tt> fields
+     *            respectively). <i>This parameter is only used for static
+     *            fields</i>. Its value is ignored for non static fields, which
+     *            must be initialized through bytecode instructions in
+     *            constructors or methods.
+     * @return a visitor to visit field annotations and attributes, or
+     *         <tt>null</tt> if this class visitor is not interested in visiting
+     *         these annotations and attributes.
+     */
+    public FieldVisitor visitField(int access, String name, String desc,
+            String signature, Object value) {
+        if (cv != null) {
+            return cv.visitField(access, name, desc, signature, value);
+        }
+        return null;
+    }
+
+    /**
+     * Visits a method of the class. This method <i>must</i> return a new
+     * {@link MethodVisitor} instance (or <tt>null</tt>) each time it is called,
+     * i.e., it should not return a previously returned visitor.
+     * 
+     * @param access
+     *            the method's access flags (see {@link Opcodes}). This
+     *            parameter also indicates if the method is synthetic and/or
+     *            deprecated.
+     * @param name
+     *            the method's name.
+     * @param desc
+     *            the method's descriptor (see {@link Type Type}).
+     * @param signature
+     *            the method's signature. May be <tt>null</tt> if the method
+     *            parameters, return type and exceptions do not use generic
+     *            types.
+     * @param exceptions
+     *            the internal names of the method's exception classes (see
+     *            {@link Type#getInternalName() getInternalName}). May be
+     *            <tt>null</tt>.
+     * @return an object to visit the byte code of the method, or <tt>null</tt>
+     *         if this class visitor is not interested in visiting the code of
+     *         this method.
+     */
+    public MethodVisitor visitMethod(int access, String name, String desc,
+            String signature, String[] exceptions) {
+        if (cv != null) {
+            return cv.visitMethod(access, name, desc, signature, exceptions);
+        }
+        return null;
+    }
+
+    /**
+     * Visits the end of the class. This method, which is the last one to be
+     * called, is used to inform the visitor that all the fields and methods of
+     * the class have been visited.
+     */
+    public void visitEnd() {
+        if (cv != null) {
+            cv.visitEnd();
+        }
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/ClassWriter.java b/src/main/asm/org/objectweb/asm/ClassWriter.java
new file mode 100644
index 0000000..4dfd03e
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/ClassWriter.java
@@ -0,0 +1,1706 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm;
+
+/**
+ * A {@link ClassVisitor} that generates classes in bytecode form. More
+ * precisely this visitor generates a byte array conforming to the Java class
+ * file format. It can be used alone, to generate a Java class "from scratch",
+ * or with one or more {@link ClassReader ClassReader} and adapter class visitor
+ * to generate a modified class from one or more existing Java classes.
+ * 
+ * @author Eric Bruneton
+ */
+public class ClassWriter extends ClassVisitor {
+
+    /**
+     * Flag to automatically compute the maximum stack size and the maximum
+     * number of local variables of methods. If this flag is set, then the
+     * arguments of the {@link MethodVisitor#visitMaxs visitMaxs} method of the
+     * {@link MethodVisitor} returned by the {@link #visitMethod visitMethod}
+     * method will be ignored, and computed automatically from the signature and
+     * the bytecode of each method.
+     * 
+     * @see #ClassWriter(int)
+     */
+    public static final int COMPUTE_MAXS = 1;
+
+    /**
+     * Flag to automatically compute the stack map frames of methods from
+     * scratch. If this flag is set, then the calls to the
+     * {@link MethodVisitor#visitFrame} method are ignored, and the stack map
+     * frames are recomputed from the methods bytecode. The arguments of the
+     * {@link MethodVisitor#visitMaxs visitMaxs} method are also ignored and
+     * recomputed from the bytecode. In other words, computeFrames implies
+     * computeMaxs.
+     * 
+     * @see #ClassWriter(int)
+     */
+    public static final int COMPUTE_FRAMES = 2;
+
+    /**
+     * Pseudo access flag to distinguish between the synthetic attribute and the
+     * synthetic access flag.
+     */
+    static final int ACC_SYNTHETIC_ATTRIBUTE = 0x40000;
+
+    /**
+     * Factor to convert from ACC_SYNTHETIC_ATTRIBUTE to Opcode.ACC_SYNTHETIC.
+     */
+    static final int TO_ACC_SYNTHETIC = ACC_SYNTHETIC_ATTRIBUTE
+            / Opcodes.ACC_SYNTHETIC;
+
+    /**
+     * The type of instructions without any argument.
+     */
+    static final int NOARG_INSN = 0;
+
+    /**
+     * The type of instructions with an signed byte argument.
+     */
+    static final int SBYTE_INSN = 1;
+
+    /**
+     * The type of instructions with an signed short argument.
+     */
+    static final int SHORT_INSN = 2;
+
+    /**
+     * The type of instructions with a local variable index argument.
+     */
+    static final int VAR_INSN = 3;
+
+    /**
+     * The type of instructions with an implicit local variable index argument.
+     */
+    static final int IMPLVAR_INSN = 4;
+
+    /**
+     * The type of instructions with a type descriptor argument.
+     */
+    static final int TYPE_INSN = 5;
+
+    /**
+     * The type of field and method invocations instructions.
+     */
+    static final int FIELDORMETH_INSN = 6;
+
+    /**
+     * The type of the INVOKEINTERFACE/INVOKEDYNAMIC instruction.
+     */
+    static final int ITFMETH_INSN = 7;
+
+    /**
+     * The type of the INVOKEDYNAMIC instruction.
+     */
+    static final int INDYMETH_INSN = 8;
+
+    /**
+     * The type of instructions with a 2 bytes bytecode offset label.
+     */
+    static final int LABEL_INSN = 9;
+
+    /**
+     * The type of instructions with a 4 bytes bytecode offset label.
+     */
+    static final int LABELW_INSN = 10;
+
+    /**
+     * The type of the LDC instruction.
+     */
+    static final int LDC_INSN = 11;
+
+    /**
+     * The type of the LDC_W and LDC2_W instructions.
+     */
+    static final int LDCW_INSN = 12;
+
+    /**
+     * The type of the IINC instruction.
+     */
+    static final int IINC_INSN = 13;
+
+    /**
+     * The type of the TABLESWITCH instruction.
+     */
+    static final int TABL_INSN = 14;
+
+    /**
+     * The type of the LOOKUPSWITCH instruction.
+     */
+    static final int LOOK_INSN = 15;
+
+    /**
+     * The type of the MULTIANEWARRAY instruction.
+     */
+    static final int MANA_INSN = 16;
+
+    /**
+     * The type of the WIDE instruction.
+     */
+    static final int WIDE_INSN = 17;
+
+    /**
+     * The instruction types of all JVM opcodes.
+     */
+    static final byte[] TYPE;
+
+    /**
+     * The type of CONSTANT_Class constant pool items.
+     */
+    static final int CLASS = 7;
+
+    /**
+     * The type of CONSTANT_Fieldref constant pool items.
+     */
+    static final int FIELD = 9;
+
+    /**
+     * The type of CONSTANT_Methodref constant pool items.
+     */
+    static final int METH = 10;
+
+    /**
+     * The type of CONSTANT_InterfaceMethodref constant pool items.
+     */
+    static final int IMETH = 11;
+
+    /**
+     * The type of CONSTANT_String constant pool items.
+     */
+    static final int STR = 8;
+
+    /**
+     * The type of CONSTANT_Integer constant pool items.
+     */
+    static final int INT = 3;
+
+    /**
+     * The type of CONSTANT_Float constant pool items.
+     */
+    static final int FLOAT = 4;
+
+    /**
+     * The type of CONSTANT_Long constant pool items.
+     */
+    static final int LONG = 5;
+
+    /**
+     * The type of CONSTANT_Double constant pool items.
+     */
+    static final int DOUBLE = 6;
+
+    /**
+     * The type of CONSTANT_NameAndType constant pool items.
+     */
+    static final int NAME_TYPE = 12;
+
+    /**
+     * The type of CONSTANT_Utf8 constant pool items.
+     */
+    static final int UTF8 = 1;
+
+    /**
+     * The type of CONSTANT_MethodType constant pool items.
+     */
+    static final int MTYPE = 16;
+
+    /**
+     * The type of CONSTANT_MethodHandle constant pool items.
+     */
+    static final int HANDLE = 15;
+
+    /**
+     * The type of CONSTANT_InvokeDynamic constant pool items.
+     */
+    static final int INDY = 18;
+
+    /**
+     * The base value for all CONSTANT_MethodHandle constant pool items.
+     * Internally, ASM store the 9 variations of CONSTANT_MethodHandle into 9
+     * different items.
+     */
+    static final int HANDLE_BASE = 20;
+
+    /**
+     * Normal type Item stored in the ClassWriter {@link ClassWriter#typeTable},
+     * instead of the constant pool, in order to avoid clashes with normal
+     * constant pool items in the ClassWriter constant pool's hash table.
+     */
+    static final int TYPE_NORMAL = 30;
+
+    /**
+     * Uninitialized type Item stored in the ClassWriter
+     * {@link ClassWriter#typeTable}, instead of the constant pool, in order to
+     * avoid clashes with normal constant pool items in the ClassWriter constant
+     * pool's hash table.
+     */
+    static final int TYPE_UNINIT = 31;
+
+    /**
+     * Merged type Item stored in the ClassWriter {@link ClassWriter#typeTable},
+     * instead of the constant pool, in order to avoid clashes with normal
+     * constant pool items in the ClassWriter constant pool's hash table.
+     */
+    static final int TYPE_MERGED = 32;
+
+    /**
+     * The type of BootstrapMethods items. These items are stored in a special
+     * class attribute named BootstrapMethods and not in the constant pool.
+     */
+    static final int BSM = 33;
+
+    /**
+     * The class reader from which this class writer was constructed, if any.
+     */
+    ClassReader cr;
+
+    /**
+     * Minor and major version numbers of the class to be generated.
+     */
+    int version;
+
+    /**
+     * Index of the next item to be added in the constant pool.
+     */
+    int index;
+
+    /**
+     * The constant pool of this class.
+     */
+    final ByteVector pool;
+
+    /**
+     * The constant pool's hash table data.
+     */
+    Item[] items;
+
+    /**
+     * The threshold of the constant pool's hash table.
+     */
+    int threshold;
+
+    /**
+     * A reusable key used to look for items in the {@link #items} hash table.
+     */
+    final Item key;
+
+    /**
+     * A reusable key used to look for items in the {@link #items} hash table.
+     */
+    final Item key2;
+
+    /**
+     * A reusable key used to look for items in the {@link #items} hash table.
+     */
+    final Item key3;
+
+    /**
+     * A reusable key used to look for items in the {@link #items} hash table.
+     */
+    final Item key4;
+
+    /**
+     * A type table used to temporarily store internal names that will not
+     * necessarily be stored in the constant pool. This type table is used by
+     * the control flow and data flow analysis algorithm used to compute stack
+     * map frames from scratch. This array associates to each index <tt>i</tt>
+     * the Item whose index is <tt>i</tt>. All Item objects stored in this array
+     * are also stored in the {@link #items} hash table. These two arrays allow
+     * to retrieve an Item from its index or, conversely, to get the index of an
+     * Item from its value. Each Item stores an internal name in its
+     * {@link Item#strVal1} field.
+     */
+    Item[] typeTable;
+
+    /**
+     * Number of elements in the {@link #typeTable} array.
+     */
+    private short typeCount;
+
+    /**
+     * The access flags of this class.
+     */
+    private int access;
+
+    /**
+     * The constant pool item that contains the internal name of this class.
+     */
+    private int name;
+
+    /**
+     * The internal name of this class.
+     */
+    String thisName;
+
+    /**
+     * The constant pool item that contains the signature of this class.
+     */
+    private int signature;
+
+    /**
+     * The constant pool item that contains the internal name of the super class
+     * of this class.
+     */
+    private int superName;
+
+    /**
+     * Number of interfaces implemented or extended by this class or interface.
+     */
+    private int interfaceCount;
+
+    /**
+     * The interfaces implemented or extended by this class or interface. More
+     * precisely, this array contains the indexes of the constant pool items
+     * that contain the internal names of these interfaces.
+     */
+    private int[] interfaces;
+
+    /**
+     * The index of the constant pool item that contains the name of the source
+     * file from which this class was compiled.
+     */
+    private int sourceFile;
+
+    /**
+     * The SourceDebug attribute of this class.
+     */
+    private ByteVector sourceDebug;
+
+    /**
+     * The constant pool item that contains the name of the enclosing class of
+     * this class.
+     */
+    private int enclosingMethodOwner;
+
+    /**
+     * The constant pool item that contains the name and descriptor of the
+     * enclosing method of this class.
+     */
+    private int enclosingMethod;
+
+    /**
+     * The runtime visible annotations of this class.
+     */
+    private AnnotationWriter anns;
+
+    /**
+     * The runtime invisible annotations of this class.
+     */
+    private AnnotationWriter ianns;
+
+    /**
+     * The non standard attributes of this class.
+     */
+    private Attribute attrs;
+
+    /**
+     * The number of entries in the InnerClasses attribute.
+     */
+    private int innerClassesCount;
+
+    /**
+     * The InnerClasses attribute.
+     */
+    private ByteVector innerClasses;
+
+    /**
+     * The number of entries in the BootstrapMethods attribute.
+     */
+    int bootstrapMethodsCount;
+
+    /**
+     * The BootstrapMethods attribute.
+     */
+    ByteVector bootstrapMethods;
+
+    /**
+     * The fields of this class. These fields are stored in a linked list of
+     * {@link FieldWriter} objects, linked to each other by their
+     * {@link FieldWriter#fv} field. This field stores the first element of this
+     * list.
+     */
+    FieldWriter firstField;
+
+    /**
+     * The fields of this class. These fields are stored in a linked list of
+     * {@link FieldWriter} objects, linked to each other by their
+     * {@link FieldWriter#fv} field. This field stores the last element of this
+     * list.
+     */
+    FieldWriter lastField;
+
+    /**
+     * The methods of this class. These methods are stored in a linked list of
+     * {@link MethodWriter} objects, linked to each other by their
+     * {@link MethodWriter#mv} field. This field stores the first element of
+     * this list.
+     */
+    MethodWriter firstMethod;
+
+    /**
+     * The methods of this class. These methods are stored in a linked list of
+     * {@link MethodWriter} objects, linked to each other by their
+     * {@link MethodWriter#mv} field. This field stores the last element of this
+     * list.
+     */
+    MethodWriter lastMethod;
+
+    /**
+     * <tt>true</tt> if the maximum stack size and number of local variables
+     * must be automatically computed.
+     */
+    private boolean computeMaxs;
+
+    /**
+     * <tt>true</tt> if the stack map frames must be recomputed from scratch.
+     */
+    private boolean computeFrames;
+
+    /**
+     * <tt>true</tt> if the stack map tables of this class are invalid. The
+     * {@link MethodWriter#resizeInstructions} method cannot transform existing
+     * stack map tables, and so produces potentially invalid classes when it is
+     * executed. In this case the class is reread and rewritten with the
+     * {@link #COMPUTE_FRAMES} option (the resizeInstructions method can resize
+     * stack map tables when this option is used).
+     */
+    boolean invalidFrames;
+
+    // ------------------------------------------------------------------------
+    // Static initializer
+    // ------------------------------------------------------------------------
+
+    /**
+     * Computes the instruction types of JVM opcodes.
+     */
+    static {
+        int i;
+        byte[] b = new byte[220];
+        String s = "AAAAAAAAAAAAAAAABCLMMDDDDDEEEEEEEEEEEEEEEEEEEEAAAAAAAADD"
+                + "DDDEEEEEEEEEEEEEEEEEEEEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+                + "AAAAAAAAAAAAAAAAANAAAAAAAAAAAAAAAAAAAAJJJJJJJJJJJJJJJJDOPAA"
+                + "AAAAGGGGGGGHIFBFAAFFAARQJJKKJJJJJJJJJJJJJJJJJJ";
+        for (i = 0; i < b.length; ++i) {
+            b[i] = (byte) (s.charAt(i) - 'A');
+        }
+        TYPE = b;
+
+        // code to generate the above string
+        //
+        // // SBYTE_INSN instructions
+        // b[Constants.NEWARRAY] = SBYTE_INSN;
+        // b[Constants.BIPUSH] = SBYTE_INSN;
+        //
+        // // SHORT_INSN instructions
+        // b[Constants.SIPUSH] = SHORT_INSN;
+        //
+        // // (IMPL)VAR_INSN instructions
+        // b[Constants.RET] = VAR_INSN;
+        // for (i = Constants.ILOAD; i <= Constants.ALOAD; ++i) {
+        // b[i] = VAR_INSN;
+        // }
+        // for (i = Constants.ISTORE; i <= Constants.ASTORE; ++i) {
+        // b[i] = VAR_INSN;
+        // }
+        // for (i = 26; i <= 45; ++i) { // ILOAD_0 to ALOAD_3
+        // b[i] = IMPLVAR_INSN;
+        // }
+        // for (i = 59; i <= 78; ++i) { // ISTORE_0 to ASTORE_3
+        // b[i] = IMPLVAR_INSN;
+        // }
+        //
+        // // TYPE_INSN instructions
+        // b[Constants.NEW] = TYPE_INSN;
+        // b[Constants.ANEWARRAY] = TYPE_INSN;
+        // b[Constants.CHECKCAST] = TYPE_INSN;
+        // b[Constants.INSTANCEOF] = TYPE_INSN;
+        //
+        // // (Set)FIELDORMETH_INSN instructions
+        // for (i = Constants.GETSTATIC; i <= Constants.INVOKESTATIC; ++i) {
+        // b[i] = FIELDORMETH_INSN;
+        // }
+        // b[Constants.INVOKEINTERFACE] = ITFMETH_INSN;
+        // b[Constants.INVOKEDYNAMIC] = INDYMETH_INSN;
+        //
+        // // LABEL(W)_INSN instructions
+        // for (i = Constants.IFEQ; i <= Constants.JSR; ++i) {
+        // b[i] = LABEL_INSN;
+        // }
+        // b[Constants.IFNULL] = LABEL_INSN;
+        // b[Constants.IFNONNULL] = LABEL_INSN;
+        // b[200] = LABELW_INSN; // GOTO_W
+        // b[201] = LABELW_INSN; // JSR_W
+        // // temporary opcodes used internally by ASM - see Label and
+        // MethodWriter
+        // for (i = 202; i < 220; ++i) {
+        // b[i] = LABEL_INSN;
+        // }
+        //
+        // // LDC(_W) instructions
+        // b[Constants.LDC] = LDC_INSN;
+        // b[19] = LDCW_INSN; // LDC_W
+        // b[20] = LDCW_INSN; // LDC2_W
+        //
+        // // special instructions
+        // b[Constants.IINC] = IINC_INSN;
+        // b[Constants.TABLESWITCH] = TABL_INSN;
+        // b[Constants.LOOKUPSWITCH] = LOOK_INSN;
+        // b[Constants.MULTIANEWARRAY] = MANA_INSN;
+        // b[196] = WIDE_INSN; // WIDE
+        //
+        // for (i = 0; i < b.length; ++i) {
+        // System.err.print((char)('A' + b[i]));
+        // }
+        // System.err.println();
+    }
+
+    // ------------------------------------------------------------------------
+    // Constructor
+    // ------------------------------------------------------------------------
+
+    /**
+     * Constructs a new {@link ClassWriter} object.
+     * 
+     * @param flags
+     *            option flags that can be used to modify the default behavior
+     *            of this class. See {@link #COMPUTE_MAXS},
+     *            {@link #COMPUTE_FRAMES}.
+     */
+    public ClassWriter(final int flags) {
+        super(Opcodes.ASM4);
+        index = 1;
+        pool = new ByteVector();
+        items = new Item[256];
+        threshold = (int) (0.75d * items.length);
+        key = new Item();
+        key2 = new Item();
+        key3 = new Item();
+        key4 = new Item();
+        this.computeMaxs = (flags & COMPUTE_MAXS) != 0;
+        this.computeFrames = (flags & COMPUTE_FRAMES) != 0;
+    }
+
+    /**
+     * Constructs a new {@link ClassWriter} object and enables optimizations for
+     * "mostly add" bytecode transformations. These optimizations are the
+     * following:
+     * 
+     * <ul>
+     * <li>The constant pool from the original class is copied as is in the new
+     * class, which saves time. New constant pool entries will be added at the
+     * end if necessary, but unused constant pool entries <i>won't be
+     * removed</i>.</li>
+     * <li>Methods that are not transformed are copied as is in the new class,
+     * directly from the original class bytecode (i.e. without emitting visit
+     * events for all the method instructions), which saves a <i>lot</i> of
+     * time. Untransformed methods are detected by the fact that the
+     * {@link ClassReader} receives {@link MethodVisitor} objects that come from
+     * a {@link ClassWriter} (and not from any other {@link ClassVisitor}
+     * instance).</li>
+     * </ul>
+     * 
+     * @param classReader
+     *            the {@link ClassReader} used to read the original class. It
+     *            will be used to copy the entire constant pool from the
+     *            original class and also to copy other fragments of original
+     *            bytecode where applicable.
+     * @param flags
+     *            option flags that can be used to modify the default behavior
+     *            of this class. <i>These option flags do not affect methods
+     *            that are copied as is in the new class. This means that the
+     *            maximum stack size nor the stack frames will be computed for
+     *            these methods</i>. See {@link #COMPUTE_MAXS},
+     *            {@link #COMPUTE_FRAMES}.
+     */
+    public ClassWriter(final ClassReader classReader, final int flags) {
+        this(flags);
+        classReader.copyPool(this);
+        this.cr = classReader;
+    }
+
+    // ------------------------------------------------------------------------
+    // Implementation of the ClassVisitor abstract class
+    // ------------------------------------------------------------------------
+
+    @Override
+    public final void visit(final int version, final int access,
+            final String name, final String signature, final String superName,
+            final String[] interfaces) {
+        this.version = version;
+        this.access = access;
+        this.name = newClass(name);
+        thisName = name;
+        if (ClassReader.SIGNATURES && signature != null) {
+            this.signature = newUTF8(signature);
+        }
+        this.superName = superName == null ? 0 : newClass(superName);
+        if (interfaces != null && interfaces.length > 0) {
+            interfaceCount = interfaces.length;
+            this.interfaces = new int[interfaceCount];
+            for (int i = 0; i < interfaceCount; ++i) {
+                this.interfaces[i] = newClass(interfaces[i]);
+            }
+        }
+    }
+
+    @Override
+    public final void visitSource(final String file, final String debug) {
+        if (file != null) {
+            sourceFile = newUTF8(file);
+        }
+        if (debug != null) {
+            sourceDebug = new ByteVector().putUTF8(debug);
+        }
+    }
+
+    @Override
+    public final void visitOuterClass(final String owner, final String name,
+            final String desc) {
+        enclosingMethodOwner = newClass(owner);
+        if (name != null && desc != null) {
+            enclosingMethod = newNameType(name, desc);
+        }
+    }
+
+    @Override
+    public final AnnotationVisitor visitAnnotation(final String desc,
+            final boolean visible) {
+        if (!ClassReader.ANNOTATIONS) {
+            return null;
+        }
+        ByteVector bv = new ByteVector();
+        // write type, and reserve space for values count
+        bv.putShort(newUTF8(desc)).putShort(0);
+        AnnotationWriter aw = new AnnotationWriter(this, true, bv, bv, 2);
+        if (visible) {
+            aw.next = anns;
+            anns = aw;
+        } else {
+            aw.next = ianns;
+            ianns = aw;
+        }
+        return aw;
+    }
+
+    @Override
+    public final void visitAttribute(final Attribute attr) {
+        attr.next = attrs;
+        attrs = attr;
+    }
+
+    @Override
+    public final void visitInnerClass(final String name,
+            final String outerName, final String innerName, final int access) {
+        if (innerClasses == null) {
+            innerClasses = new ByteVector();
+        }
+        ++innerClassesCount;
+        innerClasses.putShort(name == null ? 0 : newClass(name));
+        innerClasses.putShort(outerName == null ? 0 : newClass(outerName));
+        innerClasses.putShort(innerName == null ? 0 : newUTF8(innerName));
+        innerClasses.putShort(access);
+    }
+
+    @Override
+    public final FieldVisitor visitField(final int access, final String name,
+            final String desc, final String signature, final Object value) {
+        return new FieldWriter(this, access, name, desc, signature, value);
+    }
+
+    @Override
+    public final MethodVisitor visitMethod(final int access, final String name,
+            final String desc, final String signature, final String[] exceptions) {
+        return new MethodWriter(this, access, name, desc, signature,
+                exceptions, computeMaxs, computeFrames);
+    }
+
+    @Override
+    public final void visitEnd() {
+    }
+
+    // ------------------------------------------------------------------------
+    // Other public methods
+    // ------------------------------------------------------------------------
+
+    /**
+     * Returns the bytecode of the class that was build with this class writer.
+     * 
+     * @return the bytecode of the class that was build with this class writer.
+     */
+    public byte[] toByteArray() {
+        if (index > 0xFFFF) {
+            throw new RuntimeException("Class file too large!");
+        }
+        // computes the real size of the bytecode of this class
+        int size = 24 + 2 * interfaceCount;
+        int nbFields = 0;
+        FieldWriter fb = firstField;
+        while (fb != null) {
+            ++nbFields;
+            size += fb.getSize();
+            fb = (FieldWriter) fb.fv;
+        }
+        int nbMethods = 0;
+        MethodWriter mb = firstMethod;
+        while (mb != null) {
+            ++nbMethods;
+            size += mb.getSize();
+            mb = (MethodWriter) mb.mv;
+        }
+        int attributeCount = 0;
+        if (bootstrapMethods != null) {
+            // we put it as first attribute in order to improve a bit
+            // ClassReader.copyBootstrapMethods
+            ++attributeCount;
+            size += 8 + bootstrapMethods.length;
+            newUTF8("BootstrapMethods");
+        }
+        if (ClassReader.SIGNATURES && signature != 0) {
+            ++attributeCount;
+            size += 8;
+            newUTF8("Signature");
+        }
+        if (sourceFile != 0) {
+            ++attributeCount;
+            size += 8;
+            newUTF8("SourceFile");
+        }
+        if (sourceDebug != null) {
+            ++attributeCount;
+            size += sourceDebug.length + 4;
+            newUTF8("SourceDebugExtension");
+        }
+        if (enclosingMethodOwner != 0) {
+            ++attributeCount;
+            size += 10;
+            newUTF8("EnclosingMethod");
+        }
+        if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+            ++attributeCount;
+            size += 6;
+            newUTF8("Deprecated");
+        }
+        if ((access & Opcodes.ACC_SYNTHETIC) != 0) {
+            if ((version & 0xFFFF) < Opcodes.V1_5
+                    || (access & ACC_SYNTHETIC_ATTRIBUTE) != 0) {
+                ++attributeCount;
+                size += 6;
+                newUTF8("Synthetic");
+            }
+        }
+        if (innerClasses != null) {
+            ++attributeCount;
+            size += 8 + innerClasses.length;
+            newUTF8("InnerClasses");
+        }
+        if (ClassReader.ANNOTATIONS && anns != null) {
+            ++attributeCount;
+            size += 8 + anns.getSize();
+            newUTF8("RuntimeVisibleAnnotations");
+        }
+        if (ClassReader.ANNOTATIONS && ianns != null) {
+            ++attributeCount;
+            size += 8 + ianns.getSize();
+            newUTF8("RuntimeInvisibleAnnotations");
+        }
+        if (attrs != null) {
+            attributeCount += attrs.getCount();
+            size += attrs.getSize(this, null, 0, -1, -1);
+        }
+        size += pool.length;
+        // allocates a byte vector of this size, in order to avoid unnecessary
+        // arraycopy operations in the ByteVector.enlarge() method
+        ByteVector out = new ByteVector(size);
+        out.putInt(0xCAFEBABE).putInt(version);
+        out.putShort(index).putByteArray(pool.data, 0, pool.length);
+        int mask = Opcodes.ACC_DEPRECATED | ACC_SYNTHETIC_ATTRIBUTE
+                | ((access & ACC_SYNTHETIC_ATTRIBUTE) / TO_ACC_SYNTHETIC);
+        out.putShort(access & ~mask).putShort(name).putShort(superName);
+        out.putShort(interfaceCount);
+        for (int i = 0; i < interfaceCount; ++i) {
+            out.putShort(interfaces[i]);
+        }
+        out.putShort(nbFields);
+        fb = firstField;
+        while (fb != null) {
+            fb.put(out);
+            fb = (FieldWriter) fb.fv;
+        }
+        out.putShort(nbMethods);
+        mb = firstMethod;
+        while (mb != null) {
+            mb.put(out);
+            mb = (MethodWriter) mb.mv;
+        }
+        out.putShort(attributeCount);
+        if (bootstrapMethods != null) {
+            out.putShort(newUTF8("BootstrapMethods"));
+            out.putInt(bootstrapMethods.length + 2).putShort(
+                    bootstrapMethodsCount);
+            out.putByteArray(bootstrapMethods.data, 0, bootstrapMethods.length);
+        }
+        if (ClassReader.SIGNATURES && signature != 0) {
+            out.putShort(newUTF8("Signature")).putInt(2).putShort(signature);
+        }
+        if (sourceFile != 0) {
+            out.putShort(newUTF8("SourceFile")).putInt(2).putShort(sourceFile);
+        }
+        if (sourceDebug != null) {
+            int len = sourceDebug.length - 2;
+            out.putShort(newUTF8("SourceDebugExtension")).putInt(len);
+            out.putByteArray(sourceDebug.data, 2, len);
+        }
+        if (enclosingMethodOwner != 0) {
+            out.putShort(newUTF8("EnclosingMethod")).putInt(4);
+            out.putShort(enclosingMethodOwner).putShort(enclosingMethod);
+        }
+        if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+            out.putShort(newUTF8("Deprecated")).putInt(0);
+        }
+        if ((access & Opcodes.ACC_SYNTHETIC) != 0) {
+            if ((version & 0xFFFF) < Opcodes.V1_5
+                    || (access & ACC_SYNTHETIC_ATTRIBUTE) != 0) {
+                out.putShort(newUTF8("Synthetic")).putInt(0);
+            }
+        }
+        if (innerClasses != null) {
+            out.putShort(newUTF8("InnerClasses"));
+            out.putInt(innerClasses.length + 2).putShort(innerClassesCount);
+            out.putByteArray(innerClasses.data, 0, innerClasses.length);
+        }
+        if (ClassReader.ANNOTATIONS && anns != null) {
+            out.putShort(newUTF8("RuntimeVisibleAnnotations"));
+            anns.put(out);
+        }
+        if (ClassReader.ANNOTATIONS && ianns != null) {
+            out.putShort(newUTF8("RuntimeInvisibleAnnotations"));
+            ianns.put(out);
+        }
+        if (attrs != null) {
+            attrs.put(this, null, 0, -1, -1, out);
+        }
+        if (invalidFrames) {
+            anns = null;
+            ianns = null;
+            attrs = null;
+            innerClassesCount = 0;
+            innerClasses = null;
+            bootstrapMethodsCount = 0;
+            bootstrapMethods = null;
+            firstField = null;
+            lastField = null;
+            firstMethod = null;
+            lastMethod = null;
+            computeMaxs = false;
+            computeFrames = true;
+            invalidFrames = false;
+            new ClassReader(out.data).accept(this, ClassReader.SKIP_FRAMES);
+            return toByteArray();
+        }
+        return out.data;
+    }
+
+    // ------------------------------------------------------------------------
+    // Utility methods: constant pool management
+    // ------------------------------------------------------------------------
+
+    /**
+     * Adds a number or string constant to the constant pool of the class being
+     * build. Does nothing if the constant pool already contains a similar item.
+     * 
+     * @param cst
+     *            the value of the constant to be added to the constant pool.
+     *            This parameter must be an {@link Integer}, a {@link Float}, a
+     *            {@link Long}, a {@link Double}, a {@link String} or a
+     *            {@link Type}.
+     * @return a new or already existing constant item with the given value.
+     */
+    Item newConstItem(final Object cst) {
+        if (cst instanceof Integer) {
+            int val = ((Integer) cst).intValue();
+            return newInteger(val);
+        } else if (cst instanceof Byte) {
+            int val = ((Byte) cst).intValue();
+            return newInteger(val);
+        } else if (cst instanceof Character) {
+            int val = ((Character) cst).charValue();
+            return newInteger(val);
+        } else if (cst instanceof Short) {
+            int val = ((Short) cst).intValue();
+            return newInteger(val);
+        } else if (cst instanceof Boolean) {
+            int val = ((Boolean) cst).booleanValue() ? 1 : 0;
+            return newInteger(val);
+        } else if (cst instanceof Float) {
+            float val = ((Float) cst).floatValue();
+            return newFloat(val);
+        } else if (cst instanceof Long) {
+            long val = ((Long) cst).longValue();
+            return newLong(val);
+        } else if (cst instanceof Double) {
+            double val = ((Double) cst).doubleValue();
+            return newDouble(val);
+        } else if (cst instanceof String) {
+            return newString((String) cst);
+        } else if (cst instanceof Type) {
+            Type t = (Type) cst;
+            int s = t.getSort();
+            if (s == Type.OBJECT) {
+                return newClassItem(t.getInternalName());
+            } else if (s == Type.METHOD) {
+                return newMethodTypeItem(t.getDescriptor());
+            } else { // s == primitive type or array
+                return newClassItem(t.getDescriptor());
+            }
+        } else if (cst instanceof Handle) {
+            Handle h = (Handle) cst;
+            return newHandleItem(h.tag, h.owner, h.name, h.desc);
+        } else {
+            throw new IllegalArgumentException("value " + cst);
+        }
+    }
+
+    /**
+     * Adds a number or string constant to the constant pool of the class being
+     * build. Does nothing if the constant pool already contains a similar item.
+     * <i>This method is intended for {@link Attribute} sub classes, and is
+     * normally not needed by class generators or adapters.</i>
+     * 
+     * @param cst
+     *            the value of the constant to be added to the constant pool.
+     *            This parameter must be an {@link Integer}, a {@link Float}, a
+     *            {@link Long}, a {@link Double} or a {@link String}.
+     * @return the index of a new or already existing constant item with the
+     *         given value.
+     */
+    public int newConst(final Object cst) {
+        return newConstItem(cst).index;
+    }
+
+    /**
+     * Adds an UTF8 string to the constant pool of the class being build. Does
+     * nothing if the constant pool already contains a similar item. <i>This
+     * method is intended for {@link Attribute} sub classes, and is normally not
+     * needed by class generators or adapters.</i>
+     * 
+     * @param value
+     *            the String value.
+     * @return the index of a new or already existing UTF8 item.
+     */
+    public int newUTF8(final String value) {
+        key.set(UTF8, value, null, null);
+        Item result = get(key);
+        if (result == null) {
+            pool.putByte(UTF8).putUTF8(value);
+            result = new Item(index++, key);
+            put(result);
+        }
+        return result.index;
+    }
+
+    /**
+     * Adds a class reference to the constant pool of the class being build.
+     * Does nothing if the constant pool already contains a similar item.
+     * <i>This method is intended for {@link Attribute} sub classes, and is
+     * normally not needed by class generators or adapters.</i>
+     * 
+     * @param value
+     *            the internal name of the class.
+     * @return a new or already existing class reference item.
+     */
+    Item newClassItem(final String value) {
+        key2.set(CLASS, value, null, null);
+        Item result = get(key2);
+        if (result == null) {
+            pool.put12(CLASS, newUTF8(value));
+            result = new Item(index++, key2);
+            put(result);
+        }
+        return result;
+    }
+
+    /**
+     * Adds a class reference to the constant pool of the class being build.
+     * Does nothing if the constant pool already contains a similar item.
+     * <i>This method is intended for {@link Attribute} sub classes, and is
+     * normally not needed by class generators or adapters.</i>
+     * 
+     * @param value
+     *            the internal name of the class.
+     * @return the index of a new or already existing class reference item.
+     */
+    public int newClass(final String value) {
+        return newClassItem(value).index;
+    }
+
+    /**
+     * Adds a method type reference to the constant pool of the class being
+     * build. Does nothing if the constant pool already contains a similar item.
+     * <i>This method is intended for {@link Attribute} sub classes, and is
+     * normally not needed by class generators or adapters.</i>
+     * 
+     * @param methodDesc
+     *            method descriptor of the method type.
+     * @return a new or already existing method type reference item.
+     */
+    Item newMethodTypeItem(final String methodDesc) {
+        key2.set(MTYPE, methodDesc, null, null);
+        Item result = get(key2);
+        if (result == null) {
+            pool.put12(MTYPE, newUTF8(methodDesc));
+            result = new Item(index++, key2);
+            put(result);
+        }
+        return result;
+    }
+
+    /**
+     * Adds a method type reference to the constant pool of the class being
+     * build. Does nothing if the constant pool already contains a similar item.
+     * <i>This method is intended for {@link Attribute} sub classes, and is
+     * normally not needed by class generators or adapters.</i>
+     * 
+     * @param methodDesc
+     *            method descriptor of the method type.
+     * @return the index of a new or already existing method type reference
+     *         item.
+     */
+    public int newMethodType(final String methodDesc) {
+        return newMethodTypeItem(methodDesc).index;
+    }
+
+    /**
+     * Adds a handle to the constant pool of the class being build. Does nothing
+     * if the constant pool already contains a similar item. <i>This method is
+     * intended for {@link Attribute} sub classes, and is normally not needed by
+     * class generators or adapters.</i>
+     * 
+     * @param tag
+     *            the kind of this handle. Must be {@link Opcodes#H_GETFIELD},
+     *            {@link Opcodes#H_GETSTATIC}, {@link Opcodes#H_PUTFIELD},
+     *            {@link Opcodes#H_PUTSTATIC}, {@link Opcodes#H_INVOKEVIRTUAL},
+     *            {@link Opcodes#H_INVOKESTATIC},
+     *            {@link Opcodes#H_INVOKESPECIAL},
+     *            {@link Opcodes#H_NEWINVOKESPECIAL} or
+     *            {@link Opcodes#H_INVOKEINTERFACE}.
+     * @param owner
+     *            the internal name of the field or method owner class.
+     * @param name
+     *            the name of the field or method.
+     * @param desc
+     *            the descriptor of the field or method.
+     * @return a new or an already existing method type reference item.
+     */
+    Item newHandleItem(final int tag, final String owner, final String name,
+            final String desc) {
+        key4.set(HANDLE_BASE + tag, owner, name, desc);
+        Item result = get(key4);
+        if (result == null) {
+            if (tag <= Opcodes.H_PUTSTATIC) {
+                put112(HANDLE, tag, newField(owner, name, desc));
+            } else {
+                put112(HANDLE,
+                        tag,
+                        newMethod(owner, name, desc,
+                                tag == Opcodes.H_INVOKEINTERFACE));
+            }
+            result = new Item(index++, key4);
+            put(result);
+        }
+        return result;
+    }
+
+    /**
+     * Adds a handle to the constant pool of the class being build. Does nothing
+     * if the constant pool already contains a similar item. <i>This method is
+     * intended for {@link Attribute} sub classes, and is normally not needed by
+     * class generators or adapters.</i>
+     * 
+     * @param tag
+     *            the kind of this handle. Must be {@link Opcodes#H_GETFIELD},
+     *            {@link Opcodes#H_GETSTATIC}, {@link Opcodes#H_PUTFIELD},
+     *            {@link Opcodes#H_PUTSTATIC}, {@link Opcodes#H_INVOKEVIRTUAL},
+     *            {@link Opcodes#H_INVOKESTATIC},
+     *            {@link Opcodes#H_INVOKESPECIAL},
+     *            {@link Opcodes#H_NEWINVOKESPECIAL} or
+     *            {@link Opcodes#H_INVOKEINTERFACE}.
+     * @param owner
+     *            the internal name of the field or method owner class.
+     * @param name
+     *            the name of the field or method.
+     * @param desc
+     *            the descriptor of the field or method.
+     * @return the index of a new or already existing method type reference
+     *         item.
+     */
+    public int newHandle(final int tag, final String owner, final String name,
+            final String desc) {
+        return newHandleItem(tag, owner, name, desc).index;
+    }
+
+    /**
+     * Adds an invokedynamic reference to the constant pool of the class being
+     * build. Does nothing if the constant pool already contains a similar item.
+     * <i>This method is intended for {@link Attribute} sub classes, and is
+     * normally not needed by class generators or adapters.</i>
+     * 
+     * @param name
+     *            name of the invoked method.
+     * @param desc
+     *            descriptor of the invoke method.
+     * @param bsm
+     *            the bootstrap method.
+     * @param bsmArgs
+     *            the bootstrap method constant arguments.
+     * 
+     * @return a new or an already existing invokedynamic type reference item.
+     */
+    Item newInvokeDynamicItem(final String name, final String desc,
+            final Handle bsm, final Object... bsmArgs) {
+        // cache for performance
+        ByteVector bootstrapMethods = this.bootstrapMethods;
+        if (bootstrapMethods == null) {
+            bootstrapMethods = this.bootstrapMethods = new ByteVector();
+        }
+
+        int position = bootstrapMethods.length; // record current position
+
+        int hashCode = bsm.hashCode();
+        bootstrapMethods.putShort(newHandle(bsm.tag, bsm.owner, bsm.name,
+                bsm.desc));
+
+        int argsLength = bsmArgs.length;
+        bootstrapMethods.putShort(argsLength);
+
+        for (int i = 0; i < argsLength; i++) {
+            Object bsmArg = bsmArgs[i];
+            hashCode ^= bsmArg.hashCode();
+            bootstrapMethods.putShort(newConst(bsmArg));
+        }
+
+        byte[] data = bootstrapMethods.data;
+        int length = (1 + 1 + argsLength) << 1; // (bsm + argCount + arguments)
+        hashCode &= 0x7FFFFFFF;
+        Item result = items[hashCode % items.length];
+        loop: while (result != null) {
+            if (result.type != BSM || result.hashCode != hashCode) {
+                result = result.next;
+                continue;
+            }
+
+            // because the data encode the size of the argument
+            // we don't need to test if these size are equals
+            int resultPosition = result.intVal;
+            for (int p = 0; p < length; p++) {
+                if (data[position + p] != data[resultPosition + p]) {
+                    result = result.next;
+                    continue loop;
+                }
+            }
+            break;
+        }
+
+        int bootstrapMethodIndex;
+        if (result != null) {
+            bootstrapMethodIndex = result.index;
+            bootstrapMethods.length = position; // revert to old position
+        } else {
+            bootstrapMethodIndex = bootstrapMethodsCount++;
+            result = new Item(bootstrapMethodIndex);
+            result.set(position, hashCode);
+            put(result);
+        }
+
+        // now, create the InvokeDynamic constant
+        key3.set(name, desc, bootstrapMethodIndex);
+        result = get(key3);
+        if (result == null) {
+            put122(INDY, bootstrapMethodIndex, newNameType(name, desc));
+            result = new Item(index++, key3);
+            put(result);
+        }
+        return result;
+    }
+
+    /**
+     * Adds an invokedynamic reference to the constant pool of the class being
+     * build. Does nothing if the constant pool already contains a similar item.
+     * <i>This method is intended for {@link Attribute} sub classes, and is
+     * normally not needed by class generators or adapters.</i>
+     * 
+     * @param name
+     *            name of the invoked method.
+     * @param desc
+     *            descriptor of the invoke method.
+     * @param bsm
+     *            the bootstrap method.
+     * @param bsmArgs
+     *            the bootstrap method constant arguments.
+     * 
+     * @return the index of a new or already existing invokedynamic reference
+     *         item.
+     */
+    public int newInvokeDynamic(final String name, final String desc,
+            final Handle bsm, final Object... bsmArgs) {
+        return newInvokeDynamicItem(name, desc, bsm, bsmArgs).index;
+    }
+
+    /**
+     * Adds a field reference to the constant pool of the class being build.
+     * Does nothing if the constant pool already contains a similar item.
+     * 
+     * @param owner
+     *            the internal name of the field's owner class.
+     * @param name
+     *            the field's name.
+     * @param desc
+     *            the field's descriptor.
+     * @return a new or already existing field reference item.
+     */
+    Item newFieldItem(final String owner, final String name, final String desc) {
+        key3.set(FIELD, owner, name, desc);
+        Item result = get(key3);
+        if (result == null) {
+            put122(FIELD, newClass(owner), newNameType(name, desc));
+            result = new Item(index++, key3);
+            put(result);
+        }
+        return result;
+    }
+
+    /**
+     * Adds a field reference to the constant pool of the class being build.
+     * Does nothing if the constant pool already contains a similar item.
+     * <i>This method is intended for {@link Attribute} sub classes, and is
+     * normally not needed by class generators or adapters.</i>
+     * 
+     * @param owner
+     *            the internal name of the field's owner class.
+     * @param name
+     *            the field's name.
+     * @param desc
+     *            the field's descriptor.
+     * @return the index of a new or already existing field reference item.
+     */
+    public int newField(final String owner, final String name, final String desc) {
+        return newFieldItem(owner, name, desc).index;
+    }
+
+    /**
+     * Adds a method reference to the constant pool of the class being build.
+     * Does nothing if the constant pool already contains a similar item.
+     * 
+     * @param owner
+     *            the internal name of the method's owner class.
+     * @param name
+     *            the method's name.
+     * @param desc
+     *            the method's descriptor.
+     * @param itf
+     *            <tt>true</tt> if <tt>owner</tt> is an interface.
+     * @return a new or already existing method reference item.
+     */
+    Item newMethodItem(final String owner, final String name,
+            final String desc, final boolean itf) {
+        int type = itf ? IMETH : METH;
+        key3.set(type, owner, name, desc);
+        Item result = get(key3);
+        if (result == null) {
+            put122(type, newClass(owner), newNameType(name, desc));
+            result = new Item(index++, key3);
+            put(result);
+        }
+        return result;
+    }
+
+    /**
+     * Adds a method reference to the constant pool of the class being build.
+     * Does nothing if the constant pool already contains a similar item.
+     * <i>This method is intended for {@link Attribute} sub classes, and is
+     * normally not needed by class generators or adapters.</i>
+     * 
+     * @param owner
+     *            the internal name of the method's owner class.
+     * @param name
+     *            the method's name.
+     * @param desc
+     *            the method's descriptor.
+     * @param itf
+     *            <tt>true</tt> if <tt>owner</tt> is an interface.
+     * @return the index of a new or already existing method reference item.
+     */
+    public int newMethod(final String owner, final String name,
+            final String desc, final boolean itf) {
+        return newMethodItem(owner, name, desc, itf).index;
+    }
+
+    /**
+     * Adds an integer to the constant pool of the class being build. Does
+     * nothing if the constant pool already contains a similar item.
+     * 
+     * @param value
+     *            the int value.
+     * @return a new or already existing int item.
+     */
+    Item newInteger(final int value) {
+        key.set(value);
+        Item result = get(key);
+        if (result == null) {
+            pool.putByte(INT).putInt(value);
+            result = new Item(index++, key);
+            put(result);
+        }
+        return result;
+    }
+
+    /**
+     * Adds a float to the constant pool of the class being build. Does nothing
+     * if the constant pool already contains a similar item.
+     * 
+     * @param value
+     *            the float value.
+     * @return a new or already existing float item.
+     */
+    Item newFloat(final float value) {
+        key.set(value);
+        Item result = get(key);
+        if (result == null) {
+            pool.putByte(FLOAT).putInt(key.intVal);
+            result = new Item(index++, key);
+            put(result);
+        }
+        return result;
+    }
+
+    /**
+     * Adds a long to the constant pool of the class being build. Does nothing
+     * if the constant pool already contains a similar item.
+     * 
+     * @param value
+     *            the long value.
+     * @return a new or already existing long item.
+     */
+    Item newLong(final long value) {
+        key.set(value);
+        Item result = get(key);
+        if (result == null) {
+            pool.putByte(LONG).putLong(value);
+            result = new Item(index, key);
+            index += 2;
+            put(result);
+        }
+        return result;
+    }
+
+    /**
+     * Adds a double to the constant pool of the class being build. Does nothing
+     * if the constant pool already contains a similar item.
+     * 
+     * @param value
+     *            the double value.
+     * @return a new or already existing double item.
+     */
+    Item newDouble(final double value) {
+        key.set(value);
+        Item result = get(key);
+        if (result == null) {
+            pool.putByte(DOUBLE).putLong(key.longVal);
+            result = new Item(index, key);
+            index += 2;
+            put(result);
+        }
+        return result;
+    }
+
+    /**
+     * Adds a string to the constant pool of the class being build. Does nothing
+     * if the constant pool already contains a similar item.
+     * 
+     * @param value
+     *            the String value.
+     * @return a new or already existing string item.
+     */
+    private Item newString(final String value) {
+        key2.set(STR, value, null, null);
+        Item result = get(key2);
+        if (result == null) {
+            pool.put12(STR, newUTF8(value));
+            result = new Item(index++, key2);
+            put(result);
+        }
+        return result;
+    }
+
+    /**
+     * Adds a name and type to the constant pool of the class being build. Does
+     * nothing if the constant pool already contains a similar item. <i>This
+     * method is intended for {@link Attribute} sub classes, and is normally not
+     * needed by class generators or adapters.</i>
+     * 
+     * @param name
+     *            a name.
+     * @param desc
+     *            a type descriptor.
+     * @return the index of a new or already existing name and type item.
+     */
+    public int newNameType(final String name, final String desc) {
+        return newNameTypeItem(name, desc).index;
+    }
+
+    /**
+     * Adds a name and type to the constant pool of the class being build. Does
+     * nothing if the constant pool already contains a similar item.
+     * 
+     * @param name
+     *            a name.
+     * @param desc
+     *            a type descriptor.
+     * @return a new or already existing name and type item.
+     */
+    Item newNameTypeItem(final String name, final String desc) {
+        key2.set(NAME_TYPE, name, desc, null);
+        Item result = get(key2);
+        if (result == null) {
+            put122(NAME_TYPE, newUTF8(name), newUTF8(desc));
+            result = new Item(index++, key2);
+            put(result);
+        }
+        return result;
+    }
+
+    /**
+     * Adds the given internal name to {@link #typeTable} and returns its index.
+     * Does nothing if the type table already contains this internal name.
+     * 
+     * @param type
+     *            the internal name to be added to the type table.
+     * @return the index of this internal name in the type table.
+     */
+    int addType(final String type) {
+        key.set(TYPE_NORMAL, type, null, null);
+        Item result = get(key);
+        if (result == null) {
+            result = addType(key);
+        }
+        return result.index;
+    }
+
+    /**
+     * Adds the given "uninitialized" type to {@link #typeTable} and returns its
+     * index. This method is used for UNINITIALIZED types, made of an internal
+     * name and a bytecode offset.
+     * 
+     * @param type
+     *            the internal name to be added to the type table.
+     * @param offset
+     *            the bytecode offset of the NEW instruction that created this
+     *            UNINITIALIZED type value.
+     * @return the index of this internal name in the type table.
+     */
+    int addUninitializedType(final String type, final int offset) {
+        key.type = TYPE_UNINIT;
+        key.intVal = offset;
+        key.strVal1 = type;
+        key.hashCode = 0x7FFFFFFF & (TYPE_UNINIT + type.hashCode() + offset);
+        Item result = get(key);
+        if (result == null) {
+            result = addType(key);
+        }
+        return result.index;
+    }
+
+    /**
+     * Adds the given Item to {@link #typeTable}.
+     * 
+     * @param item
+     *            the value to be added to the type table.
+     * @return the added Item, which a new Item instance with the same value as
+     *         the given Item.
+     */
+    private Item addType(final Item item) {
+        ++typeCount;
+        Item result = new Item(typeCount, key);
+        put(result);
+        if (typeTable == null) {
+            typeTable = new Item[16];
+        }
+        if (typeCount == typeTable.length) {
+            Item[] newTable = new Item[2 * typeTable.length];
+            System.arraycopy(typeTable, 0, newTable, 0, typeTable.length);
+            typeTable = newTable;
+        }
+        typeTable[typeCount] = result;
+        return result;
+    }
+
+    /**
+     * Returns the index of the common super type of the two given types. This
+     * method calls {@link #getCommonSuperClass} and caches the result in the
+     * {@link #items} hash table to speedup future calls with the same
+     * parameters.
+     * 
+     * @param type1
+     *            index of an internal name in {@link #typeTable}.
+     * @param type2
+     *            index of an internal name in {@link #typeTable}.
+     * @return the index of the common super type of the two given types.
+     */
+    int getMergedType(final int type1, final int type2) {
+        key2.type = TYPE_MERGED;
+        key2.longVal = type1 | (((long) type2) << 32);
+        key2.hashCode = 0x7FFFFFFF & (TYPE_MERGED + type1 + type2);
+        Item result = get(key2);
+        if (result == null) {
+            String t = typeTable[type1].strVal1;
+            String u = typeTable[type2].strVal1;
+            key2.intVal = addType(getCommonSuperClass(t, u));
+            result = new Item((short) 0, key2);
+            put(result);
+        }
+        return result.intVal;
+    }
+
+    /**
+     * Returns the common super type of the two given types. The default
+     * implementation of this method <i>loads<i> the two given classes and uses
+     * the java.lang.Class methods to find the common super class. It can be
+     * overridden to compute this common super type in other ways, in particular
+     * without actually loading any class, or to take into account the class
+     * that is currently being generated by this ClassWriter, which can of
+     * course not be loaded since it is under construction.
+     * 
+     * @param type1
+     *            the internal name of a class.
+     * @param type2
+     *            the internal name of another class.
+     * @return the internal name of the common super class of the two given
+     *         classes.
+     */
+    protected String getCommonSuperClass(final String type1, final String type2) {
+        Class<?> c, d;
+        ClassLoader classLoader = getClass().getClassLoader();
+        try {
+            c = Class.forName(type1.replace('/', '.'), false, classLoader);
+            d = Class.forName(type2.replace('/', '.'), false, classLoader);
+        } catch (Exception e) {
+            throw new RuntimeException(e.toString());
+        }
+        if (c.isAssignableFrom(d)) {
+            return type1;
+        }
+        if (d.isAssignableFrom(c)) {
+            return type2;
+        }
+        if (c.isInterface() || d.isInterface()) {
+            return "java/lang/Object";
+        } else {
+            do {
+                c = c.getSuperclass();
+            } while (!c.isAssignableFrom(d));
+            return c.getName().replace('.', '/');
+        }
+    }
+
+    /**
+     * Returns the constant pool's hash table item which is equal to the given
+     * item.
+     * 
+     * @param key
+     *            a constant pool item.
+     * @return the constant pool's hash table item which is equal to the given
+     *         item, or <tt>null</tt> if there is no such item.
+     */
+    private Item get(final Item key) {
+        Item i = items[key.hashCode % items.length];
+        while (i != null && (i.type != key.type || !key.isEqualTo(i))) {
+            i = i.next;
+        }
+        return i;
+    }
+
+    /**
+     * Puts the given item in the constant pool's hash table. The hash table
+     * <i>must</i> not already contains this item.
+     * 
+     * @param i
+     *            the item to be added to the constant pool's hash table.
+     */
+    private void put(final Item i) {
+        if (index + typeCount > threshold) {
+            int ll = items.length;
+            int nl = ll * 2 + 1;
+            Item[] newItems = new Item[nl];
+            for (int l = ll - 1; l >= 0; --l) {
+                Item j = items[l];
+                while (j != null) {
+                    int index = j.hashCode % newItems.length;
+                    Item k = j.next;
+                    j.next = newItems[index];
+                    newItems[index] = j;
+                    j = k;
+                }
+            }
+            items = newItems;
+            threshold = (int) (nl * 0.75);
+        }
+        int index = i.hashCode % items.length;
+        i.next = items[index];
+        items[index] = i;
+    }
+
+    /**
+     * Puts one byte and two shorts into the constant pool.
+     * 
+     * @param b
+     *            a byte.
+     * @param s1
+     *            a short.
+     * @param s2
+     *            another short.
+     */
+    private void put122(final int b, final int s1, final int s2) {
+        pool.put12(b, s1).putShort(s2);
+    }
+
+    /**
+     * Puts two bytes and one short into the constant pool.
+     * 
+     * @param b1
+     *            a byte.
+     * @param b2
+     *            another byte.
+     * @param s
+     *            a short.
+     */
+    private void put112(final int b1, final int b2, final int s) {
+        pool.put11(b1, b2).putShort(s);
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/Context.java b/src/main/asm/org/objectweb/asm/Context.java
new file mode 100644
index 0000000..34691b6
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/Context.java
@@ -0,0 +1,110 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.objectweb.asm;
+
+/**
+ * Information about a class being parsed in a {@link ClassReader}.
+ * 
+ * @author Eric Bruneton
+ */
+class Context {
+
+    /**
+     * Prototypes of the attributes that must be parsed for this class.
+     */
+    Attribute[] attrs;
+
+    /**
+     * The {@link ClassReader} option flags for the parsing of this class.
+     */
+    int flags;
+
+    /**
+     * The buffer used to read strings.
+     */
+    char[] buffer;
+
+    /**
+     * The start index of each bootstrap method.
+     */
+    int[] bootstrapMethods;
+
+    /**
+     * The access flags of the method currently being parsed.
+     */
+    int access;
+
+    /**
+     * The name of the method currently being parsed.
+     */
+    String name;
+
+    /**
+     * The descriptor of the method currently being parsed.
+     */
+    String desc;
+
+    /**
+     * The offset of the latest stack map frame that has been parsed.
+     */
+    int offset;
+
+    /**
+     * The encoding of the latest stack map frame that has been parsed.
+     */
+    int mode;
+
+    /**
+     * The number of locals in the latest stack map frame that has been parsed.
+     */
+    int localCount;
+
+    /**
+     * The number locals in the latest stack map frame that has been parsed,
+     * minus the number of locals in the previous frame.
+     */
+    int localDiff;
+
+    /**
+     * The local values of the latest stack map frame that has been parsed.
+     */
+    Object[] local;
+
+    /**
+     * The stack size of the latest stack map frame that has been parsed.
+     */
+    int stackCount;
+
+    /**
+     * The stack values of the latest stack map frame that has been parsed.
+     */
+    Object[] stack;
+}
\ No newline at end of file
diff --git a/src/main/asm/org/objectweb/asm/Edge.java b/src/main/asm/org/objectweb/asm/Edge.java
new file mode 100644
index 0000000..4e87cba
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/Edge.java
@@ -0,0 +1,75 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm;
+
+/**
+ * An edge in the control flow graph of a method body. See {@link Label Label}.
+ * 
+ * @author Eric Bruneton
+ */
+class Edge {
+
+    /**
+     * Denotes a normal control flow graph edge.
+     */
+    static final int NORMAL = 0;
+
+    /**
+     * Denotes a control flow graph edge corresponding to an exception handler.
+     * More precisely any {@link Edge} whose {@link #info} is strictly positive
+     * corresponds to an exception handler. The actual value of {@link #info} is
+     * the index, in the {@link ClassWriter} type table, of the exception that
+     * is catched.
+     */
+    static final int EXCEPTION = 0x7FFFFFFF;
+
+    /**
+     * Information about this control flow graph edge. If
+     * {@link ClassWriter#COMPUTE_MAXS} is used this field is the (relative)
+     * stack size in the basic block from which this edge originates. This size
+     * is equal to the stack size at the "jump" instruction to which this edge
+     * corresponds, relatively to the stack size at the beginning of the
+     * originating basic block. If {@link ClassWriter#COMPUTE_FRAMES} is used,
+     * this field is the kind of this control flow graph edge (i.e. NORMAL or
+     * EXCEPTION).
+     */
+    int info;
+
+    /**
+     * The successor block of the basic block from which this edge originates.
+     */
+    Label successor;
+
+    /**
+     * The next edge in the list of successors of the originating basic block.
+     * See {@link Label#successors successors}.
+     */
+    Edge next;
+}
diff --git a/src/main/asm/org/objectweb/asm/FieldVisitor.java b/src/main/asm/org/objectweb/asm/FieldVisitor.java
new file mode 100644
index 0000000..ad6db26
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/FieldVisitor.java
@@ -0,0 +1,121 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm;
+
+/**
+ * A visitor to visit a Java field. The methods of this class must be called in
+ * the following order: ( <tt>visitAnnotation</tt> | <tt>visitAttribute</tt> )*
+ * <tt>visitEnd</tt>.
+ * 
+ * @author Eric Bruneton
+ */
+public abstract class FieldVisitor {
+
+    /**
+     * The ASM API version implemented by this visitor. The value of this field
+     * must be one of {@link Opcodes#ASM4}.
+     */
+    protected final int api;
+
+    /**
+     * The field visitor to which this visitor must delegate method calls. May
+     * be null.
+     */
+    protected FieldVisitor fv;
+
+    /**
+     * Constructs a new {@link FieldVisitor}.
+     * 
+     * @param api
+     *            the ASM API version implemented by this visitor. Must be one
+     *            of {@link Opcodes#ASM4}.
+     */
+    public FieldVisitor(final int api) {
+        this(api, null);
+    }
+
+    /**
+     * Constructs a new {@link FieldVisitor}.
+     * 
+     * @param api
+     *            the ASM API version implemented by this visitor. Must be one
+     *            of {@link Opcodes#ASM4}.
+     * @param fv
+     *            the field visitor to which this visitor must delegate method
+     *            calls. May be null.
+     */
+    public FieldVisitor(final int api, final FieldVisitor fv) {
+        if (api != Opcodes.ASM4) {
+            throw new IllegalArgumentException();
+        }
+        this.api = api;
+        this.fv = fv;
+    }
+
+    /**
+     * Visits an annotation of the field.
+     * 
+     * @param desc
+     *            the class descriptor of the annotation class.
+     * @param visible
+     *            <tt>true</tt> if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values, or <tt>null</tt> if
+     *         this visitor is not interested in visiting this annotation.
+     */
+    public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+        if (fv != null) {
+            return fv.visitAnnotation(desc, visible);
+        }
+        return null;
+    }
+
+    /**
+     * Visits a non standard attribute of the field.
+     * 
+     * @param attr
+     *            an attribute.
+     */
+    public void visitAttribute(Attribute attr) {
+        if (fv != null) {
+            fv.visitAttribute(attr);
+        }
+    }
+
+    /**
+     * Visits the end of the field. This method, which is the last one to be
+     * called, is used to inform the visitor that all the annotations and
+     * attributes of the field have been visited.
+     */
+    public void visitEnd() {
+        if (fv != null) {
+            fv.visitEnd();
+        }
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/FieldWriter.java b/src/main/asm/org/objectweb/asm/FieldWriter.java
new file mode 100644
index 0000000..5cbd9c7
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/FieldWriter.java
@@ -0,0 +1,273 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm;
+
+/**
+ * An {@link FieldVisitor} that generates Java fields in bytecode form.
+ * 
+ * @author Eric Bruneton
+ */
+final class FieldWriter extends FieldVisitor {
+
+    /**
+     * The class writer to which this field must be added.
+     */
+    private final ClassWriter cw;
+
+    /**
+     * Access flags of this field.
+     */
+    private final int access;
+
+    /**
+     * The index of the constant pool item that contains the name of this
+     * method.
+     */
+    private final int name;
+
+    /**
+     * The index of the constant pool item that contains the descriptor of this
+     * field.
+     */
+    private final int desc;
+
+    /**
+     * The index of the constant pool item that contains the signature of this
+     * field.
+     */
+    private int signature;
+
+    /**
+     * The index of the constant pool item that contains the constant value of
+     * this field.
+     */
+    private int value;
+
+    /**
+     * The runtime visible annotations of this field. May be <tt>null</tt>.
+     */
+    private AnnotationWriter anns;
+
+    /**
+     * The runtime invisible annotations of this field. May be <tt>null</tt>.
+     */
+    private AnnotationWriter ianns;
+
+    /**
+     * The non standard attributes of this field. May be <tt>null</tt>.
+     */
+    private Attribute attrs;
+
+    // ------------------------------------------------------------------------
+    // Constructor
+    // ------------------------------------------------------------------------
+
+    /**
+     * Constructs a new {@link FieldWriter}.
+     * 
+     * @param cw
+     *            the class writer to which this field must be added.
+     * @param access
+     *            the field's access flags (see {@link Opcodes}).
+     * @param name
+     *            the field's name.
+     * @param desc
+     *            the field's descriptor (see {@link Type}).
+     * @param signature
+     *            the field's signature. May be <tt>null</tt>.
+     * @param value
+     *            the field's constant value. May be <tt>null</tt>.
+     */
+    FieldWriter(final ClassWriter cw, final int access, final String name,
+            final String desc, final String signature, final Object value) {
+        super(Opcodes.ASM4);
+        if (cw.firstField == null) {
+            cw.firstField = this;
+        } else {
+            cw.lastField.fv = this;
+        }
+        cw.lastField = this;
+        this.cw = cw;
+        this.access = access;
+        this.name = cw.newUTF8(name);
+        this.desc = cw.newUTF8(desc);
+        if (ClassReader.SIGNATURES && signature != null) {
+            this.signature = cw.newUTF8(signature);
+        }
+        if (value != null) {
+            this.value = cw.newConstItem(value).index;
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // Implementation of the FieldVisitor abstract class
+    // ------------------------------------------------------------------------
+
+    @Override
+    public AnnotationVisitor visitAnnotation(final String desc,
+            final boolean visible) {
+        if (!ClassReader.ANNOTATIONS) {
+            return null;
+        }
+        ByteVector bv = new ByteVector();
+        // write type, and reserve space for values count
+        bv.putShort(cw.newUTF8(desc)).putShort(0);
+        AnnotationWriter aw = new AnnotationWriter(cw, true, bv, bv, 2);
+        if (visible) {
+            aw.next = anns;
+            anns = aw;
+        } else {
+            aw.next = ianns;
+            ianns = aw;
+        }
+        return aw;
+    }
+
+    @Override
+    public void visitAttribute(final Attribute attr) {
+        attr.next = attrs;
+        attrs = attr;
+    }
+
+    @Override
+    public void visitEnd() {
+    }
+
+    // ------------------------------------------------------------------------
+    // Utility methods
+    // ------------------------------------------------------------------------
+
+    /**
+     * Returns the size of this field.
+     * 
+     * @return the size of this field.
+     */
+    int getSize() {
+        int size = 8;
+        if (value != 0) {
+            cw.newUTF8("ConstantValue");
+            size += 8;
+        }
+        if ((access & Opcodes.ACC_SYNTHETIC) != 0) {
+            if ((cw.version & 0xFFFF) < Opcodes.V1_5
+                    || (access & ClassWriter.ACC_SYNTHETIC_ATTRIBUTE) != 0) {
+                cw.newUTF8("Synthetic");
+                size += 6;
+            }
+        }
+        if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+            cw.newUTF8("Deprecated");
+            size += 6;
+        }
+        if (ClassReader.SIGNATURES && signature != 0) {
+            cw.newUTF8("Signature");
+            size += 8;
+        }
+        if (ClassReader.ANNOTATIONS && anns != null) {
+            cw.newUTF8("RuntimeVisibleAnnotations");
+            size += 8 + anns.getSize();
+        }
+        if (ClassReader.ANNOTATIONS && ianns != null) {
+            cw.newUTF8("RuntimeInvisibleAnnotations");
+            size += 8 + ianns.getSize();
+        }
+        if (attrs != null) {
+            size += attrs.getSize(cw, null, 0, -1, -1);
+        }
+        return size;
+    }
+
+    /**
+     * Puts the content of this field into the given byte vector.
+     * 
+     * @param out
+     *            where the content of this field must be put.
+     */
+    void put(final ByteVector out) {
+        final int FACTOR = ClassWriter.TO_ACC_SYNTHETIC;
+        int mask = Opcodes.ACC_DEPRECATED | ClassWriter.ACC_SYNTHETIC_ATTRIBUTE
+                | ((access & ClassWriter.ACC_SYNTHETIC_ATTRIBUTE) / FACTOR);
+        out.putShort(access & ~mask).putShort(name).putShort(desc);
+        int attributeCount = 0;
+        if (value != 0) {
+            ++attributeCount;
+        }
+        if ((access & Opcodes.ACC_SYNTHETIC) != 0) {
+            if ((cw.version & 0xFFFF) < Opcodes.V1_5
+                    || (access & ClassWriter.ACC_SYNTHETIC_ATTRIBUTE) != 0) {
+                ++attributeCount;
+            }
+        }
+        if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+            ++attributeCount;
+        }
+        if (ClassReader.SIGNATURES && signature != 0) {
+            ++attributeCount;
+        }
+        if (ClassReader.ANNOTATIONS && anns != null) {
+            ++attributeCount;
+        }
+        if (ClassReader.ANNOTATIONS && ianns != null) {
+            ++attributeCount;
+        }
+        if (attrs != null) {
+            attributeCount += attrs.getCount();
+        }
+        out.putShort(attributeCount);
+        if (value != 0) {
+            out.putShort(cw.newUTF8("ConstantValue"));
+            out.putInt(2).putShort(value);
+        }
+        if ((access & Opcodes.ACC_SYNTHETIC) != 0) {
+            if ((cw.version & 0xFFFF) < Opcodes.V1_5
+                    || (access & ClassWriter.ACC_SYNTHETIC_ATTRIBUTE) != 0) {
+                out.putShort(cw.newUTF8("Synthetic")).putInt(0);
+            }
+        }
+        if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+            out.putShort(cw.newUTF8("Deprecated")).putInt(0);
+        }
+        if (ClassReader.SIGNATURES && signature != 0) {
+            out.putShort(cw.newUTF8("Signature"));
+            out.putInt(2).putShort(signature);
+        }
+        if (ClassReader.ANNOTATIONS && anns != null) {
+            out.putShort(cw.newUTF8("RuntimeVisibleAnnotations"));
+            anns.put(out);
+        }
+        if (ClassReader.ANNOTATIONS && ianns != null) {
+            out.putShort(cw.newUTF8("RuntimeInvisibleAnnotations"));
+            ianns.put(out);
+        }
+        if (attrs != null) {
+            attrs.put(cw, null, 0, -1, -1, out);
+        }
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/Frame.java b/src/main/asm/org/objectweb/asm/Frame.java
new file mode 100644
index 0000000..10e15bc
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/Frame.java
@@ -0,0 +1,1453 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm;
+
+/**
+ * Information about the input and output stack map frames of a basic block.
+ * 
+ * @author Eric Bruneton
+ */
+final class Frame {
+
+    /*
+     * Frames are computed in a two steps process: during the visit of each
+     * instruction, the state of the frame at the end of current basic block is
+     * updated by simulating the action of the instruction on the previous state
+     * of this so called "output frame". In visitMaxs, a fix point algorithm is
+     * used to compute the "input frame" of each basic block, i.e. the stack map
+     * frame at the beginning of the basic block, starting from the input frame
+     * of the first basic block (which is computed from the method descriptor),
+     * and by using the previously computed output frames to compute the input
+     * state of the other blocks.
+     * 
+     * All output and input frames are stored as arrays of integers. Reference
+     * and array types are represented by an index into a type table (which is
+     * not the same as the constant pool of the class, in order to avoid adding
+     * unnecessary constants in the pool - not all computed frames will end up
+     * being stored in the stack map table). This allows very fast type
+     * comparisons.
+     * 
+     * Output stack map frames are computed relatively to the input frame of the
+     * basic block, which is not yet known when output frames are computed. It
+     * is therefore necessary to be able to represent abstract types such as
+     * "the type at position x in the input frame locals" or "the type at
+     * position x from the top of the input frame stack" or even "the type at
+     * position x in the input frame, with y more (or less) array dimensions".
+     * This explains the rather complicated type format used in output frames.
+     * 
+     * This format is the following: DIM KIND VALUE (4, 4 and 24 bits). DIM is a
+     * signed number of array dimensions (from -8 to 7). KIND is either BASE,
+     * LOCAL or STACK. BASE is used for types that are not relative to the input
+     * frame. LOCAL is used for types that are relative to the input local
+     * variable types. STACK is used for types that are relative to the input
+     * stack types. VALUE depends on KIND. For LOCAL types, it is an index in
+     * the input local variable types. For STACK types, it is a position
+     * relatively to the top of input frame stack. For BASE types, it is either
+     * one of the constants defined in FrameVisitor, or for OBJECT and
+     * UNINITIALIZED types, a tag and an index in the type table.
+     * 
+     * Output frames can contain types of any kind and with a positive or
+     * negative dimension (and even unassigned types, represented by 0 - which
+     * does not correspond to any valid type value). Input frames can only
+     * contain BASE types of positive or null dimension. In all cases the type
+     * table contains only internal type names (array type descriptors are
+     * forbidden - dimensions must be represented through the DIM field).
+     * 
+     * The LONG and DOUBLE types are always represented by using two slots (LONG
+     * + TOP or DOUBLE + TOP), for local variable types as well as in the
+     * operand stack. This is necessary to be able to simulate DUPx_y
+     * instructions, whose effect would be dependent on the actual type values
+     * if types were always represented by a single slot in the stack (and this
+     * is not possible, since actual type values are not always known - cf LOCAL
+     * and STACK type kinds).
+     */
+
+    /**
+     * Mask to get the dimension of a frame type. This dimension is a signed
+     * integer between -8 and 7.
+     */
+    static final int DIM = 0xF0000000;
+
+    /**
+     * Constant to be added to a type to get a type with one more dimension.
+     */
+    static final int ARRAY_OF = 0x10000000;
+
+    /**
+     * Constant to be added to a type to get a type with one less dimension.
+     */
+    static final int ELEMENT_OF = 0xF0000000;
+
+    /**
+     * Mask to get the kind of a frame type.
+     * 
+     * @see #BASE
+     * @see #LOCAL
+     * @see #STACK
+     */
+    static final int KIND = 0xF000000;
+
+    /**
+     * Flag used for LOCAL and STACK types. Indicates that if this type happens
+     * to be a long or double type (during the computations of input frames),
+     * then it must be set to TOP because the second word of this value has been
+     * reused to store other data in the basic block. Hence the first word no
+     * longer stores a valid long or double value.
+     */
+    static final int TOP_IF_LONG_OR_DOUBLE = 0x800000;
+
+    /**
+     * Mask to get the value of a frame type.
+     */
+    static final int VALUE = 0x7FFFFF;
+
+    /**
+     * Mask to get the kind of base types.
+     */
+    static final int BASE_KIND = 0xFF00000;
+
+    /**
+     * Mask to get the value of base types.
+     */
+    static final int BASE_VALUE = 0xFFFFF;
+
+    /**
+     * Kind of the types that are not relative to an input stack map frame.
+     */
+    static final int BASE = 0x1000000;
+
+    /**
+     * Base kind of the base reference types. The BASE_VALUE of such types is an
+     * index into the type table.
+     */
+    static final int OBJECT = BASE | 0x700000;
+
+    /**
+     * Base kind of the uninitialized base types. The BASE_VALUE of such types
+     * in an index into the type table (the Item at that index contains both an
+     * instruction offset and an internal class name).
+     */
+    static final int UNINITIALIZED = BASE | 0x800000;
+
+    /**
+     * Kind of the types that are relative to the local variable types of an
+     * input stack map frame. The value of such types is a local variable index.
+     */
+    private static final int LOCAL = 0x2000000;
+
+    /**
+     * Kind of the the types that are relative to the stack of an input stack
+     * map frame. The value of such types is a position relatively to the top of
+     * this stack.
+     */
+    private static final int STACK = 0x3000000;
+
+    /**
+     * The TOP type. This is a BASE type.
+     */
+    static final int TOP = BASE | 0;
+
+    /**
+     * The BOOLEAN type. This is a BASE type mainly used for array types.
+     */
+    static final int BOOLEAN = BASE | 9;
+
+    /**
+     * The BYTE type. This is a BASE type mainly used for array types.
+     */
+    static final int BYTE = BASE | 10;
+
+    /**
+     * The CHAR type. This is a BASE type mainly used for array types.
+     */
+    static final int CHAR = BASE | 11;
+
+    /**
+     * The SHORT type. This is a BASE type mainly used for array types.
+     */
+    static final int SHORT = BASE | 12;
+
+    /**
+     * The INTEGER type. This is a BASE type.
+     */
+    static final int INTEGER = BASE | 1;
+
+    /**
+     * The FLOAT type. This is a BASE type.
+     */
+    static final int FLOAT = BASE | 2;
+
+    /**
+     * The DOUBLE type. This is a BASE type.
+     */
+    static final int DOUBLE = BASE | 3;
+
+    /**
+     * The LONG type. This is a BASE type.
+     */
+    static final int LONG = BASE | 4;
+
+    /**
+     * The NULL type. This is a BASE type.
+     */
+    static final int NULL = BASE | 5;
+
+    /**
+     * The UNINITIALIZED_THIS type. This is a BASE type.
+     */
+    static final int UNINITIALIZED_THIS = BASE | 6;
+
+    /**
+     * The stack size variation corresponding to each JVM instruction. This
+     * stack variation is equal to the size of the values produced by an
+     * instruction, minus the size of the values consumed by this instruction.
+     */
+    static final int[] SIZE;
+
+    /**
+     * Computes the stack size variation corresponding to each JVM instruction.
+     */
+    static {
+        int i;
+        int[] b = new int[202];
+        String s = "EFFFFFFFFGGFFFGGFFFEEFGFGFEEEEEEEEEEEEEEEEEEEEDEDEDDDDD"
+                + "CDCDEEEEEEEEEEEEEEEEEEEEBABABBBBDCFFFGGGEDCDCDCDCDCDCDCDCD"
+                + "CDCEEEEDDDDDDDCDCDCEFEFDDEEFFDEDEEEBDDBBDDDDDDCCCCCCCCEFED"
+                + "DDCDCDEEEEEEEEEEFEEEEEEDDEEDDEE";
+        for (i = 0; i < b.length; ++i) {
+            b[i] = s.charAt(i) - 'E';
+        }
+        SIZE = b;
+
+        // code to generate the above string
+        //
+        // int NA = 0; // not applicable (unused opcode or variable size opcode)
+        //
+        // b = new int[] {
+        // 0, //NOP, // visitInsn
+        // 1, //ACONST_NULL, // -
+        // 1, //ICONST_M1, // -
+        // 1, //ICONST_0, // -
+        // 1, //ICONST_1, // -
+        // 1, //ICONST_2, // -
+        // 1, //ICONST_3, // -
+        // 1, //ICONST_4, // -
+        // 1, //ICONST_5, // -
+        // 2, //LCONST_0, // -
+        // 2, //LCONST_1, // -
+        // 1, //FCONST_0, // -
+        // 1, //FCONST_1, // -
+        // 1, //FCONST_2, // -
+        // 2, //DCONST_0, // -
+        // 2, //DCONST_1, // -
+        // 1, //BIPUSH, // visitIntInsn
+        // 1, //SIPUSH, // -
+        // 1, //LDC, // visitLdcInsn
+        // NA, //LDC_W, // -
+        // NA, //LDC2_W, // -
+        // 1, //ILOAD, // visitVarInsn
+        // 2, //LLOAD, // -
+        // 1, //FLOAD, // -
+        // 2, //DLOAD, // -
+        // 1, //ALOAD, // -
+        // NA, //ILOAD_0, // -
+        // NA, //ILOAD_1, // -
+        // NA, //ILOAD_2, // -
+        // NA, //ILOAD_3, // -
+        // NA, //LLOAD_0, // -
+        // NA, //LLOAD_1, // -
+        // NA, //LLOAD_2, // -
+        // NA, //LLOAD_3, // -
+        // NA, //FLOAD_0, // -
+        // NA, //FLOAD_1, // -
+        // NA, //FLOAD_2, // -
+        // NA, //FLOAD_3, // -
+        // NA, //DLOAD_0, // -
+        // NA, //DLOAD_1, // -
+        // NA, //DLOAD_2, // -
+        // NA, //DLOAD_3, // -
+        // NA, //ALOAD_0, // -
+        // NA, //ALOAD_1, // -
+        // NA, //ALOAD_2, // -
+        // NA, //ALOAD_3, // -
+        // -1, //IALOAD, // visitInsn
+        // 0, //LALOAD, // -
+        // -1, //FALOAD, // -
+        // 0, //DALOAD, // -
+        // -1, //AALOAD, // -
+        // -1, //BALOAD, // -
+        // -1, //CALOAD, // -
+        // -1, //SALOAD, // -
+        // -1, //ISTORE, // visitVarInsn
+        // -2, //LSTORE, // -
+        // -1, //FSTORE, // -
+        // -2, //DSTORE, // -
+        // -1, //ASTORE, // -
+        // NA, //ISTORE_0, // -
+        // NA, //ISTORE_1, // -
+        // NA, //ISTORE_2, // -
+        // NA, //ISTORE_3, // -
+        // NA, //LSTORE_0, // -
+        // NA, //LSTORE_1, // -
+        // NA, //LSTORE_2, // -
+        // NA, //LSTORE_3, // -
+        // NA, //FSTORE_0, // -
+        // NA, //FSTORE_1, // -
+        // NA, //FSTORE_2, // -
+        // NA, //FSTORE_3, // -
+        // NA, //DSTORE_0, // -
+        // NA, //DSTORE_1, // -
+        // NA, //DSTORE_2, // -
+        // NA, //DSTORE_3, // -
+        // NA, //ASTORE_0, // -
+        // NA, //ASTORE_1, // -
+        // NA, //ASTORE_2, // -
+        // NA, //ASTORE_3, // -
+        // -3, //IASTORE, // visitInsn
+        // -4, //LASTORE, // -
+        // -3, //FASTORE, // -
+        // -4, //DASTORE, // -
+        // -3, //AASTORE, // -
+        // -3, //BASTORE, // -
+        // -3, //CASTORE, // -
+        // -3, //SASTORE, // -
+        // -1, //POP, // -
+        // -2, //POP2, // -
+        // 1, //DUP, // -
+        // 1, //DUP_X1, // -
+        // 1, //DUP_X2, // -
+        // 2, //DUP2, // -
+        // 2, //DUP2_X1, // -
+        // 2, //DUP2_X2, // -
+        // 0, //SWAP, // -
+        // -1, //IADD, // -
+        // -2, //LADD, // -
+        // -1, //FADD, // -
+        // -2, //DADD, // -
+        // -1, //ISUB, // -
+        // -2, //LSUB, // -
+        // -1, //FSUB, // -
+        // -2, //DSUB, // -
+        // -1, //IMUL, // -
+        // -2, //LMUL, // -
+        // -1, //FMUL, // -
+        // -2, //DMUL, // -
+        // -1, //IDIV, // -
+        // -2, //LDIV, // -
+        // -1, //FDIV, // -
+        // -2, //DDIV, // -
+        // -1, //IREM, // -
+        // -2, //LREM, // -
+        // -1, //FREM, // -
+        // -2, //DREM, // -
+        // 0, //INEG, // -
+        // 0, //LNEG, // -
+        // 0, //FNEG, // -
+        // 0, //DNEG, // -
+        // -1, //ISHL, // -
+        // -1, //LSHL, // -
+        // -1, //ISHR, // -
+        // -1, //LSHR, // -
+        // -1, //IUSHR, // -
+        // -1, //LUSHR, // -
+        // -1, //IAND, // -
+        // -2, //LAND, // -
+        // -1, //IOR, // -
+        // -2, //LOR, // -
+        // -1, //IXOR, // -
+        // -2, //LXOR, // -
+        // 0, //IINC, // visitIincInsn
+        // 1, //I2L, // visitInsn
+        // 0, //I2F, // -
+        // 1, //I2D, // -
+        // -1, //L2I, // -
+        // -1, //L2F, // -
+        // 0, //L2D, // -
+        // 0, //F2I, // -
+        // 1, //F2L, // -
+        // 1, //F2D, // -
+        // -1, //D2I, // -
+        // 0, //D2L, // -
+        // -1, //D2F, // -
+        // 0, //I2B, // -
+        // 0, //I2C, // -
+        // 0, //I2S, // -
+        // -3, //LCMP, // -
+        // -1, //FCMPL, // -
+        // -1, //FCMPG, // -
+        // -3, //DCMPL, // -
+        // -3, //DCMPG, // -
+        // -1, //IFEQ, // visitJumpInsn
+        // -1, //IFNE, // -
+        // -1, //IFLT, // -
+        // -1, //IFGE, // -
+        // -1, //IFGT, // -
+        // -1, //IFLE, // -
+        // -2, //IF_ICMPEQ, // -
+        // -2, //IF_ICMPNE, // -
+        // -2, //IF_ICMPLT, // -
+        // -2, //IF_ICMPGE, // -
+        // -2, //IF_ICMPGT, // -
+        // -2, //IF_ICMPLE, // -
+        // -2, //IF_ACMPEQ, // -
+        // -2, //IF_ACMPNE, // -
+        // 0, //GOTO, // -
+        // 1, //JSR, // -
+        // 0, //RET, // visitVarInsn
+        // -1, //TABLESWITCH, // visiTableSwitchInsn
+        // -1, //LOOKUPSWITCH, // visitLookupSwitch
+        // -1, //IRETURN, // visitInsn
+        // -2, //LRETURN, // -
+        // -1, //FRETURN, // -
+        // -2, //DRETURN, // -
+        // -1, //ARETURN, // -
+        // 0, //RETURN, // -
+        // NA, //GETSTATIC, // visitFieldInsn
+        // NA, //PUTSTATIC, // -
+        // NA, //GETFIELD, // -
+        // NA, //PUTFIELD, // -
+        // NA, //INVOKEVIRTUAL, // visitMethodInsn
+        // NA, //INVOKESPECIAL, // -
+        // NA, //INVOKESTATIC, // -
+        // NA, //INVOKEINTERFACE, // -
+        // NA, //INVOKEDYNAMIC, // visitInvokeDynamicInsn
+        // 1, //NEW, // visitTypeInsn
+        // 0, //NEWARRAY, // visitIntInsn
+        // 0, //ANEWARRAY, // visitTypeInsn
+        // 0, //ARRAYLENGTH, // visitInsn
+        // NA, //ATHROW, // -
+        // 0, //CHECKCAST, // visitTypeInsn
+        // 0, //INSTANCEOF, // -
+        // -1, //MONITORENTER, // visitInsn
+        // -1, //MONITOREXIT, // -
+        // NA, //WIDE, // NOT VISITED
+        // NA, //MULTIANEWARRAY, // visitMultiANewArrayInsn
+        // -1, //IFNULL, // visitJumpInsn
+        // -1, //IFNONNULL, // -
+        // NA, //GOTO_W, // -
+        // NA, //JSR_W, // -
+        // };
+        // for (i = 0; i < b.length; ++i) {
+        // System.err.print((char)('E' + b[i]));
+        // }
+        // System.err.println();
+    }
+
+    /**
+     * The label (i.e. basic block) to which these input and output stack map
+     * frames correspond.
+     */
+    Label owner;
+
+    /**
+     * The input stack map frame locals.
+     */
+    int[] inputLocals;
+
+    /**
+     * The input stack map frame stack.
+     */
+    int[] inputStack;
+
+    /**
+     * The output stack map frame locals.
+     */
+    private int[] outputLocals;
+
+    /**
+     * The output stack map frame stack.
+     */
+    private int[] outputStack;
+
+    /**
+     * Relative size of the output stack. The exact semantics of this field
+     * depends on the algorithm that is used.
+     * 
+     * When only the maximum stack size is computed, this field is the size of
+     * the output stack relatively to the top of the input stack.
+     * 
+     * When the stack map frames are completely computed, this field is the
+     * actual number of types in {@link #outputStack}.
+     */
+    private int outputStackTop;
+
+    /**
+     * Number of types that are initialized in the basic block.
+     * 
+     * @see #initializations
+     */
+    private int initializationCount;
+
+    /**
+     * The types that are initialized in the basic block. A constructor
+     * invocation on an UNINITIALIZED or UNINITIALIZED_THIS type must replace
+     * <i>every occurence</i> of this type in the local variables and in the
+     * operand stack. This cannot be done during the first phase of the
+     * algorithm since, during this phase, the local variables and the operand
+     * stack are not completely computed. It is therefore necessary to store the
+     * types on which constructors are invoked in the basic block, in order to
+     * do this replacement during the second phase of the algorithm, where the
+     * frames are fully computed. Note that this array can contain types that
+     * are relative to input locals or to the input stack (see below for the
+     * description of the algorithm).
+     */
+    private int[] initializations;
+
+    /**
+     * Returns the output frame local variable type at the given index.
+     * 
+     * @param local
+     *            the index of the local that must be returned.
+     * @return the output frame local variable type at the given index.
+     */
+    private int get(final int local) {
+        if (outputLocals == null || local >= outputLocals.length) {
+            // this local has never been assigned in this basic block,
+            // so it is still equal to its value in the input frame
+            return LOCAL | local;
+        } else {
+            int type = outputLocals[local];
+            if (type == 0) {
+                // this local has never been assigned in this basic block,
+                // so it is still equal to its value in the input frame
+                type = outputLocals[local] = LOCAL | local;
+            }
+            return type;
+        }
+    }
+
+    /**
+     * Sets the output frame local variable type at the given index.
+     * 
+     * @param local
+     *            the index of the local that must be set.
+     * @param type
+     *            the value of the local that must be set.
+     */
+    private void set(final int local, final int type) {
+        // creates and/or resizes the output local variables array if necessary
+        if (outputLocals == null) {
+            outputLocals = new int[10];
+        }
+        int n = outputLocals.length;
+        if (local >= n) {
+            int[] t = new int[Math.max(local + 1, 2 * n)];
+            System.arraycopy(outputLocals, 0, t, 0, n);
+            outputLocals = t;
+        }
+        // sets the local variable
+        outputLocals[local] = type;
+    }
+
+    /**
+     * Pushes a new type onto the output frame stack.
+     * 
+     * @param type
+     *            the type that must be pushed.
+     */
+    private void push(final int type) {
+        // creates and/or resizes the output stack array if necessary
+        if (outputStack == null) {
+            outputStack = new int[10];
+        }
+        int n = outputStack.length;
+        if (outputStackTop >= n) {
+            int[] t = new int[Math.max(outputStackTop + 1, 2 * n)];
+            System.arraycopy(outputStack, 0, t, 0, n);
+            outputStack = t;
+        }
+        // pushes the type on the output stack
+        outputStack[outputStackTop++] = type;
+        // updates the maximun height reached by the output stack, if needed
+        int top = owner.inputStackTop + outputStackTop;
+        if (top > owner.outputStackMax) {
+            owner.outputStackMax = top;
+        }
+    }
+
+    /**
+     * Pushes a new type onto the output frame stack.
+     * 
+     * @param cw
+     *            the ClassWriter to which this label belongs.
+     * @param desc
+     *            the descriptor of the type to be pushed. Can also be a method
+     *            descriptor (in this case this method pushes its return type
+     *            onto the output frame stack).
+     */
+    private void push(final ClassWriter cw, final String desc) {
+        int type = type(cw, desc);
+        if (type != 0) {
+            push(type);
+            if (type == LONG || type == DOUBLE) {
+                push(TOP);
+            }
+        }
+    }
+
+    /**
+     * Returns the int encoding of the given type.
+     * 
+     * @param cw
+     *            the ClassWriter to which this label belongs.
+     * @param desc
+     *            a type descriptor.
+     * @return the int encoding of the given type.
+     */
+    private static int type(final ClassWriter cw, final String desc) {
+        String t;
+        int index = desc.charAt(0) == '(' ? desc.indexOf(')') + 1 : 0;
+        switch (desc.charAt(index)) {
+        case 'V':
+            return 0;
+        case 'Z':
+        case 'C':
+        case 'B':
+        case 'S':
+        case 'I':
+            return INTEGER;
+        case 'F':
+            return FLOAT;
+        case 'J':
+            return LONG;
+        case 'D':
+            return DOUBLE;
+        case 'L':
+            // stores the internal name, not the descriptor!
+            t = desc.substring(index + 1, desc.length() - 1);
+            return OBJECT | cw.addType(t);
+            // case '[':
+        default:
+            // extracts the dimensions and the element type
+            int data;
+            int dims = index + 1;
+            while (desc.charAt(dims) == '[') {
+                ++dims;
+            }
+            switch (desc.charAt(dims)) {
+            case 'Z':
+                data = BOOLEAN;
+                break;
+            case 'C':
+                data = CHAR;
+                break;
+            case 'B':
+                data = BYTE;
+                break;
+            case 'S':
+                data = SHORT;
+                break;
+            case 'I':
+                data = INTEGER;
+                break;
+            case 'F':
+                data = FLOAT;
+                break;
+            case 'J':
+                data = LONG;
+                break;
+            case 'D':
+                data = DOUBLE;
+                break;
+            // case 'L':
+            default:
+                // stores the internal name, not the descriptor
+                t = desc.substring(dims + 1, desc.length() - 1);
+                data = OBJECT | cw.addType(t);
+            }
+            return (dims - index) << 28 | data;
+        }
+    }
+
+    /**
+     * Pops a type from the output frame stack and returns its value.
+     * 
+     * @return the type that has been popped from the output frame stack.
+     */
+    private int pop() {
+        if (outputStackTop > 0) {
+            return outputStack[--outputStackTop];
+        } else {
+            // if the output frame stack is empty, pops from the input stack
+            return STACK | -(--owner.inputStackTop);
+        }
+    }
+
+    /**
+     * Pops the given number of types from the output frame stack.
+     * 
+     * @param elements
+     *            the number of types that must be popped.
+     */
+    private void pop(final int elements) {
+        if (outputStackTop >= elements) {
+            outputStackTop -= elements;
+        } else {
+            // if the number of elements to be popped is greater than the number
+            // of elements in the output stack, clear it, and pops the remaining
+            // elements from the input stack.
+            owner.inputStackTop -= elements - outputStackTop;
+            outputStackTop = 0;
+        }
+    }
+
+    /**
+     * Pops a type from the output frame stack.
+     * 
+     * @param desc
+     *            the descriptor of the type to be popped. Can also be a method
+     *            descriptor (in this case this method pops the types
+     *            corresponding to the method arguments).
+     */
+    private void pop(final String desc) {
+        char c = desc.charAt(0);
+        if (c == '(') {
+            pop((Type.getArgumentsAndReturnSizes(desc) >> 2) - 1);
+        } else if (c == 'J' || c == 'D') {
+            pop(2);
+        } else {
+            pop(1);
+        }
+    }
+
+    /**
+     * Adds a new type to the list of types on which a constructor is invoked in
+     * the basic block.
+     * 
+     * @param var
+     *            a type on a which a constructor is invoked.
+     */
+    private void init(final int var) {
+        // creates and/or resizes the initializations array if necessary
+        if (initializations == null) {
+            initializations = new int[2];
+        }
+        int n = initializations.length;
+        if (initializationCount >= n) {
+            int[] t = new int[Math.max(initializationCount + 1, 2 * n)];
+            System.arraycopy(initializations, 0, t, 0, n);
+            initializations = t;
+        }
+        // stores the type to be initialized
+        initializations[initializationCount++] = var;
+    }
+
+    /**
+     * Replaces the given type with the appropriate type if it is one of the
+     * types on which a constructor is invoked in the basic block.
+     * 
+     * @param cw
+     *            the ClassWriter to which this label belongs.
+     * @param t
+     *            a type
+     * @return t or, if t is one of the types on which a constructor is invoked
+     *         in the basic block, the type corresponding to this constructor.
+     */
+    private int init(final ClassWriter cw, final int t) {
+        int s;
+        if (t == UNINITIALIZED_THIS) {
+            s = OBJECT | cw.addType(cw.thisName);
+        } else if ((t & (DIM | BASE_KIND)) == UNINITIALIZED) {
+            String type = cw.typeTable[t & BASE_VALUE].strVal1;
+            s = OBJECT | cw.addType(type);
+        } else {
+            return t;
+        }
+        for (int j = 0; j < initializationCount; ++j) {
+            int u = initializations[j];
+            int dim = u & DIM;
+            int kind = u & KIND;
+            if (kind == LOCAL) {
+                u = dim + inputLocals[u & VALUE];
+            } else if (kind == STACK) {
+                u = dim + inputStack[inputStack.length - (u & VALUE)];
+            }
+            if (t == u) {
+                return s;
+            }
+        }
+        return t;
+    }
+
+    /**
+     * Initializes the input frame of the first basic block from the method
+     * descriptor.
+     * 
+     * @param cw
+     *            the ClassWriter to which this label belongs.
+     * @param access
+     *            the access flags of the method to which this label belongs.
+     * @param args
+     *            the formal parameter types of this method.
+     * @param maxLocals
+     *            the maximum number of local variables of this method.
+     */
+    void initInputFrame(final ClassWriter cw, final int access,
+            final Type[] args, final int maxLocals) {
+        inputLocals = new int[maxLocals];
+        inputStack = new int[0];
+        int i = 0;
+        if ((access & Opcodes.ACC_STATIC) == 0) {
+            if ((access & MethodWriter.ACC_CONSTRUCTOR) == 0) {
+                inputLocals[i++] = OBJECT | cw.addType(cw.thisName);
+            } else {
+                inputLocals[i++] = UNINITIALIZED_THIS;
+            }
+        }
+        for (int j = 0; j < args.length; ++j) {
+            int t = type(cw, args[j].getDescriptor());
+            inputLocals[i++] = t;
+            if (t == LONG || t == DOUBLE) {
+                inputLocals[i++] = TOP;
+            }
+        }
+        while (i < maxLocals) {
+            inputLocals[i++] = TOP;
+        }
+    }
+
+    /**
+     * Simulates the action of the given instruction on the output stack frame.
+     * 
+     * @param opcode
+     *            the opcode of the instruction.
+     * @param arg
+     *            the operand of the instruction, if any.
+     * @param cw
+     *            the class writer to which this label belongs.
+     * @param item
+     *            the operand of the instructions, if any.
+     */
+    void execute(final int opcode, final int arg, final ClassWriter cw,
+            final Item item) {
+        int t1, t2, t3, t4;
+        switch (opcode) {
+        case Opcodes.NOP:
+        case Opcodes.INEG:
+        case Opcodes.LNEG:
+        case Opcodes.FNEG:
+        case Opcodes.DNEG:
+        case Opcodes.I2B:
+        case Opcodes.I2C:
+        case Opcodes.I2S:
+        case Opcodes.GOTO:
+        case Opcodes.RETURN:
+            break;
+        case Opcodes.ACONST_NULL:
+            push(NULL);
+            break;
+        case Opcodes.ICONST_M1:
+        case Opcodes.ICONST_0:
+        case Opcodes.ICONST_1:
+        case Opcodes.ICONST_2:
+        case Opcodes.ICONST_3:
+        case Opcodes.ICONST_4:
+        case Opcodes.ICONST_5:
+        case Opcodes.BIPUSH:
+        case Opcodes.SIPUSH:
+        case Opcodes.ILOAD:
+            push(INTEGER);
+            break;
+        case Opcodes.LCONST_0:
+        case Opcodes.LCONST_1:
+        case Opcodes.LLOAD:
+            push(LONG);
+            push(TOP);
+            break;
+        case Opcodes.FCONST_0:
+        case Opcodes.FCONST_1:
+        case Opcodes.FCONST_2:
+        case Opcodes.FLOAD:
+            push(FLOAT);
+            break;
+        case Opcodes.DCONST_0:
+        case Opcodes.DCONST_1:
+        case Opcodes.DLOAD:
+            push(DOUBLE);
+            push(TOP);
+            break;
+        case Opcodes.LDC:
+            switch (item.type) {
+            case ClassWriter.INT:
+                push(INTEGER);
+                break;
+            case ClassWriter.LONG:
+                push(LONG);
+                push(TOP);
+                break;
+            case ClassWriter.FLOAT:
+                push(FLOAT);
+                break;
+            case ClassWriter.DOUBLE:
+                push(DOUBLE);
+                push(TOP);
+                break;
+            case ClassWriter.CLASS:
+                push(OBJECT | cw.addType("java/lang/Class"));
+                break;
+            case ClassWriter.STR:
+                push(OBJECT | cw.addType("java/lang/String"));
+                break;
+            case ClassWriter.MTYPE:
+                push(OBJECT | cw.addType("java/lang/invoke/MethodType"));
+                break;
+            // case ClassWriter.HANDLE_BASE + [1..9]:
+            default:
+                push(OBJECT | cw.addType("java/lang/invoke/MethodHandle"));
+            }
+            break;
+        case Opcodes.ALOAD:
+            push(get(arg));
+            break;
+        case Opcodes.IALOAD:
+        case Opcodes.BALOAD:
+        case Opcodes.CALOAD:
+        case Opcodes.SALOAD:
+            pop(2);
+            push(INTEGER);
+            break;
+        case Opcodes.LALOAD:
+        case Opcodes.D2L:
+            pop(2);
+            push(LONG);
+            push(TOP);
+            break;
+        case Opcodes.FALOAD:
+            pop(2);
+            push(FLOAT);
+            break;
+        case Opcodes.DALOAD:
+        case Opcodes.L2D:
+            pop(2);
+            push(DOUBLE);
+            push(TOP);
+            break;
+        case Opcodes.AALOAD:
+            pop(1);
+            t1 = pop();
+            push(ELEMENT_OF + t1);
+            break;
+        case Opcodes.ISTORE:
+        case Opcodes.FSTORE:
+        case Opcodes.ASTORE:
+            t1 = pop();
+            set(arg, t1);
+            if (arg > 0) {
+                t2 = get(arg - 1);
+                // if t2 is of kind STACK or LOCAL we cannot know its size!
+                if (t2 == LONG || t2 == DOUBLE) {
+                    set(arg - 1, TOP);
+                } else if ((t2 & KIND) != BASE) {
+                    set(arg - 1, t2 | TOP_IF_LONG_OR_DOUBLE);
+                }
+            }
+            break;
+        case Opcodes.LSTORE:
+        case Opcodes.DSTORE:
+            pop(1);
+            t1 = pop();
+            set(arg, t1);
+            set(arg + 1, TOP);
+            if (arg > 0) {
+                t2 = get(arg - 1);
+                // if t2 is of kind STACK or LOCAL we cannot know its size!
+                if (t2 == LONG || t2 == DOUBLE) {
+                    set(arg - 1, TOP);
+                } else if ((t2 & KIND) != BASE) {
+                    set(arg - 1, t2 | TOP_IF_LONG_OR_DOUBLE);
+                }
+            }
+            break;
+        case Opcodes.IASTORE:
+        case Opcodes.BASTORE:
+        case Opcodes.CASTORE:
+        case Opcodes.SASTORE:
+        case Opcodes.FASTORE:
+        case Opcodes.AASTORE:
+            pop(3);
+            break;
+        case Opcodes.LASTORE:
+        case Opcodes.DASTORE:
+            pop(4);
+            break;
+        case Opcodes.POP:
+        case Opcodes.IFEQ:
+        case Opcodes.IFNE:
+        case Opcodes.IFLT:
+        case Opcodes.IFGE:
+        case Opcodes.IFGT:
+        case Opcodes.IFLE:
+        case Opcodes.IRETURN:
+        case Opcodes.FRETURN:
+        case Opcodes.ARETURN:
+        case Opcodes.TABLESWITCH:
+        case Opcodes.LOOKUPSWITCH:
+        case Opcodes.ATHROW:
+        case Opcodes.MONITORENTER:
+        case Opcodes.MONITOREXIT:
+        case Opcodes.IFNULL:
+        case Opcodes.IFNONNULL:
+            pop(1);
+            break;
+        case Opcodes.POP2:
+        case Opcodes.IF_ICMPEQ:
+        case Opcodes.IF_ICMPNE:
+        case Opcodes.IF_ICMPLT:
+        case Opcodes.IF_ICMPGE:
+        case Opcodes.IF_ICMPGT:
+        case Opcodes.IF_ICMPLE:
+        case Opcodes.IF_ACMPEQ:
+        case Opcodes.IF_ACMPNE:
+        case Opcodes.LRETURN:
+        case Opcodes.DRETURN:
+            pop(2);
+            break;
+        case Opcodes.DUP:
+            t1 = pop();
+            push(t1);
+            push(t1);
+            break;
+        case Opcodes.DUP_X1:
+            t1 = pop();
+            t2 = pop();
+            push(t1);
+            push(t2);
+            push(t1);
+            break;
+        case Opcodes.DUP_X2:
+            t1 = pop();
+            t2 = pop();
+            t3 = pop();
+            push(t1);
+            push(t3);
+            push(t2);
+            push(t1);
+            break;
+        case Opcodes.DUP2:
+            t1 = pop();
+            t2 = pop();
+            push(t2);
+            push(t1);
+            push(t2);
+            push(t1);
+            break;
+        case Opcodes.DUP2_X1:
+            t1 = pop();
+            t2 = pop();
+            t3 = pop();
+            push(t2);
+            push(t1);
+            push(t3);
+            push(t2);
+            push(t1);
+            break;
+        case Opcodes.DUP2_X2:
+            t1 = pop();
+            t2 = pop();
+            t3 = pop();
+            t4 = pop();
+            push(t2);
+            push(t1);
+            push(t4);
+            push(t3);
+            push(t2);
+            push(t1);
+            break;
+        case Opcodes.SWAP:
+            t1 = pop();
+            t2 = pop();
+            push(t1);
+            push(t2);
+            break;
+        case Opcodes.IADD:
+        case Opcodes.ISUB:
+        case Opcodes.IMUL:
+        case Opcodes.IDIV:
+        case Opcodes.IREM:
+        case Opcodes.IAND:
+        case Opcodes.IOR:
+        case Opcodes.IXOR:
+        case Opcodes.ISHL:
+        case Opcodes.ISHR:
+        case Opcodes.IUSHR:
+        case Opcodes.L2I:
+        case Opcodes.D2I:
+        case Opcodes.FCMPL:
+        case Opcodes.FCMPG:
+            pop(2);
+            push(INTEGER);
+            break;
+        case Opcodes.LADD:
+        case Opcodes.LSUB:
+        case Opcodes.LMUL:
+        case Opcodes.LDIV:
+        case Opcodes.LREM:
+        case Opcodes.LAND:
+        case Opcodes.LOR:
+        case Opcodes.LXOR:
+            pop(4);
+            push(LONG);
+            push(TOP);
+            break;
+        case Opcodes.FADD:
+        case Opcodes.FSUB:
+        case Opcodes.FMUL:
+        case Opcodes.FDIV:
+        case Opcodes.FREM:
+        case Opcodes.L2F:
+        case Opcodes.D2F:
+            pop(2);
+            push(FLOAT);
+            break;
+        case Opcodes.DADD:
+        case Opcodes.DSUB:
+        case Opcodes.DMUL:
+        case Opcodes.DDIV:
+        case Opcodes.DREM:
+            pop(4);
+            push(DOUBLE);
+            push(TOP);
+            break;
+        case Opcodes.LSHL:
+        case Opcodes.LSHR:
+        case Opcodes.LUSHR:
+            pop(3);
+            push(LONG);
+            push(TOP);
+            break;
+        case Opcodes.IINC:
+            set(arg, INTEGER);
+            break;
+        case Opcodes.I2L:
+        case Opcodes.F2L:
+            pop(1);
+            push(LONG);
+            push(TOP);
+            break;
+        case Opcodes.I2F:
+            pop(1);
+            push(FLOAT);
+            break;
+        case Opcodes.I2D:
+        case Opcodes.F2D:
+            pop(1);
+            push(DOUBLE);
+            push(TOP);
+            break;
+        case Opcodes.F2I:
+        case Opcodes.ARRAYLENGTH:
+        case Opcodes.INSTANCEOF:
+            pop(1);
+            push(INTEGER);
+            break;
+        case Opcodes.LCMP:
+        case Opcodes.DCMPL:
+        case Opcodes.DCMPG:
+            pop(4);
+            push(INTEGER);
+            break;
+        case Opcodes.JSR:
+        case Opcodes.RET:
+            throw new RuntimeException(
+                    "JSR/RET are not supported with computeFrames option");
+        case Opcodes.GETSTATIC:
+            push(cw, item.strVal3);
+            break;
+        case Opcodes.PUTSTATIC:
+            pop(item.strVal3);
+            break;
+        case Opcodes.GETFIELD:
+            pop(1);
+            push(cw, item.strVal3);
+            break;
+        case Opcodes.PUTFIELD:
+            pop(item.strVal3);
+            pop();
+            break;
+        case Opcodes.INVOKEVIRTUAL:
+        case Opcodes.INVOKESPECIAL:
+        case Opcodes.INVOKESTATIC:
+        case Opcodes.INVOKEINTERFACE:
+            pop(item.strVal3);
+            if (opcode != Opcodes.INVOKESTATIC) {
+                t1 = pop();
+                if (opcode == Opcodes.INVOKESPECIAL
+                        && item.strVal2.charAt(0) == '<') {
+                    init(t1);
+                }
+            }
+            push(cw, item.strVal3);
+            break;
+        case Opcodes.INVOKEDYNAMIC:
+            pop(item.strVal2);
+            push(cw, item.strVal2);
+            break;
+        case Opcodes.NEW:
+            push(UNINITIALIZED | cw.addUninitializedType(item.strVal1, arg));
+            break;
+        case Opcodes.NEWARRAY:
+            pop();
+            switch (arg) {
+            case Opcodes.T_BOOLEAN:
+                push(ARRAY_OF | BOOLEAN);
+                break;
+            case Opcodes.T_CHAR:
+                push(ARRAY_OF | CHAR);
+                break;
+            case Opcodes.T_BYTE:
+                push(ARRAY_OF | BYTE);
+                break;
+            case Opcodes.T_SHORT:
+                push(ARRAY_OF | SHORT);
+                break;
+            case Opcodes.T_INT:
+                push(ARRAY_OF | INTEGER);
+                break;
+            case Opcodes.T_FLOAT:
+                push(ARRAY_OF | FLOAT);
+                break;
+            case Opcodes.T_DOUBLE:
+                push(ARRAY_OF | DOUBLE);
+                break;
+            // case Opcodes.T_LONG:
+            default:
+                push(ARRAY_OF | LONG);
+                break;
+            }
+            break;
+        case Opcodes.ANEWARRAY:
+            String s = item.strVal1;
+            pop();
+            if (s.charAt(0) == '[') {
+                push(cw, '[' + s);
+            } else {
+                push(ARRAY_OF | OBJECT | cw.addType(s));
+            }
+            break;
+        case Opcodes.CHECKCAST:
+            s = item.strVal1;
+            pop();
+            if (s.charAt(0) == '[') {
+                push(cw, s);
+            } else {
+                push(OBJECT | cw.addType(s));
+            }
+            break;
+        // case Opcodes.MULTIANEWARRAY:
+        default:
+            pop(arg);
+            push(cw, item.strVal1);
+            break;
+        }
+    }
+
+    /**
+     * Merges the input frame of the given basic block with the input and output
+     * frames of this basic block. Returns <tt>true</tt> if the input frame of
+     * the given label has been changed by this operation.
+     * 
+     * @param cw
+     *            the ClassWriter to which this label belongs.
+     * @param frame
+     *            the basic block whose input frame must be updated.
+     * @param edge
+     *            the kind of the {@link Edge} between this label and 'label'.
+     *            See {@link Edge#info}.
+     * @return <tt>true</tt> if the input frame of the given label has been
+     *         changed by this operation.
+     */
+    boolean merge(final ClassWriter cw, final Frame frame, final int edge) {
+        boolean changed = false;
+        int i, s, dim, kind, t;
+
+        int nLocal = inputLocals.length;
+        int nStack = inputStack.length;
+        if (frame.inputLocals == null) {
+            frame.inputLocals = new int[nLocal];
+            changed = true;
+        }
+
+        for (i = 0; i < nLocal; ++i) {
+            if (outputLocals != null && i < outputLocals.length) {
+                s = outputLocals[i];
+                if (s == 0) {
+                    t = inputLocals[i];
+                } else {
+                    dim = s & DIM;
+                    kind = s & KIND;
+                    if (kind == BASE) {
+                        t = s;
+                    } else {
+                        if (kind == LOCAL) {
+                            t = dim + inputLocals[s & VALUE];
+                        } else {
+                            t = dim + inputStack[nStack - (s & VALUE)];
+                        }
+                        if ((s & TOP_IF_LONG_OR_DOUBLE) != 0
+                                && (t == LONG || t == DOUBLE)) {
+                            t = TOP;
+                        }
+                    }
+                }
+            } else {
+                t = inputLocals[i];
+            }
+            if (initializations != null) {
+                t = init(cw, t);
+            }
+            changed |= merge(cw, t, frame.inputLocals, i);
+        }
+
+        if (edge > 0) {
+            for (i = 0; i < nLocal; ++i) {
+                t = inputLocals[i];
+                changed |= merge(cw, t, frame.inputLocals, i);
+            }
+            if (frame.inputStack == null) {
+                frame.inputStack = new int[1];
+                changed = true;
+            }
+            changed |= merge(cw, edge, frame.inputStack, 0);
+            return changed;
+        }
+
+        int nInputStack = inputStack.length + owner.inputStackTop;
+        if (frame.inputStack == null) {
+            frame.inputStack = new int[nInputStack + outputStackTop];
+            changed = true;
+        }
+
+        for (i = 0; i < nInputStack; ++i) {
+            t = inputStack[i];
+            if (initializations != null) {
+                t = init(cw, t);
+            }
+            changed |= merge(cw, t, frame.inputStack, i);
+        }
+        for (i = 0; i < outputStackTop; ++i) {
+            s = outputStack[i];
+            dim = s & DIM;
+            kind = s & KIND;
+            if (kind == BASE) {
+                t = s;
+            } else {
+                if (kind == LOCAL) {
+                    t = dim + inputLocals[s & VALUE];
+                } else {
+                    t = dim + inputStack[nStack - (s & VALUE)];
+                }
+                if ((s & TOP_IF_LONG_OR_DOUBLE) != 0
+                        && (t == LONG || t == DOUBLE)) {
+                    t = TOP;
+                }
+            }
+            if (initializations != null) {
+                t = init(cw, t);
+            }
+            changed |= merge(cw, t, frame.inputStack, nInputStack + i);
+        }
+        return changed;
+    }
+
+    /**
+     * Merges the type at the given index in the given type array with the given
+     * type. Returns <tt>true</tt> if the type array has been modified by this
+     * operation.
+     * 
+     * @param cw
+     *            the ClassWriter to which this label belongs.
+     * @param t
+     *            the type with which the type array element must be merged.
+     * @param types
+     *            an array of types.
+     * @param index
+     *            the index of the type that must be merged in 'types'.
+     * @return <tt>true</tt> if the type array has been modified by this
+     *         operation.
+     */
+    private static boolean merge(final ClassWriter cw, int t,
+            final int[] types, final int index) {
+        int u = types[index];
+        if (u == t) {
+            // if the types are equal, merge(u,t)=u, so there is no change
+            return false;
+        }
+        if ((t & ~DIM) == NULL) {
+            if (u == NULL) {
+                return false;
+            }
+            t = NULL;
+        }
+        if (u == 0) {
+            // if types[index] has never been assigned, merge(u,t)=t
+            types[index] = t;
+            return true;
+        }
+        int v;
+        if ((u & BASE_KIND) == OBJECT || (u & DIM) != 0) {
+            // if u is a reference type of any dimension
+            if (t == NULL) {
+                // if t is the NULL type, merge(u,t)=u, so there is no change
+                return false;
+            } else if ((t & (DIM | BASE_KIND)) == (u & (DIM | BASE_KIND))) {
+                if ((u & BASE_KIND) == OBJECT) {
+                    // if t is also a reference type, and if u and t have the
+                    // same dimension merge(u,t) = dim(t) | common parent of the
+                    // element types of u and t
+                    v = (t & DIM) | OBJECT
+                            | cw.getMergedType(t & BASE_VALUE, u & BASE_VALUE);
+                } else {
+                    // if u and t are array types, but not with the same element
+                    // type, merge(u,t)=java/lang/Object
+                    v = OBJECT | cw.addType("java/lang/Object");
+                }
+            } else if ((t & BASE_KIND) == OBJECT || (t & DIM) != 0) {
+                // if t is any other reference or array type,
+                // merge(u,t)=java/lang/Object
+                v = OBJECT | cw.addType("java/lang/Object");
+            } else {
+                // if t is any other type, merge(u,t)=TOP
+                v = TOP;
+            }
+        } else if (u == NULL) {
+            // if u is the NULL type, merge(u,t)=t,
+            // or TOP if t is not a reference type
+            v = (t & BASE_KIND) == OBJECT || (t & DIM) != 0 ? t : TOP;
+        } else {
+            // if u is any other type, merge(u,t)=TOP whatever t
+            v = TOP;
+        }
+        if (u != v) {
+            types[index] = v;
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/Handle.java b/src/main/asm/org/objectweb/asm/Handle.java
new file mode 100644
index 0000000..a627911
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/Handle.java
@@ -0,0 +1,170 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.objectweb.asm;
+
+/**
+ * A reference to a field or a method.
+ * 
+ * @author Remi Forax
+ * @author Eric Bruneton
+ */
+public final class Handle {
+
+    /**
+     * The kind of field or method designated by this Handle. Should be
+     * {@link Opcodes#H_GETFIELD}, {@link Opcodes#H_GETSTATIC},
+     * {@link Opcodes#H_PUTFIELD}, {@link Opcodes#H_PUTSTATIC},
+     * {@link Opcodes#H_INVOKEVIRTUAL}, {@link Opcodes#H_INVOKESTATIC},
+     * {@link Opcodes#H_INVOKESPECIAL}, {@link Opcodes#H_NEWINVOKESPECIAL} or
+     * {@link Opcodes#H_INVOKEINTERFACE}.
+     */
+    final int tag;
+
+    /**
+     * The internal name of the class that owns the field or method designated
+     * by this handle.
+     */
+    final String owner;
+
+    /**
+     * The name of the field or method designated by this handle.
+     */
+    final String name;
+
+    /**
+     * The descriptor of the field or method designated by this handle.
+     */
+    final String desc;
+
+    /**
+     * Constructs a new field or method handle.
+     * 
+     * @param tag
+     *            the kind of field or method designated by this Handle. Must be
+     *            {@link Opcodes#H_GETFIELD}, {@link Opcodes#H_GETSTATIC},
+     *            {@link Opcodes#H_PUTFIELD}, {@link Opcodes#H_PUTSTATIC},
+     *            {@link Opcodes#H_INVOKEVIRTUAL},
+     *            {@link Opcodes#H_INVOKESTATIC},
+     *            {@link Opcodes#H_INVOKESPECIAL},
+     *            {@link Opcodes#H_NEWINVOKESPECIAL} or
+     *            {@link Opcodes#H_INVOKEINTERFACE}.
+     * @param owner
+     *            the internal name of the class that owns the field or method
+     *            designated by this handle.
+     * @param name
+     *            the name of the field or method designated by this handle.
+     * @param desc
+     *            the descriptor of the field or method designated by this
+     *            handle.
+     */
+    public Handle(int tag, String owner, String name, String desc) {
+        this.tag = tag;
+        this.owner = owner;
+        this.name = name;
+        this.desc = desc;
+    }
+
+    /**
+     * Returns the kind of field or method designated by this handle.
+     * 
+     * @return {@link Opcodes#H_GETFIELD}, {@link Opcodes#H_GETSTATIC},
+     *         {@link Opcodes#H_PUTFIELD}, {@link Opcodes#H_PUTSTATIC},
+     *         {@link Opcodes#H_INVOKEVIRTUAL}, {@link Opcodes#H_INVOKESTATIC},
+     *         {@link Opcodes#H_INVOKESPECIAL},
+     *         {@link Opcodes#H_NEWINVOKESPECIAL} or
+     *         {@link Opcodes#H_INVOKEINTERFACE}.
+     */
+    public int getTag() {
+        return tag;
+    }
+
+    /**
+     * Returns the internal name of the class that owns the field or method
+     * designated by this handle.
+     * 
+     * @return the internal name of the class that owns the field or method
+     *         designated by this handle.
+     */
+    public String getOwner() {
+        return owner;
+    }
+
+    /**
+     * Returns the name of the field or method designated by this handle.
+     * 
+     * @return the name of the field or method designated by this handle.
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Returns the descriptor of the field or method designated by this handle.
+     * 
+     * @return the descriptor of the field or method designated by this handle.
+     */
+    public String getDesc() {
+        return desc;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == this) {
+            return true;
+        }
+        if (!(obj instanceof Handle)) {
+            return false;
+        }
+        Handle h = (Handle) obj;
+        return tag == h.tag && owner.equals(h.owner) && name.equals(h.name)
+                && desc.equals(h.desc);
+    }
+
+    @Override
+    public int hashCode() {
+        return tag + owner.hashCode() * name.hashCode() * desc.hashCode();
+    }
+
+    /**
+     * Returns the textual representation of this handle. The textual
+     * representation is:
+     * 
+     * <pre>
+     * owner '.' name desc ' ' '(' tag ')'
+     * </pre>
+     * 
+     * . As this format is unambiguous, it can be parsed if necessary.
+     */
+    @Override
+    public String toString() {
+        return owner + '.' + name + desc + " (" + tag + ')';
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/Handler.java b/src/main/asm/org/objectweb/asm/Handler.java
new file mode 100644
index 0000000..b24591d
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/Handler.java
@@ -0,0 +1,121 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm;
+
+/**
+ * Information about an exception handler block.
+ * 
+ * @author Eric Bruneton
+ */
+class Handler {
+
+    /**
+     * Beginning of the exception handler's scope (inclusive).
+     */
+    Label start;
+
+    /**
+     * End of the exception handler's scope (exclusive).
+     */
+    Label end;
+
+    /**
+     * Beginning of the exception handler's code.
+     */
+    Label handler;
+
+    /**
+     * Internal name of the type of exceptions handled by this handler, or
+     * <tt>null</tt> to catch any exceptions.
+     */
+    String desc;
+
+    /**
+     * Constant pool index of the internal name of the type of exceptions
+     * handled by this handler, or 0 to catch any exceptions.
+     */
+    int type;
+
+    /**
+     * Next exception handler block info.
+     */
+    Handler next;
+
+    /**
+     * Removes the range between start and end from the given exception
+     * handlers.
+     * 
+     * @param h
+     *            an exception handler list.
+     * @param start
+     *            the start of the range to be removed.
+     * @param end
+     *            the end of the range to be removed. Maybe null.
+     * @return the exception handler list with the start-end range removed.
+     */
+    static Handler remove(Handler h, Label start, Label end) {
+        if (h == null) {
+            return null;
+        } else {
+            h.next = remove(h.next, start, end);
+        }
+        int hstart = h.start.position;
+        int hend = h.end.position;
+        int s = start.position;
+        int e = end == null ? Integer.MAX_VALUE : end.position;
+        // if [hstart,hend[ and [s,e[ intervals intersect...
+        if (s < hend && e > hstart) {
+            if (s <= hstart) {
+                if (e >= hend) {
+                    // [hstart,hend[ fully included in [s,e[, h removed
+                    h = h.next;
+                } else {
+                    // [hstart,hend[ minus [s,e[ = [e,hend[
+                    h.start = end;
+                }
+            } else if (e >= hend) {
+                // [hstart,hend[ minus [s,e[ = [hstart,s[
+                h.end = start;
+            } else {
+                // [hstart,hend[ minus [s,e[ = [hstart,s[ + [e,hend[
+                Handler g = new Handler();
+                g.start = end;
+                g.end = h.end;
+                g.handler = h.handler;
+                g.desc = h.desc;
+                g.type = h.type;
+                g.next = h.next;
+                h.end = start;
+                h.next = g;
+            }
+        }
+        return h;
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/Item.java b/src/main/asm/org/objectweb/asm/Item.java
new file mode 100644
index 0000000..c25b7b7
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/Item.java
@@ -0,0 +1,311 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm;
+
+/**
+ * A constant pool item. Constant pool items can be created with the 'newXXX'
+ * methods in the {@link ClassWriter} class.
+ * 
+ * @author Eric Bruneton
+ */
+final class Item {
+
+    /**
+     * Index of this item in the constant pool.
+     */
+    int index;
+
+    /**
+     * Type of this constant pool item. A single class is used to represent all
+     * constant pool item types, in order to minimize the bytecode size of this
+     * package. The value of this field is one of {@link ClassWriter#INT},
+     * {@link ClassWriter#LONG}, {@link ClassWriter#FLOAT},
+     * {@link ClassWriter#DOUBLE}, {@link ClassWriter#UTF8},
+     * {@link ClassWriter#STR}, {@link ClassWriter#CLASS},
+     * {@link ClassWriter#NAME_TYPE}, {@link ClassWriter#FIELD},
+     * {@link ClassWriter#METH}, {@link ClassWriter#IMETH},
+     * {@link ClassWriter#MTYPE}, {@link ClassWriter#INDY}.
+     * 
+     * MethodHandle constant 9 variations are stored using a range of 9 values
+     * from {@link ClassWriter#HANDLE_BASE} + 1 to
+     * {@link ClassWriter#HANDLE_BASE} + 9.
+     * 
+     * Special Item types are used for Items that are stored in the ClassWriter
+     * {@link ClassWriter#typeTable}, instead of the constant pool, in order to
+     * avoid clashes with normal constant pool items in the ClassWriter constant
+     * pool's hash table. These special item types are
+     * {@link ClassWriter#TYPE_NORMAL}, {@link ClassWriter#TYPE_UNINIT} and
+     * {@link ClassWriter#TYPE_MERGED}.
+     */
+    int type;
+
+    /**
+     * Value of this item, for an integer item.
+     */
+    int intVal;
+
+    /**
+     * Value of this item, for a long item.
+     */
+    long longVal;
+
+    /**
+     * First part of the value of this item, for items that do not hold a
+     * primitive value.
+     */
+    String strVal1;
+
+    /**
+     * Second part of the value of this item, for items that do not hold a
+     * primitive value.
+     */
+    String strVal2;
+
+    /**
+     * Third part of the value of this item, for items that do not hold a
+     * primitive value.
+     */
+    String strVal3;
+
+    /**
+     * The hash code value of this constant pool item.
+     */
+    int hashCode;
+
+    /**
+     * Link to another constant pool item, used for collision lists in the
+     * constant pool's hash table.
+     */
+    Item next;
+
+    /**
+     * Constructs an uninitialized {@link Item}.
+     */
+    Item() {
+    }
+
+    /**
+     * Constructs an uninitialized {@link Item} for constant pool element at
+     * given position.
+     * 
+     * @param index
+     *            index of the item to be constructed.
+     */
+    Item(final int index) {
+        this.index = index;
+    }
+
+    /**
+     * Constructs a copy of the given item.
+     * 
+     * @param index
+     *            index of the item to be constructed.
+     * @param i
+     *            the item that must be copied into the item to be constructed.
+     */
+    Item(final int index, final Item i) {
+        this.index = index;
+        type = i.type;
+        intVal = i.intVal;
+        longVal = i.longVal;
+        strVal1 = i.strVal1;
+        strVal2 = i.strVal2;
+        strVal3 = i.strVal3;
+        hashCode = i.hashCode;
+    }
+
+    /**
+     * Sets this item to an integer item.
+     * 
+     * @param intVal
+     *            the value of this item.
+     */
+    void set(final int intVal) {
+        this.type = ClassWriter.INT;
+        this.intVal = intVal;
+        this.hashCode = 0x7FFFFFFF & (type + intVal);
+    }
+
+    /**
+     * Sets this item to a long item.
+     * 
+     * @param longVal
+     *            the value of this item.
+     */
+    void set(final long longVal) {
+        this.type = ClassWriter.LONG;
+        this.longVal = longVal;
+        this.hashCode = 0x7FFFFFFF & (type + (int) longVal);
+    }
+
+    /**
+     * Sets this item to a float item.
+     * 
+     * @param floatVal
+     *            the value of this item.
+     */
+    void set(final float floatVal) {
+        this.type = ClassWriter.FLOAT;
+        this.intVal = Float.floatToRawIntBits(floatVal);
+        this.hashCode = 0x7FFFFFFF & (type + (int) floatVal);
+    }
+
+    /**
+     * Sets this item to a double item.
+     * 
+     * @param doubleVal
+     *            the value of this item.
+     */
+    void set(final double doubleVal) {
+        this.type = ClassWriter.DOUBLE;
+        this.longVal = Double.doubleToRawLongBits(doubleVal);
+        this.hashCode = 0x7FFFFFFF & (type + (int) doubleVal);
+    }
+
+    /**
+     * Sets this item to an item that do not hold a primitive value.
+     * 
+     * @param type
+     *            the type of this item.
+     * @param strVal1
+     *            first part of the value of this item.
+     * @param strVal2
+     *            second part of the value of this item.
+     * @param strVal3
+     *            third part of the value of this item.
+     */
+    void set(final int type, final String strVal1, final String strVal2,
+            final String strVal3) {
+        this.type = type;
+        this.strVal1 = strVal1;
+        this.strVal2 = strVal2;
+        this.strVal3 = strVal3;
+        switch (type) {
+        case ClassWriter.UTF8:
+        case ClassWriter.STR:
+        case ClassWriter.CLASS:
+        case ClassWriter.MTYPE:
+        case ClassWriter.TYPE_NORMAL:
+            hashCode = 0x7FFFFFFF & (type + strVal1.hashCode());
+            return;
+        case ClassWriter.NAME_TYPE: {
+            hashCode = 0x7FFFFFFF & (type + strVal1.hashCode()
+                    * strVal2.hashCode());
+            return;
+        }
+        // ClassWriter.FIELD:
+        // ClassWriter.METH:
+        // ClassWriter.IMETH:
+        // ClassWriter.HANDLE_BASE + 1..9
+        default:
+            hashCode = 0x7FFFFFFF & (type + strVal1.hashCode()
+                    * strVal2.hashCode() * strVal3.hashCode());
+        }
+    }
+
+    /**
+     * Sets the item to an InvokeDynamic item.
+     * 
+     * @param name
+     *            invokedynamic's name.
+     * @param desc
+     *            invokedynamic's desc.
+     * @param bsmIndex
+     *            zero based index into the class attribute BootrapMethods.
+     */
+    void set(String name, String desc, int bsmIndex) {
+        this.type = ClassWriter.INDY;
+        this.longVal = bsmIndex;
+        this.strVal1 = name;
+        this.strVal2 = desc;
+        this.hashCode = 0x7FFFFFFF & (ClassWriter.INDY + bsmIndex
+                * strVal1.hashCode() * strVal2.hashCode());
+    }
+
+    /**
+     * Sets the item to a BootstrapMethod item.
+     * 
+     * @param position
+     *            position in byte in the class attribute BootrapMethods.
+     * @param hashCode
+     *            hashcode of the item. This hashcode is processed from the
+     *            hashcode of the bootstrap method and the hashcode of all
+     *            bootstrap arguments.
+     */
+    void set(int position, int hashCode) {
+        this.type = ClassWriter.BSM;
+        this.intVal = position;
+        this.hashCode = hashCode;
+    }
+
+    /**
+     * Indicates if the given item is equal to this one. <i>This method assumes
+     * that the two items have the same {@link #type}</i>.
+     * 
+     * @param i
+     *            the item to be compared to this one. Both items must have the
+     *            same {@link #type}.
+     * @return <tt>true</tt> if the given item if equal to this one,
+     *         <tt>false</tt> otherwise.
+     */
+    boolean isEqualTo(final Item i) {
+        switch (type) {
+        case ClassWriter.UTF8:
+        case ClassWriter.STR:
+        case ClassWriter.CLASS:
+        case ClassWriter.MTYPE:
+        case ClassWriter.TYPE_NORMAL:
+            return i.strVal1.equals(strVal1);
+        case ClassWriter.TYPE_MERGED:
+        case ClassWriter.LONG:
+        case ClassWriter.DOUBLE:
+            return i.longVal == longVal;
+        case ClassWriter.INT:
+        case ClassWriter.FLOAT:
+            return i.intVal == intVal;
+        case ClassWriter.TYPE_UNINIT:
+            return i.intVal == intVal && i.strVal1.equals(strVal1);
+        case ClassWriter.NAME_TYPE:
+            return i.strVal1.equals(strVal1) && i.strVal2.equals(strVal2);
+        case ClassWriter.INDY: {
+            return i.longVal == longVal && i.strVal1.equals(strVal1)
+                    && i.strVal2.equals(strVal2);
+        }
+        // case ClassWriter.FIELD:
+        // case ClassWriter.METH:
+        // case ClassWriter.IMETH:
+        // case ClassWriter.HANDLE_BASE + 1..9
+        default:
+            return i.strVal1.equals(strVal1) && i.strVal2.equals(strVal2)
+                    && i.strVal3.equals(strVal3);
+        }
+    }
+
+}
diff --git a/src/main/asm/org/objectweb/asm/Label.java b/src/main/asm/org/objectweb/asm/Label.java
new file mode 100644
index 0000000..1c4de30
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/Label.java
@@ -0,0 +1,560 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm;
+
+/**
+ * A label represents a position in the bytecode of a method. Labels are used
+ * for jump, goto, and switch instructions, and for try catch blocks. A label
+ * designates the <i>instruction</i> that is just after. Note however that there
+ * can be other elements between a label and the instruction it designates (such
+ * as other labels, stack map frames, line numbers, etc.).
+ * 
+ * @author Eric Bruneton
+ */
+public class Label {
+
+    /**
+     * Indicates if this label is only used for debug attributes. Such a label
+     * is not the start of a basic block, the target of a jump instruction, or
+     * an exception handler. It can be safely ignored in control flow graph
+     * analysis algorithms (for optimization purposes).
+     */
+    static final int DEBUG = 1;
+
+    /**
+     * Indicates if the position of this label is known.
+     */
+    static final int RESOLVED = 2;
+
+    /**
+     * Indicates if this label has been updated, after instruction resizing.
+     */
+    static final int RESIZED = 4;
+
+    /**
+     * Indicates if this basic block has been pushed in the basic block stack.
+     * See {@link MethodWriter#visitMaxs visitMaxs}.
+     */
+    static final int PUSHED = 8;
+
+    /**
+     * Indicates if this label is the target of a jump instruction, or the start
+     * of an exception handler.
+     */
+    static final int TARGET = 16;
+
+    /**
+     * Indicates if a stack map frame must be stored for this label.
+     */
+    static final int STORE = 32;
+
+    /**
+     * Indicates if this label corresponds to a reachable basic block.
+     */
+    static final int REACHABLE = 64;
+
+    /**
+     * Indicates if this basic block ends with a JSR instruction.
+     */
+    static final int JSR = 128;
+
+    /**
+     * Indicates if this basic block ends with a RET instruction.
+     */
+    static final int RET = 256;
+
+    /**
+     * Indicates if this basic block is the start of a subroutine.
+     */
+    static final int SUBROUTINE = 512;
+
+    /**
+     * Indicates if this subroutine basic block has been visited by a
+     * visitSubroutine(null, ...) call.
+     */
+    static final int VISITED = 1024;
+
+    /**
+     * Indicates if this subroutine basic block has been visited by a
+     * visitSubroutine(!null, ...) call.
+     */
+    static final int VISITED2 = 2048;
+
+    /**
+     * Field used to associate user information to a label. Warning: this field
+     * is used by the ASM tree package. In order to use it with the ASM tree
+     * package you must override the
+     * {@link org.objectweb.asm.tree.MethodNode#getLabelNode} method.
+     */
+    public Object info;
+
+    /**
+     * Flags that indicate the status of this label.
+     * 
+     * @see #DEBUG
+     * @see #RESOLVED
+     * @see #RESIZED
+     * @see #PUSHED
+     * @see #TARGET
+     * @see #STORE
+     * @see #REACHABLE
+     * @see #JSR
+     * @see #RET
+     */
+    int status;
+
+    /**
+     * The line number corresponding to this label, if known.
+     */
+    int line;
+
+    /**
+     * The position of this label in the code, if known.
+     */
+    int position;
+
+    /**
+     * Number of forward references to this label, times two.
+     */
+    private int referenceCount;
+
+    /**
+     * Informations about forward references. Each forward reference is
+     * described by two consecutive integers in this array: the first one is the
+     * position of the first byte of the bytecode instruction that contains the
+     * forward reference, while the second is the position of the first byte of
+     * the forward reference itself. In fact the sign of the first integer
+     * indicates if this reference uses 2 or 4 bytes, and its absolute value
+     * gives the position of the bytecode instruction. This array is also used
+     * as a bitset to store the subroutines to which a basic block belongs. This
+     * information is needed in {@linked MethodWriter#visitMaxs}, after all
+     * forward references have been resolved. Hence the same array can be used
+     * for both purposes without problems.
+     */
+    private int[] srcAndRefPositions;
+
+    // ------------------------------------------------------------------------
+
+    /*
+     * Fields for the control flow and data flow graph analysis algorithms (used
+     * to compute the maximum stack size or the stack map frames). A control
+     * flow graph contains one node per "basic block", and one edge per "jump"
+     * from one basic block to another. Each node (i.e., each basic block) is
+     * represented by the Label object that corresponds to the first instruction
+     * of this basic block. Each node also stores the list of its successors in
+     * the graph, as a linked list of Edge objects.
+     * 
+     * The control flow analysis algorithms used to compute the maximum stack
+     * size or the stack map frames are similar and use two steps. The first
+     * step, during the visit of each instruction, builds information about the
+     * state of the local variables and the operand stack at the end of each
+     * basic block, called the "output frame", <i>relatively</i> to the frame
+     * state at the beginning of the basic block, which is called the "input
+     * frame", and which is <i>unknown</i> during this step. The second step, in
+     * {@link MethodWriter#visitMaxs}, is a fix point algorithm that computes
+     * information about the input frame of each basic block, from the input
+     * state of the first basic block (known from the method signature), and by
+     * the using the previously computed relative output frames.
+     * 
+     * The algorithm used to compute the maximum stack size only computes the
+     * relative output and absolute input stack heights, while the algorithm
+     * used to compute stack map frames computes relative output frames and
+     * absolute input frames.
+     */
+
+    /**
+     * Start of the output stack relatively to the input stack. The exact
+     * semantics of this field depends on the algorithm that is used.
+     * 
+     * When only the maximum stack size is computed, this field is the number of
+     * elements in the input stack.
+     * 
+     * When the stack map frames are completely computed, this field is the
+     * offset of the first output stack element relatively to the top of the
+     * input stack. This offset is always negative or null. A null offset means
+     * that the output stack must be appended to the input stack. A -n offset
+     * means that the first n output stack elements must replace the top n input
+     * stack elements, and that the other elements must be appended to the input
+     * stack.
+     */
+    int inputStackTop;
+
+    /**
+     * Maximum height reached by the output stack, relatively to the top of the
+     * input stack. This maximum is always positive or null.
+     */
+    int outputStackMax;
+
+    /**
+     * Information about the input and output stack map frames of this basic
+     * block. This field is only used when {@link ClassWriter#COMPUTE_FRAMES}
+     * option is used.
+     */
+    Frame frame;
+
+    /**
+     * The successor of this label, in the order they are visited. This linked
+     * list does not include labels used for debug info only. If
+     * {@link ClassWriter#COMPUTE_FRAMES} option is used then, in addition, it
+     * does not contain successive labels that denote the same bytecode position
+     * (in this case only the first label appears in this list).
+     */
+    Label successor;
+
+    /**
+     * The successors of this node in the control flow graph. These successors
+     * are stored in a linked list of {@link Edge Edge} objects, linked to each
+     * other by their {@link Edge#next} field.
+     */
+    Edge successors;
+
+    /**
+     * The next basic block in the basic block stack. This stack is used in the
+     * main loop of the fix point algorithm used in the second step of the
+     * control flow analysis algorithms. It is also used in
+     * {@link #visitSubroutine} to avoid using a recursive method.
+     * 
+     * @see MethodWriter#visitMaxs
+     */
+    Label next;
+
+    // ------------------------------------------------------------------------
+    // Constructor
+    // ------------------------------------------------------------------------
+
+    /**
+     * Constructs a new label.
+     */
+    public Label() {
+    }
+
+    // ------------------------------------------------------------------------
+    // Methods to compute offsets and to manage forward references
+    // ------------------------------------------------------------------------
+
+    /**
+     * Returns the offset corresponding to this label. This offset is computed
+     * from the start of the method's bytecode. <i>This method is intended for
+     * {@link Attribute} sub classes, and is normally not needed by class
+     * generators or adapters.</i>
+     * 
+     * @return the offset corresponding to this label.
+     * @throws IllegalStateException
+     *             if this label is not resolved yet.
+     */
+    public int getOffset() {
+        if ((status & RESOLVED) == 0) {
+            throw new IllegalStateException(
+                    "Label offset position has not been resolved yet");
+        }
+        return position;
+    }
+
+    /**
+     * Puts a reference to this label in the bytecode of a method. If the
+     * position of the label is known, the offset is computed and written
+     * directly. Otherwise, a null offset is written and a new forward reference
+     * is declared for this label.
+     * 
+     * @param owner
+     *            the code writer that calls this method.
+     * @param out
+     *            the bytecode of the method.
+     * @param source
+     *            the position of first byte of the bytecode instruction that
+     *            contains this label.
+     * @param wideOffset
+     *            <tt>true</tt> if the reference must be stored in 4 bytes, or
+     *            <tt>false</tt> if it must be stored with 2 bytes.
+     * @throws IllegalArgumentException
+     *             if this label has not been created by the given code writer.
+     */
+    void put(final MethodWriter owner, final ByteVector out, final int source,
+            final boolean wideOffset) {
+        if ((status & RESOLVED) == 0) {
+            if (wideOffset) {
+                addReference(-1 - source, out.length);
+                out.putInt(-1);
+            } else {
+                addReference(source, out.length);
+                out.putShort(-1);
+            }
+        } else {
+            if (wideOffset) {
+                out.putInt(position - source);
+            } else {
+                out.putShort(position - source);
+            }
+        }
+    }
+
+    /**
+     * Adds a forward reference to this label. This method must be called only
+     * for a true forward reference, i.e. only if this label is not resolved
+     * yet. For backward references, the offset of the reference can be, and
+     * must be, computed and stored directly.
+     * 
+     * @param sourcePosition
+     *            the position of the referencing instruction. This position
+     *            will be used to compute the offset of this forward reference.
+     * @param referencePosition
+     *            the position where the offset for this forward reference must
+     *            be stored.
+     */
+    private void addReference(final int sourcePosition,
+            final int referencePosition) {
+        if (srcAndRefPositions == null) {
+            srcAndRefPositions = new int[6];
+        }
+        if (referenceCount >= srcAndRefPositions.length) {
+            int[] a = new int[srcAndRefPositions.length + 6];
+            System.arraycopy(srcAndRefPositions, 0, a, 0,
+                    srcAndRefPositions.length);
+            srcAndRefPositions = a;
+        }
+        srcAndRefPositions[referenceCount++] = sourcePosition;
+        srcAndRefPositions[referenceCount++] = referencePosition;
+    }
+
+    /**
+     * Resolves all forward references to this label. This method must be called
+     * when this label is added to the bytecode of the method, i.e. when its
+     * position becomes known. This method fills in the blanks that where left
+     * in the bytecode by each forward reference previously added to this label.
+     * 
+     * @param owner
+     *            the code writer that calls this method.
+     * @param position
+     *            the position of this label in the bytecode.
+     * @param data
+     *            the bytecode of the method.
+     * @return <tt>true</tt> if a blank that was left for this label was to
+     *         small to store the offset. In such a case the corresponding jump
+     *         instruction is replaced with a pseudo instruction (using unused
+     *         opcodes) using an unsigned two bytes offset. These pseudo
+     *         instructions will need to be replaced with true instructions with
+     *         wider offsets (4 bytes instead of 2). This is done in
+     *         {@link MethodWriter#resizeInstructions}.
+     * @throws IllegalArgumentException
+     *             if this label has already been resolved, or if it has not
+     *             been created by the given code writer.
+     */
+    boolean resolve(final MethodWriter owner, final int position,
+            final byte[] data) {
+        boolean needUpdate = false;
+        this.status |= RESOLVED;
+        this.position = position;
+        int i = 0;
+        while (i < referenceCount) {
+            int source = srcAndRefPositions[i++];
+            int reference = srcAndRefPositions[i++];
+            int offset;
+            if (source >= 0) {
+                offset = position - source;
+                if (offset < Short.MIN_VALUE || offset > Short.MAX_VALUE) {
+                    /*
+                     * changes the opcode of the jump instruction, in order to
+                     * be able to find it later (see resizeInstructions in
+                     * MethodWriter). These temporary opcodes are similar to
+                     * jump instruction opcodes, except that the 2 bytes offset
+                     * is unsigned (and can therefore represent values from 0 to
+                     * 65535, which is sufficient since the size of a method is
+                     * limited to 65535 bytes).
+                     */
+                    int opcode = data[reference - 1] & 0xFF;
+                    if (opcode <= Opcodes.JSR) {
+                        // changes IFEQ ... JSR to opcodes 202 to 217
+                        data[reference - 1] = (byte) (opcode + 49);
+                    } else {
+                        // changes IFNULL and IFNONNULL to opcodes 218 and 219
+                        data[reference - 1] = (byte) (opcode + 20);
+                    }
+                    needUpdate = true;
+                }
+                data[reference++] = (byte) (offset >>> 8);
+                data[reference] = (byte) offset;
+            } else {
+                offset = position + source + 1;
+                data[reference++] = (byte) (offset >>> 24);
+                data[reference++] = (byte) (offset >>> 16);
+                data[reference++] = (byte) (offset >>> 8);
+                data[reference] = (byte) offset;
+            }
+        }
+        return needUpdate;
+    }
+
+    /**
+     * Returns the first label of the series to which this label belongs. For an
+     * isolated label or for the first label in a series of successive labels,
+     * this method returns the label itself. For other labels it returns the
+     * first label of the series.
+     * 
+     * @return the first label of the series to which this label belongs.
+     */
+    Label getFirst() {
+        return !ClassReader.FRAMES || frame == null ? this : frame.owner;
+    }
+
+    // ------------------------------------------------------------------------
+    // Methods related to subroutines
+    // ------------------------------------------------------------------------
+
+    /**
+     * Returns true is this basic block belongs to the given subroutine.
+     * 
+     * @param id
+     *            a subroutine id.
+     * @return true is this basic block belongs to the given subroutine.
+     */
+    boolean inSubroutine(final long id) {
+        if ((status & Label.VISITED) != 0) {
+            return (srcAndRefPositions[(int) (id >>> 32)] & (int) id) != 0;
+        }
+        return false;
+    }
+
+    /**
+     * Returns true if this basic block and the given one belong to a common
+     * subroutine.
+     * 
+     * @param block
+     *            another basic block.
+     * @return true if this basic block and the given one belong to a common
+     *         subroutine.
+     */
+    boolean inSameSubroutine(final Label block) {
+        if ((status & VISITED) == 0 || (block.status & VISITED) == 0) {
+            return false;
+        }
+        for (int i = 0; i < srcAndRefPositions.length; ++i) {
+            if ((srcAndRefPositions[i] & block.srcAndRefPositions[i]) != 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Marks this basic block as belonging to the given subroutine.
+     * 
+     * @param id
+     *            a subroutine id.
+     * @param nbSubroutines
+     *            the total number of subroutines in the method.
+     */
+    void addToSubroutine(final long id, final int nbSubroutines) {
+        if ((status & VISITED) == 0) {
+            status |= VISITED;
+            srcAndRefPositions = new int[(nbSubroutines - 1) / 32 + 1];
+        }
+        srcAndRefPositions[(int) (id >>> 32)] |= (int) id;
+    }
+
+    /**
+     * Finds the basic blocks that belong to a given subroutine, and marks these
+     * blocks as belonging to this subroutine. This method follows the control
+     * flow graph to find all the blocks that are reachable from the current
+     * block WITHOUT following any JSR target.
+     * 
+     * @param JSR
+     *            a JSR block that jumps to this subroutine. If this JSR is not
+     *            null it is added to the successor of the RET blocks found in
+     *            the subroutine.
+     * @param id
+     *            the id of this subroutine.
+     * @param nbSubroutines
+     *            the total number of subroutines in the method.
+     */
+    void visitSubroutine(final Label JSR, final long id, final int nbSubroutines) {
+        // user managed stack of labels, to avoid using a recursive method
+        // (recursivity can lead to stack overflow with very large methods)
+        Label stack = this;
+        while (stack != null) {
+            // removes a label l from the stack
+            Label l = stack;
+            stack = l.next;
+            l.next = null;
+
+            if (JSR != null) {
+                if ((l.status & VISITED2) != 0) {
+                    continue;
+                }
+                l.status |= VISITED2;
+                // adds JSR to the successors of l, if it is a RET block
+                if ((l.status & RET) != 0) {
+                    if (!l.inSameSubroutine(JSR)) {
+                        Edge e = new Edge();
+                        e.info = l.inputStackTop;
+                        e.successor = JSR.successors.successor;
+                        e.next = l.successors;
+                        l.successors = e;
+                    }
+                }
+            } else {
+                // if the l block already belongs to subroutine 'id', continue
+                if (l.inSubroutine(id)) {
+                    continue;
+                }
+                // marks the l block as belonging to subroutine 'id'
+                l.addToSubroutine(id, nbSubroutines);
+            }
+            // pushes each successor of l on the stack, except JSR targets
+            Edge e = l.successors;
+            while (e != null) {
+                // if the l block is a JSR block, then 'l.successors.next' leads
+                // to the JSR target (see {@link #visitJumpInsn}) and must
+                // therefore not be followed
+                if ((l.status & Label.JSR) == 0 || e != l.successors.next) {
+                    // pushes e.successor on the stack if it not already added
+                    if (e.successor.next == null) {
+                        e.successor.next = stack;
+                        stack = e.successor;
+                    }
+                }
+                e = e.next;
+            }
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // Overriden Object methods
+    // ------------------------------------------------------------------------
+
+    /**
+     * Returns a string representation of this label.
+     * 
+     * @return a string representation of this label.
+     */
+    @Override
+    public String toString() {
+        return "L" + System.identityHashCode(this);
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/MethodVisitor.java b/src/main/asm/org/objectweb/asm/MethodVisitor.java
new file mode 100644
index 0000000..bd26721
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/MethodVisitor.java
@@ -0,0 +1,662 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm;
+
+/**
+ * A visitor to visit a Java method. The methods of this class must be called in
+ * the following order: [ <tt>visitAnnotationDefault</tt> ] (
+ * <tt>visitAnnotation</tt> | <tt>visitParameterAnnotation</tt> |
+ * <tt>visitAttribute</tt> )* [ <tt>visitCode</tt> ( <tt>visitFrame</tt> |
+ * <tt>visit</tt><i>X</i>Insn</tt> | <tt>visitLabel</tt> |
+ * <tt>visitTryCatchBlock</tt> | <tt>visitLocalVariable</tt> |
+ * <tt>visitLineNumber</tt> )* <tt>visitMaxs</tt> ] <tt>visitEnd</tt>. In
+ * addition, the <tt>visit</tt><i>X</i>Insn</tt> and <tt>visitLabel</tt> methods
+ * must be called in the sequential order of the bytecode instructions of the
+ * visited code, <tt>visitTryCatchBlock</tt> must be called <i>before</i> the
+ * labels passed as arguments have been visited, and the
+ * <tt>visitLocalVariable</tt> and <tt>visitLineNumber</tt> methods must be
+ * called <i>after</i> the labels passed as arguments have been visited.
+ * 
+ * @author Eric Bruneton
+ */
+public abstract class MethodVisitor {
+
+    /**
+     * The ASM API version implemented by this visitor. The value of this field
+     * must be one of {@link Opcodes#ASM4}.
+     */
+    protected final int api;
+
+    /**
+     * The method visitor to which this visitor must delegate method calls. May
+     * be null.
+     */
+    protected MethodVisitor mv;
+
+    /**
+     * Constructs a new {@link MethodVisitor}.
+     * 
+     * @param api
+     *            the ASM API version implemented by this visitor. Must be one
+     *            of {@link Opcodes#ASM4}.
+     */
+    public MethodVisitor(final int api) {
+        this(api, null);
+    }
+
+    /**
+     * Constructs a new {@link MethodVisitor}.
+     * 
+     * @param api
+     *            the ASM API version implemented by this visitor. Must be one
+     *            of {@link Opcodes#ASM4}.
+     * @param mv
+     *            the method visitor to which this visitor must delegate method
+     *            calls. May be null.
+     */
+    public MethodVisitor(final int api, final MethodVisitor mv) {
+        if (api != Opcodes.ASM4) {
+            throw new IllegalArgumentException();
+        }
+        this.api = api;
+        this.mv = mv;
+    }
+
+    // -------------------------------------------------------------------------
+    // Annotations and non standard attributes
+    // -------------------------------------------------------------------------
+
+    /**
+     * Visits the default value of this annotation interface method.
+     * 
+     * @return a visitor to the visit the actual default value of this
+     *         annotation interface method, or <tt>null</tt> if this visitor is
+     *         not interested in visiting this default value. The 'name'
+     *         parameters passed to the methods of this annotation visitor are
+     *         ignored. Moreover, exacly one visit method must be called on this
+     *         annotation visitor, followed by visitEnd.
+     */
+    public AnnotationVisitor visitAnnotationDefault() {
+        if (mv != null) {
+            return mv.visitAnnotationDefault();
+        }
+        return null;
+    }
+
+    /**
+     * Visits an annotation of this method.
+     * 
+     * @param desc
+     *            the class descriptor of the annotation class.
+     * @param visible
+     *            <tt>true</tt> if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values, or <tt>null</tt> if
+     *         this visitor is not interested in visiting this annotation.
+     */
+    public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+        if (mv != null) {
+            return mv.visitAnnotation(desc, visible);
+        }
+        return null;
+    }
+
+    /**
+     * Visits an annotation of a parameter this method.
+     * 
+     * @param parameter
+     *            the parameter index.
+     * @param desc
+     *            the class descriptor of the annotation class.
+     * @param visible
+     *            <tt>true</tt> if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values, or <tt>null</tt> if
+     *         this visitor is not interested in visiting this annotation.
+     */
+    public AnnotationVisitor visitParameterAnnotation(int parameter,
+            String desc, boolean visible) {
+        if (mv != null) {
+            return mv.visitParameterAnnotation(parameter, desc, visible);
+        }
+        return null;
+    }
+
+    /**
+     * Visits a non standard attribute of this method.
+     * 
+     * @param attr
+     *            an attribute.
+     */
+    public void visitAttribute(Attribute attr) {
+        if (mv != null) {
+            mv.visitAttribute(attr);
+        }
+    }
+
+    /**
+     * Starts the visit of the method's code, if any (i.e. non abstract method).
+     */
+    public void visitCode() {
+        if (mv != null) {
+            mv.visitCode();
+        }
+    }
+
+    /**
+     * Visits the current state of the local variables and operand stack
+     * elements. This method must(*) be called <i>just before</i> any
+     * instruction <b>i</b> that follows an unconditional branch instruction
+     * such as GOTO or THROW, that is the target of a jump instruction, or that
+     * starts an exception handler block. The visited types must describe the
+     * values of the local variables and of the operand stack elements <i>just
+     * before</i> <b>i</b> is executed.<br>
+     * <br>
+     * (*) this is mandatory only for classes whose version is greater than or
+     * equal to {@link Opcodes#V1_6 V1_6}. <br>
+     * <br>
+     * The frames of a method must be given either in expanded form, or in
+     * compressed form (all frames must use the same format, i.e. you must not
+     * mix expanded and compressed frames within a single method):
+     * <ul>
+     * <li>In expanded form, all frames must have the F_NEW type.</li>
+     * <li>In compressed form, frames are basically "deltas" from the state of
+     * the previous frame:
+     * <ul>
+     * <li>{@link Opcodes#F_SAME} representing frame with exactly the same
+     * locals as the previous frame and with the empty stack.</li>
+     * <li>{@link Opcodes#F_SAME1} representing frame with exactly the same
+     * locals as the previous frame and with single value on the stack (
+     * <code>nStack</code> is 1 and <code>stack[0]</code> contains value for the
+     * type of the stack item).</li>
+     * <li>{@link Opcodes#F_APPEND} representing frame with current locals are
+     * the same as the locals in the previous frame, except that additional
+     * locals are defined (<code>nLocal</code> is 1, 2 or 3 and
+     * <code>local</code> elements contains values representing added types).</li>
+     * <li>{@link Opcodes#F_CHOP} representing frame with current locals are the
+     * same as the locals in the previous frame, except that the last 1-3 locals
+     * are absent and with the empty stack (<code>nLocals</code> is 1, 2 or 3).</li>
+     * <li>{@link Opcodes#F_FULL} representing complete frame data.</li></li>
+     * </ul>
+     * </ul> <br>
+     * In both cases the first frame, corresponding to the method's parameters
+     * and access flags, is implicit and must not be visited. Also, it is
+     * illegal to visit two or more frames for the same code location (i.e., at
+     * least one instruction must be visited between two calls to visitFrame).
+     * 
+     * @param type
+     *            the type of this stack map frame. Must be
+     *            {@link Opcodes#F_NEW} for expanded frames, or
+     *            {@link Opcodes#F_FULL}, {@link Opcodes#F_APPEND},
+     *            {@link Opcodes#F_CHOP}, {@link Opcodes#F_SAME} or
+     *            {@link Opcodes#F_APPEND}, {@link Opcodes#F_SAME1} for
+     *            compressed frames.
+     * @param nLocal
+     *            the number of local variables in the visited frame.
+     * @param local
+     *            the local variable types in this frame. This array must not be
+     *            modified. Primitive types are represented by
+     *            {@link Opcodes#TOP}, {@link Opcodes#INTEGER},
+     *            {@link Opcodes#FLOAT}, {@link Opcodes#LONG},
+     *            {@link Opcodes#DOUBLE},{@link Opcodes#NULL} or
+     *            {@link Opcodes#UNINITIALIZED_THIS} (long and double are
+     *            represented by a single element). Reference types are
+     *            represented by String objects (representing internal names),
+     *            and uninitialized types by Label objects (this label
+     *            designates the NEW instruction that created this uninitialized
+     *            value).
+     * @param nStack
+     *            the number of operand stack elements in the visited frame.
+     * @param stack
+     *            the operand stack types in this frame. This array must not be
+     *            modified. Its content has the same format as the "local"
+     *            array.
+     * @throws IllegalStateException
+     *             if a frame is visited just after another one, without any
+     *             instruction between the two (unless this frame is a
+     *             Opcodes#F_SAME frame, in which case it is silently ignored).
+     */
+    public void visitFrame(int type, int nLocal, Object[] local, int nStack,
+            Object[] stack) {
+        if (mv != null) {
+            mv.visitFrame(type, nLocal, local, nStack, stack);
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // Normal instructions
+    // -------------------------------------------------------------------------
+
+    /**
+     * Visits a zero operand instruction.
+     * 
+     * @param opcode
+     *            the opcode of the instruction to be visited. This opcode is
+     *            either NOP, ACONST_NULL, ICONST_M1, ICONST_0, ICONST_1,
+     *            ICONST_2, ICONST_3, ICONST_4, ICONST_5, LCONST_0, LCONST_1,
+     *            FCONST_0, FCONST_1, FCONST_2, DCONST_0, DCONST_1, IALOAD,
+     *            LALOAD, FALOAD, DALOAD, AALOAD, BALOAD, CALOAD, SALOAD,
+     *            IASTORE, LASTORE, FASTORE, DASTORE, AASTORE, BASTORE, CASTORE,
+     *            SASTORE, POP, POP2, DUP, DUP_X1, DUP_X2, DUP2, DUP2_X1,
+     *            DUP2_X2, SWAP, IADD, LADD, FADD, DADD, ISUB, LSUB, FSUB, DSUB,
+     *            IMUL, LMUL, FMUL, DMUL, IDIV, LDIV, FDIV, DDIV, IREM, LREM,
+     *            FREM, DREM, INEG, LNEG, FNEG, DNEG, ISHL, LSHL, ISHR, LSHR,
+     *            IUSHR, LUSHR, IAND, LAND, IOR, LOR, IXOR, LXOR, I2L, I2F, I2D,
+     *            L2I, L2F, L2D, F2I, F2L, F2D, D2I, D2L, D2F, I2B, I2C, I2S,
+     *            LCMP, FCMPL, FCMPG, DCMPL, DCMPG, IRETURN, LRETURN, FRETURN,
+     *            DRETURN, ARETURN, RETURN, ARRAYLENGTH, ATHROW, MONITORENTER,
+     *            or MONITOREXIT.
+     */
+    public void visitInsn(int opcode) {
+        if (mv != null) {
+            mv.visitInsn(opcode);
+        }
+    }
+
+    /**
+     * Visits an instruction with a single int operand.
+     * 
+     * @param opcode
+     *            the opcode of the instruction to be visited. This opcode is
+     *            either BIPUSH, SIPUSH or NEWARRAY.
+     * @param operand
+     *            the operand of the instruction to be visited.<br>
+     *            When opcode is BIPUSH, operand value should be between
+     *            Byte.MIN_VALUE and Byte.MAX_VALUE.<br>
+     *            When opcode is SIPUSH, operand value should be between
+     *            Short.MIN_VALUE and Short.MAX_VALUE.<br>
+     *            When opcode is NEWARRAY, operand value should be one of
+     *            {@link Opcodes#T_BOOLEAN}, {@link Opcodes#T_CHAR},
+     *            {@link Opcodes#T_FLOAT}, {@link Opcodes#T_DOUBLE},
+     *            {@link Opcodes#T_BYTE}, {@link Opcodes#T_SHORT},
+     *            {@link Opcodes#T_INT} or {@link Opcodes#T_LONG}.
+     */
+    public void visitIntInsn(int opcode, int operand) {
+        if (mv != null) {
+            mv.visitIntInsn(opcode, operand);
+        }
+    }
+
+    /**
+     * Visits a local variable instruction. A local variable instruction is an
+     * instruction that loads or stores the value of a local variable.
+     * 
+     * @param opcode
+     *            the opcode of the local variable instruction to be visited.
+     *            This opcode is either ILOAD, LLOAD, FLOAD, DLOAD, ALOAD,
+     *            ISTORE, LSTORE, FSTORE, DSTORE, ASTORE or RET.
+     * @param var
+     *            the operand of the instruction to be visited. This operand is
+     *            the index of a local variable.
+     */
+    public void visitVarInsn(int opcode, int var) {
+        if (mv != null) {
+            mv.visitVarInsn(opcode, var);
+        }
+    }
+
+    /**
+     * Visits a type instruction. A type instruction is an instruction that
+     * takes the internal name of a class as parameter.
+     * 
+     * @param opcode
+     *            the opcode of the type instruction to be visited. This opcode
+     *            is either NEW, ANEWARRAY, CHECKCAST or INSTANCEOF.
+     * @param type
+     *            the operand of the instruction to be visited. This operand
+     *            must be the internal name of an object or array class (see
+     *            {@link Type#getInternalName() getInternalName}).
+     */
+    public void visitTypeInsn(int opcode, String type) {
+        if (mv != null) {
+            mv.visitTypeInsn(opcode, type);
+        }
+    }
+
+    /**
+     * Visits a field instruction. A field instruction is an instruction that
+     * loads or stores the value of a field of an object.
+     * 
+     * @param opcode
+     *            the opcode of the type instruction to be visited. This opcode
+     *            is either GETSTATIC, PUTSTATIC, GETFIELD or PUTFIELD.
+     * @param owner
+     *            the internal name of the field's owner class (see
+     *            {@link Type#getInternalName() getInternalName}).
+     * @param name
+     *            the field's name.
+     * @param desc
+     *            the field's descriptor (see {@link Type Type}).
+     */
+    public void visitFieldInsn(int opcode, String owner, String name,
+            String desc) {
+        if (mv != null) {
+            mv.visitFieldInsn(opcode, owner, name, desc);
+        }
+    }
+
+    /**
+     * Visits a method instruction. A method instruction is an instruction that
+     * invokes a method.
+     * 
+     * @param opcode
+     *            the opcode of the type instruction to be visited. This opcode
+     *            is either INVOKEVIRTUAL, INVOKESPECIAL, INVOKESTATIC or
+     *            INVOKEINTERFACE.
+     * @param owner
+     *            the internal name of the method's owner class (see
+     *            {@link Type#getInternalName() getInternalName}).
+     * @param name
+     *            the method's name.
+     * @param desc
+     *            the method's descriptor (see {@link Type Type}).
+     */
+    public void visitMethodInsn(int opcode, String owner, String name,
+            String desc) {
+        if (mv != null) {
+            mv.visitMethodInsn(opcode, owner, name, desc);
+        }
+    }
+
+    /**
+     * Visits an invokedynamic instruction.
+     * 
+     * @param name
+     *            the method's name.
+     * @param desc
+     *            the method's descriptor (see {@link Type Type}).
+     * @param bsm
+     *            the bootstrap method.
+     * @param bsmArgs
+     *            the bootstrap method constant arguments. Each argument must be
+     *            an {@link Integer}, {@link Float}, {@link Long},
+     *            {@link Double}, {@link String}, {@link Type} or {@link Handle}
+     *            value. This method is allowed to modify the content of the
+     *            array so a caller should expect that this array may change.
+     */
+    public void visitInvokeDynamicInsn(String name, String desc, Handle bsm,
+            Object... bsmArgs) {
+        if (mv != null) {
+            mv.visitInvokeDynamicInsn(name, desc, bsm, bsmArgs);
+        }
+    }
+
+    /**
+     * Visits a jump instruction. A jump instruction is an instruction that may
+     * jump to another instruction.
+     * 
+     * @param opcode
+     *            the opcode of the type instruction to be visited. This opcode
+     *            is either IFEQ, IFNE, IFLT, IFGE, IFGT, IFLE, IF_ICMPEQ,
+     *            IF_ICMPNE, IF_ICMPLT, IF_ICMPGE, IF_ICMPGT, IF_ICMPLE,
+     *            IF_ACMPEQ, IF_ACMPNE, GOTO, JSR, IFNULL or IFNONNULL.
+     * @param label
+     *            the operand of the instruction to be visited. This operand is
+     *            a label that designates the instruction to which the jump
+     *            instruction may jump.
+     */
+    public void visitJumpInsn(int opcode, Label label) {
+        if (mv != null) {
+            mv.visitJumpInsn(opcode, label);
+        }
+    }
+
+    /**
+     * Visits a label. A label designates the instruction that will be visited
+     * just after it.
+     * 
+     * @param label
+     *            a {@link Label Label} object.
+     */
+    public void visitLabel(Label label) {
+        if (mv != null) {
+            mv.visitLabel(label);
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // Special instructions
+    // -------------------------------------------------------------------------
+
+    /**
+     * Visits a LDC instruction. Note that new constant types may be added in
+     * future versions of the Java Virtual Machine. To easily detect new
+     * constant types, implementations of this method should check for
+     * unexpected constant types, like this:
+     * 
+     * <pre>
+     * if (cst instanceof Integer) {
+     *     // ...
+     * } else if (cst instanceof Float) {
+     *     // ...
+     * } else if (cst instanceof Long) {
+     *     // ...
+     * } else if (cst instanceof Double) {
+     *     // ...
+     * } else if (cst instanceof String) {
+     *     // ...
+     * } else if (cst instanceof Type) {
+     *     int sort = ((Type) cst).getSort();
+     *     if (sort == Type.OBJECT) {
+     *         // ...
+     *     } else if (sort == Type.ARRAY) {
+     *         // ...
+     *     } else if (sort == Type.METHOD) {
+     *         // ...
+     *     } else {
+     *         // throw an exception
+     *     }
+     * } else if (cst instanceof Handle) {
+     *     // ...
+     * } else {
+     *     // throw an exception
+     * }
+     * </pre>
+     * 
+     * @param cst
+     *            the constant to be loaded on the stack. This parameter must be
+     *            a non null {@link Integer}, a {@link Float}, a {@link Long}, a
+     *            {@link Double}, a {@link String}, a {@link Type} of OBJECT or
+     *            ARRAY sort for <tt>.class</tt> constants, for classes whose
+     *            version is 49.0, a {@link Type} of METHOD sort or a
+     *            {@link Handle} for MethodType and MethodHandle constants, for
+     *            classes whose version is 51.0.
+     */
+    public void visitLdcInsn(Object cst) {
+        if (mv != null) {
+            mv.visitLdcInsn(cst);
+        }
+    }
+
+    /**
+     * Visits an IINC instruction.
+     * 
+     * @param var
+     *            index of the local variable to be incremented.
+     * @param increment
+     *            amount to increment the local variable by.
+     */
+    public void visitIincInsn(int var, int increment) {
+        if (mv != null) {
+            mv.visitIincInsn(var, increment);
+        }
+    }
+
+    /**
+     * Visits a TABLESWITCH instruction.
+     * 
+     * @param min
+     *            the minimum key value.
+     * @param max
+     *            the maximum key value.
+     * @param dflt
+     *            beginning of the default handler block.
+     * @param labels
+     *            beginnings of the handler blocks. <tt>labels[i]</tt> is the
+     *            beginning of the handler block for the <tt>min + i</tt> key.
+     */
+    public void visitTableSwitchInsn(int min, int max, Label dflt,
+            Label... labels) {
+        if (mv != null) {
+            mv.visitTableSwitchInsn(min, max, dflt, labels);
+        }
+    }
+
+    /**
+     * Visits a LOOKUPSWITCH instruction.
+     * 
+     * @param dflt
+     *            beginning of the default handler block.
+     * @param keys
+     *            the values of the keys.
+     * @param labels
+     *            beginnings of the handler blocks. <tt>labels[i]</tt> is the
+     *            beginning of the handler block for the <tt>keys[i]</tt> key.
+     */
+    public void visitLookupSwitchInsn(Label dflt, int[] keys, Label[] labels) {
+        if (mv != null) {
+            mv.visitLookupSwitchInsn(dflt, keys, labels);
+        }
+    }
+
+    /**
+     * Visits a MULTIANEWARRAY instruction.
+     * 
+     * @param desc
+     *            an array type descriptor (see {@link Type Type}).
+     * @param dims
+     *            number of dimensions of the array to allocate.
+     */
+    public void visitMultiANewArrayInsn(String desc, int dims) {
+        if (mv != null) {
+            mv.visitMultiANewArrayInsn(desc, dims);
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // Exceptions table entries, debug information, max stack and max locals
+    // -------------------------------------------------------------------------
+
+    /**
+     * Visits a try catch block.
+     * 
+     * @param start
+     *            beginning of the exception handler's scope (inclusive).
+     * @param end
+     *            end of the exception handler's scope (exclusive).
+     * @param handler
+     *            beginning of the exception handler's code.
+     * @param type
+     *            internal name of the type of exceptions handled by the
+     *            handler, or <tt>null</tt> to catch any exceptions (for
+     *            "finally" blocks).
+     * @throws IllegalArgumentException
+     *             if one of the labels has already been visited by this visitor
+     *             (by the {@link #visitLabel visitLabel} method).
+     */
+    public void visitTryCatchBlock(Label start, Label end, Label handler,
+            String type) {
+        if (mv != null) {
+            mv.visitTryCatchBlock(start, end, handler, type);
+        }
+    }
+
+    /**
+     * Visits a local variable declaration.
+     * 
+     * @param name
+     *            the name of a local variable.
+     * @param desc
+     *            the type descriptor of this local variable.
+     * @param signature
+     *            the type signature of this local variable. May be
+     *            <tt>null</tt> if the local variable type does not use generic
+     *            types.
+     * @param start
+     *            the first instruction corresponding to the scope of this local
+     *            variable (inclusive).
+     * @param end
+     *            the last instruction corresponding to the scope of this local
+     *            variable (exclusive).
+     * @param index
+     *            the local variable's index.
+     * @throws IllegalArgumentException
+     *             if one of the labels has not already been visited by this
+     *             visitor (by the {@link #visitLabel visitLabel} method).
+     */
+    public void visitLocalVariable(String name, String desc, String signature,
+            Label start, Label end, int index) {
+        if (mv != null) {
+            mv.visitLocalVariable(name, desc, signature, start, end, index);
+        }
+    }
+
+    /**
+     * Visits a line number declaration.
+     * 
+     * @param line
+     *            a line number. This number refers to the source file from
+     *            which the class was compiled.
+     * @param start
+     *            the first instruction corresponding to this line number.
+     * @throws IllegalArgumentException
+     *             if <tt>start</tt> has not already been visited by this
+     *             visitor (by the {@link #visitLabel visitLabel} method).
+     */
+    public void visitLineNumber(int line, Label start) {
+        if (mv != null) {
+            mv.visitLineNumber(line, start);
+        }
+    }
+
+    /**
+     * Visits the maximum stack size and the maximum number of local variables
+     * of the method.
+     * 
+     * @param maxStack
+     *            maximum stack size of the method.
+     * @param maxLocals
+     *            maximum number of local variables for the method.
+     */
+    public void visitMaxs(int maxStack, int maxLocals) {
+        if (mv != null) {
+            mv.visitMaxs(maxStack, maxLocals);
+        }
+    }
+
+    /**
+     * Visits the end of the method. This method, which is the last one to be
+     * called, is used to inform the visitor that all the annotations and
+     * attributes of the method have been visited.
+     */
+    public void visitEnd() {
+        if (mv != null) {
+            mv.visitEnd();
+        }
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/MethodWriter.java b/src/main/asm/org/objectweb/asm/MethodWriter.java
new file mode 100644
index 0000000..ff03f19
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/MethodWriter.java
@@ -0,0 +1,2685 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm;
+
+/**
+ * A {@link MethodVisitor} that generates methods in bytecode form. Each visit
+ * method of this class appends the bytecode corresponding to the visited
+ * instruction to a byte vector, in the order these methods are called.
+ * 
+ * @author Eric Bruneton
+ * @author Eugene Kuleshov
+ */
+class MethodWriter extends MethodVisitor {
+
+    /**
+     * Pseudo access flag used to denote constructors.
+     */
+    static final int ACC_CONSTRUCTOR = 0x80000;
+    
+    /**
+     * Frame has exactly the same locals as the previous stack map frame and
+     * number of stack items is zero.
+     */
+    static final int SAME_FRAME = 0; // to 63 (0-3f)
+
+    /**
+     * Frame has exactly the same locals as the previous stack map frame and
+     * number of stack items is 1
+     */
+    static final int SAME_LOCALS_1_STACK_ITEM_FRAME = 64; // to 127 (40-7f)
+
+    /**
+     * Reserved for future use
+     */
+    static final int RESERVED = 128;
+
+    /**
+     * Frame has exactly the same locals as the previous stack map frame and
+     * number of stack items is 1. Offset is bigger then 63;
+     */
+    static final int SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED = 247; // f7
+
+    /**
+     * Frame where current locals are the same as the locals in the previous
+     * frame, except that the k last locals are absent. The value of k is given
+     * by the formula 251-frame_type.
+     */
+    static final int CHOP_FRAME = 248; // to 250 (f8-fA)
+
+    /**
+     * Frame has exactly the same locals as the previous stack map frame and
+     * number of stack items is zero. Offset is bigger then 63;
+     */
+    static final int SAME_FRAME_EXTENDED = 251; // fb
+
+    /**
+     * Frame where current locals are the same as the locals in the previous
+     * frame, except that k additional locals are defined. The value of k is
+     * given by the formula frame_type-251.
+     */
+    static final int APPEND_FRAME = 252; // to 254 // fc-fe
+
+    /**
+     * Full frame
+     */
+    static final int FULL_FRAME = 255; // ff
+
+    /**
+     * Indicates that the stack map frames must be recomputed from scratch. In
+     * this case the maximum stack size and number of local variables is also
+     * recomputed from scratch.
+     * 
+     * @see #compute
+     */
+    private static final int FRAMES = 0;
+
+    /**
+     * Indicates that the maximum stack size and number of local variables must
+     * be automatically computed.
+     * 
+     * @see #compute
+     */
+    private static final int MAXS = 1;
+
+    /**
+     * Indicates that nothing must be automatically computed.
+     * 
+     * @see #compute
+     */
+    private static final int NOTHING = 2;
+
+    /**
+     * The class writer to which this method must be added.
+     */
+    final ClassWriter cw;
+
+    /**
+     * Access flags of this method.
+     */
+    private int access;
+
+    /**
+     * The index of the constant pool item that contains the name of this
+     * method.
+     */
+    private final int name;
+
+    /**
+     * The index of the constant pool item that contains the descriptor of this
+     * method.
+     */
+    private final int desc;
+
+    /**
+     * The descriptor of this method.
+     */
+    private final String descriptor;
+
+    /**
+     * The signature of this method.
+     */
+    String signature;
+
+    /**
+     * If not zero, indicates that the code of this method must be copied from
+     * the ClassReader associated to this writer in <code>cw.cr</code>. More
+     * precisely, this field gives the index of the first byte to copied from
+     * <code>cw.cr.b</code>.
+     */
+    int classReaderOffset;
+
+    /**
+     * If not zero, indicates that the code of this method must be copied from
+     * the ClassReader associated to this writer in <code>cw.cr</code>. More
+     * precisely, this field gives the number of bytes to copied from
+     * <code>cw.cr.b</code>.
+     */
+    int classReaderLength;
+
+    /**
+     * Number of exceptions that can be thrown by this method.
+     */
+    int exceptionCount;
+
+    /**
+     * The exceptions that can be thrown by this method. More precisely, this
+     * array contains the indexes of the constant pool items that contain the
+     * internal names of these exception classes.
+     */
+    int[] exceptions;
+
+    /**
+     * The annotation default attribute of this method. May be <tt>null</tt>.
+     */
+    private ByteVector annd;
+
+    /**
+     * The runtime visible annotations of this method. May be <tt>null</tt>.
+     */
+    private AnnotationWriter anns;
+
+    /**
+     * The runtime invisible annotations of this method. May be <tt>null</tt>.
+     */
+    private AnnotationWriter ianns;
+
+    /**
+     * The runtime visible parameter annotations of this method. May be
+     * <tt>null</tt>.
+     */
+    private AnnotationWriter[] panns;
+
+    /**
+     * The runtime invisible parameter annotations of this method. May be
+     * <tt>null</tt>.
+     */
+    private AnnotationWriter[] ipanns;
+
+    /**
+     * The number of synthetic parameters of this method.
+     */
+    private int synthetics;
+
+    /**
+     * The non standard attributes of the method.
+     */
+    private Attribute attrs;
+
+    /**
+     * The bytecode of this method.
+     */
+    private ByteVector code = new ByteVector();
+
+    /**
+     * Maximum stack size of this method.
+     */
+    private int maxStack;
+
+    /**
+     * Maximum number of local variables for this method.
+     */
+    private int maxLocals;
+
+    /**
+     * Number of local variables in the current stack map frame.
+     */
+    private int currentLocals;
+
+    /**
+     * Number of stack map frames in the StackMapTable attribute.
+     */
+    private int frameCount;
+
+    /**
+     * The StackMapTable attribute.
+     */
+    private ByteVector stackMap;
+
+    /**
+     * The offset of the last frame that was written in the StackMapTable
+     * attribute.
+     */
+    private int previousFrameOffset;
+
+    /**
+     * The last frame that was written in the StackMapTable attribute.
+     * 
+     * @see #frame
+     */
+    private int[] previousFrame;
+
+    /**
+     * The current stack map frame. The first element contains the offset of the
+     * instruction to which the frame corresponds, the second element is the
+     * number of locals and the third one is the number of stack elements. The
+     * local variables start at index 3 and are followed by the operand stack
+     * values. In summary frame[0] = offset, frame[1] = nLocal, frame[2] =
+     * nStack, frame[3] = nLocal. All types are encoded as integers, with the
+     * same format as the one used in {@link Label}, but limited to BASE types.
+     */
+    private int[] frame;
+
+    /**
+     * Number of elements in the exception handler list.
+     */
+    private int handlerCount;
+
+    /**
+     * The first element in the exception handler list.
+     */
+    private Handler firstHandler;
+
+    /**
+     * The last element in the exception handler list.
+     */
+    private Handler lastHandler;
+
+    /**
+     * Number of entries in the LocalVariableTable attribute.
+     */
+    private int localVarCount;
+
+    /**
+     * The LocalVariableTable attribute.
+     */
+    private ByteVector localVar;
+
+    /**
+     * Number of entries in the LocalVariableTypeTable attribute.
+     */
+    private int localVarTypeCount;
+
+    /**
+     * The LocalVariableTypeTable attribute.
+     */
+    private ByteVector localVarType;
+
+    /**
+     * Number of entries in the LineNumberTable attribute.
+     */
+    private int lineNumberCount;
+
+    /**
+     * The LineNumberTable attribute.
+     */
+    private ByteVector lineNumber;
+
+    /**
+     * The non standard attributes of the method's code.
+     */
+    private Attribute cattrs;
+
+    /**
+     * Indicates if some jump instructions are too small and need to be resized.
+     */
+    private boolean resize;
+
+    /**
+     * The number of subroutines in this method.
+     */
+    private int subroutines;
+
+    // ------------------------------------------------------------------------
+
+    /*
+     * Fields for the control flow graph analysis algorithm (used to compute the
+     * maximum stack size). A control flow graph contains one node per "basic
+     * block", and one edge per "jump" from one basic block to another. Each
+     * node (i.e., each basic block) is represented by the Label object that
+     * corresponds to the first instruction of this basic block. Each node also
+     * stores the list of its successors in the graph, as a linked list of Edge
+     * objects.
+     */
+
+    /**
+     * Indicates what must be automatically computed.
+     * 
+     * @see #FRAMES
+     * @see #MAXS
+     * @see #NOTHING
+     */
+    private final int compute;
+
+    /**
+     * A list of labels. This list is the list of basic blocks in the method,
+     * i.e. a list of Label objects linked to each other by their
+     * {@link Label#successor} field, in the order they are visited by
+     * {@link MethodVisitor#visitLabel}, and starting with the first basic
+     * block.
+     */
+    private Label labels;
+
+    /**
+     * The previous basic block.
+     */
+    private Label previousBlock;
+
+    /**
+     * The current basic block.
+     */
+    private Label currentBlock;
+
+    /**
+     * The (relative) stack size after the last visited instruction. This size
+     * is relative to the beginning of the current basic block, i.e., the true
+     * stack size after the last visited instruction is equal to the
+     * {@link Label#inputStackTop beginStackSize} of the current basic block
+     * plus <tt>stackSize</tt>.
+     */
+    private int stackSize;
+
+    /**
+     * The (relative) maximum stack size after the last visited instruction.
+     * This size is relative to the beginning of the current basic block, i.e.,
+     * the true maximum stack size after the last visited instruction is equal
+     * to the {@link Label#inputStackTop beginStackSize} of the current basic
+     * block plus <tt>stackSize</tt>.
+     */
+    private int maxStackSize;
+
+    // ------------------------------------------------------------------------
+    // Constructor
+    // ------------------------------------------------------------------------
+
+    /**
+     * Constructs a new {@link MethodWriter}.
+     * 
+     * @param cw
+     *            the class writer in which the method must be added.
+     * @param access
+     *            the method's access flags (see {@link Opcodes}).
+     * @param name
+     *            the method's name.
+     * @param desc
+     *            the method's descriptor (see {@link Type}).
+     * @param signature
+     *            the method's signature. May be <tt>null</tt>.
+     * @param exceptions
+     *            the internal names of the method's exceptions. May be
+     *            <tt>null</tt>.
+     * @param computeMaxs
+     *            <tt>true</tt> if the maximum stack size and number of local
+     *            variables must be automatically computed.
+     * @param computeFrames
+     *            <tt>true</tt> if the stack map tables must be recomputed from
+     *            scratch.
+     */
+    MethodWriter(final ClassWriter cw, final int access, final String name,
+            final String desc, final String signature,
+            final String[] exceptions, final boolean computeMaxs,
+            final boolean computeFrames) {
+        super(Opcodes.ASM4);
+        if (cw.firstMethod == null) {
+            cw.firstMethod = this;
+        } else {
+            cw.lastMethod.mv = this;
+        }
+        cw.lastMethod = this;
+        this.cw = cw;
+        this.access = access;
+        if ("<init>".equals(name)) {
+            this.access |= ACC_CONSTRUCTOR;
+        }
+        this.name = cw.newUTF8(name);
+        this.desc = cw.newUTF8(desc);
+        this.descriptor = desc;
+        if (ClassReader.SIGNATURES) {
+            this.signature = signature;
+        }
+        if (exceptions != null && exceptions.length > 0) {
+            exceptionCount = exceptions.length;
+            this.exceptions = new int[exceptionCount];
+            for (int i = 0; i < exceptionCount; ++i) {
+                this.exceptions[i] = cw.newClass(exceptions[i]);
+            }
+        }
+        this.compute = computeFrames ? FRAMES : (computeMaxs ? MAXS : NOTHING);
+        if (computeMaxs || computeFrames) {
+            // updates maxLocals
+            int size = Type.getArgumentsAndReturnSizes(descriptor) >> 2;
+            if ((access & Opcodes.ACC_STATIC) != 0) {
+                --size;
+            }
+            maxLocals = size;
+            currentLocals = size;
+            // creates and visits the label for the first basic block
+            labels = new Label();
+            labels.status |= Label.PUSHED;
+            visitLabel(labels);
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // Implementation of the MethodVisitor abstract class
+    // ------------------------------------------------------------------------
+
+    @Override
+    public AnnotationVisitor visitAnnotationDefault() {
+        if (!ClassReader.ANNOTATIONS) {
+            return null;
+        }
+        annd = new ByteVector();
+        return new AnnotationWriter(cw, false, annd, null, 0);
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotation(final String desc,
+            final boolean visible) {
+        if (!ClassReader.ANNOTATIONS) {
+            return null;
+        }
+        ByteVector bv = new ByteVector();
+        // write type, and reserve space for values count
+        bv.putShort(cw.newUTF8(desc)).putShort(0);
+        AnnotationWriter aw = new AnnotationWriter(cw, true, bv, bv, 2);
+        if (visible) {
+            aw.next = anns;
+            anns = aw;
+        } else {
+            aw.next = ianns;
+            ianns = aw;
+        }
+        return aw;
+    }
+
+    @Override
+    public AnnotationVisitor visitParameterAnnotation(final int parameter,
+            final String desc, final boolean visible) {
+        if (!ClassReader.ANNOTATIONS) {
+            return null;
+        }
+        ByteVector bv = new ByteVector();
+        if ("Ljava/lang/Synthetic;".equals(desc)) {
+            // workaround for a bug in javac with synthetic parameters
+            // see ClassReader.readParameterAnnotations
+            synthetics = Math.max(synthetics, parameter + 1);
+            return new AnnotationWriter(cw, false, bv, null, 0);
+        }
+        // write type, and reserve space for values count
+        bv.putShort(cw.newUTF8(desc)).putShort(0);
+        AnnotationWriter aw = new AnnotationWriter(cw, true, bv, bv, 2);
+        if (visible) {
+            if (panns == null) {
+                panns = new AnnotationWriter[Type.getArgumentTypes(descriptor).length];
+            }
+            aw.next = panns[parameter];
+            panns[parameter] = aw;
+        } else {
+            if (ipanns == null) {
+                ipanns = new AnnotationWriter[Type.getArgumentTypes(descriptor).length];
+            }
+            aw.next = ipanns[parameter];
+            ipanns[parameter] = aw;
+        }
+        return aw;
+    }
+
+    @Override
+    public void visitAttribute(final Attribute attr) {
+        if (attr.isCodeAttribute()) {
+            attr.next = cattrs;
+            cattrs = attr;
+        } else {
+            attr.next = attrs;
+            attrs = attr;
+        }
+    }
+
+    @Override
+    public void visitCode() {
+    }
+
+    @Override
+    public void visitFrame(final int type, final int nLocal,
+            final Object[] local, final int nStack, final Object[] stack) {
+        if (!ClassReader.FRAMES || compute == FRAMES) {
+            return;
+        }
+
+        if (type == Opcodes.F_NEW) {
+            if (previousFrame == null) {
+                visitImplicitFirstFrame();
+            }
+            currentLocals = nLocal;
+            int frameIndex = startFrame(code.length, nLocal, nStack);
+            for (int i = 0; i < nLocal; ++i) {
+                if (local[i] instanceof String) {
+                    frame[frameIndex++] = Frame.OBJECT
+                            | cw.addType((String) local[i]);
+                } else if (local[i] instanceof Integer) {
+                    frame[frameIndex++] = ((Integer) local[i]).intValue();
+                } else {
+                    frame[frameIndex++] = Frame.UNINITIALIZED
+                            | cw.addUninitializedType("",
+                                    ((Label) local[i]).position);
+                }
+            }
+            for (int i = 0; i < nStack; ++i) {
+                if (stack[i] instanceof String) {
+                    frame[frameIndex++] = Frame.OBJECT
+                            | cw.addType((String) stack[i]);
+                } else if (stack[i] instanceof Integer) {
+                    frame[frameIndex++] = ((Integer) stack[i]).intValue();
+                } else {
+                    frame[frameIndex++] = Frame.UNINITIALIZED
+                            | cw.addUninitializedType("",
+                                    ((Label) stack[i]).position);
+                }
+            }
+            endFrame();
+        } else {
+            int delta;
+            if (stackMap == null) {
+                stackMap = new ByteVector();
+                delta = code.length;
+            } else {
+                delta = code.length - previousFrameOffset - 1;
+                if (delta < 0) {
+                    if (type == Opcodes.F_SAME) {
+                        return;
+                    } else {
+                        throw new IllegalStateException();
+                    }
+                }
+            }
+
+            switch (type) {
+            case Opcodes.F_FULL:
+                currentLocals = nLocal;
+                stackMap.putByte(FULL_FRAME).putShort(delta).putShort(nLocal);
+                for (int i = 0; i < nLocal; ++i) {
+                    writeFrameType(local[i]);
+                }
+                stackMap.putShort(nStack);
+                for (int i = 0; i < nStack; ++i) {
+                    writeFrameType(stack[i]);
+                }
+                break;
+            case Opcodes.F_APPEND:
+                currentLocals += nLocal;
+                stackMap.putByte(SAME_FRAME_EXTENDED + nLocal).putShort(delta);
+                for (int i = 0; i < nLocal; ++i) {
+                    writeFrameType(local[i]);
+                }
+                break;
+            case Opcodes.F_CHOP:
+                currentLocals -= nLocal;
+                stackMap.putByte(SAME_FRAME_EXTENDED - nLocal).putShort(delta);
+                break;
+            case Opcodes.F_SAME:
+                if (delta < 64) {
+                    stackMap.putByte(delta);
+                } else {
+                    stackMap.putByte(SAME_FRAME_EXTENDED).putShort(delta);
+                }
+                break;
+            case Opcodes.F_SAME1:
+                if (delta < 64) {
+                    stackMap.putByte(SAME_LOCALS_1_STACK_ITEM_FRAME + delta);
+                } else {
+                    stackMap.putByte(SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED)
+                            .putShort(delta);
+                }
+                writeFrameType(stack[0]);
+                break;
+            }
+
+            previousFrameOffset = code.length;
+            ++frameCount;
+        }
+
+        maxStack = Math.max(maxStack, nStack);
+        maxLocals = Math.max(maxLocals, currentLocals);
+    }
+
+    @Override
+    public void visitInsn(final int opcode) {
+        // adds the instruction to the bytecode of the method
+        code.putByte(opcode);
+        // update currentBlock
+        // Label currentBlock = this.currentBlock;
+        if (currentBlock != null) {
+            if (compute == FRAMES) {
+                currentBlock.frame.execute(opcode, 0, null, null);
+            } else {
+                // updates current and max stack sizes
+                int size = stackSize + Frame.SIZE[opcode];
+                if (size > maxStackSize) {
+                    maxStackSize = size;
+                }
+                stackSize = size;
+            }
+            // if opcode == ATHROW or xRETURN, ends current block (no successor)
+            if ((opcode >= Opcodes.IRETURN && opcode <= Opcodes.RETURN)
+                    || opcode == Opcodes.ATHROW) {
+                noSuccessor();
+            }
+        }
+    }
+
+    @Override
+    public void visitIntInsn(final int opcode, final int operand) {
+        // Label currentBlock = this.currentBlock;
+        if (currentBlock != null) {
+            if (compute == FRAMES) {
+                currentBlock.frame.execute(opcode, operand, null, null);
+            } else if (opcode != Opcodes.NEWARRAY) {
+                // updates current and max stack sizes only for NEWARRAY
+                // (stack size variation = 0 for BIPUSH or SIPUSH)
+                int size = stackSize + 1;
+                if (size > maxStackSize) {
+                    maxStackSize = size;
+                }
+                stackSize = size;
+            }
+        }
+        // adds the instruction to the bytecode of the method
+        if (opcode == Opcodes.SIPUSH) {
+            code.put12(opcode, operand);
+        } else { // BIPUSH or NEWARRAY
+            code.put11(opcode, operand);
+        }
+    }
+
+    @Override
+    public void visitVarInsn(final int opcode, final int var) {
+        // Label currentBlock = this.currentBlock;
+        if (currentBlock != null) {
+            if (compute == FRAMES) {
+                currentBlock.frame.execute(opcode, var, null, null);
+            } else {
+                // updates current and max stack sizes
+                if (opcode == Opcodes.RET) {
+                    // no stack change, but end of current block (no successor)
+                    currentBlock.status |= Label.RET;
+                    // save 'stackSize' here for future use
+                    // (see {@link #findSubroutineSuccessors})
+                    currentBlock.inputStackTop = stackSize;
+                    noSuccessor();
+                } else { // xLOAD or xSTORE
+                    int size = stackSize + Frame.SIZE[opcode];
+                    if (size > maxStackSize) {
+                        maxStackSize = size;
+                    }
+                    stackSize = size;
+                }
+            }
+        }
+        if (compute != NOTHING) {
+            // updates max locals
+            int n;
+            if (opcode == Opcodes.LLOAD || opcode == Opcodes.DLOAD
+                    || opcode == Opcodes.LSTORE || opcode == Opcodes.DSTORE) {
+                n = var + 2;
+            } else {
+                n = var + 1;
+            }
+            if (n > maxLocals) {
+                maxLocals = n;
+            }
+        }
+        // adds the instruction to the bytecode of the method
+        if (var < 4 && opcode != Opcodes.RET) {
+            int opt;
+            if (opcode < Opcodes.ISTORE) {
+                /* ILOAD_0 */
+                opt = 26 + ((opcode - Opcodes.ILOAD) << 2) + var;
+            } else {
+                /* ISTORE_0 */
+                opt = 59 + ((opcode - Opcodes.ISTORE) << 2) + var;
+            }
+            code.putByte(opt);
+        } else if (var >= 256) {
+            code.putByte(196 /* WIDE */).put12(opcode, var);
+        } else {
+            code.put11(opcode, var);
+        }
+        if (opcode >= Opcodes.ISTORE && compute == FRAMES && handlerCount > 0) {
+            visitLabel(new Label());
+        }
+    }
+
+    @Override
+    public void visitTypeInsn(final int opcode, final String type) {
+        Item i = cw.newClassItem(type);
+        // Label currentBlock = this.currentBlock;
+        if (currentBlock != null) {
+            if (compute == FRAMES) {
+                currentBlock.frame.execute(opcode, code.length, cw, i);
+            } else if (opcode == Opcodes.NEW) {
+                // updates current and max stack sizes only if opcode == NEW
+                // (no stack change for ANEWARRAY, CHECKCAST, INSTANCEOF)
+                int size = stackSize + 1;
+                if (size > maxStackSize) {
+                    maxStackSize = size;
+                }
+                stackSize = size;
+            }
+        }
+        // adds the instruction to the bytecode of the method
+        code.put12(opcode, i.index);
+    }
+
+    @Override
+    public void visitFieldInsn(final int opcode, final String owner,
+            final String name, final String desc) {
+        Item i = cw.newFieldItem(owner, name, desc);
+        // Label currentBlock = this.currentBlock;
+        if (currentBlock != null) {
+            if (compute == FRAMES) {
+                currentBlock.frame.execute(opcode, 0, cw, i);
+            } else {
+                int size;
+                // computes the stack size variation
+                char c = desc.charAt(0);
+                switch (opcode) {
+                case Opcodes.GETSTATIC:
+                    size = stackSize + (c == 'D' || c == 'J' ? 2 : 1);
+                    break;
+                case Opcodes.PUTSTATIC:
+                    size = stackSize + (c == 'D' || c == 'J' ? -2 : -1);
+                    break;
+                case Opcodes.GETFIELD:
+                    size = stackSize + (c == 'D' || c == 'J' ? 1 : 0);
+                    break;
+                // case Constants.PUTFIELD:
+                default:
+                    size = stackSize + (c == 'D' || c == 'J' ? -3 : -2);
+                    break;
+                }
+                // updates current and max stack sizes
+                if (size > maxStackSize) {
+                    maxStackSize = size;
+                }
+                stackSize = size;
+            }
+        }
+        // adds the instruction to the bytecode of the method
+        code.put12(opcode, i.index);
+    }
+
+    @Override
+    public void visitMethodInsn(final int opcode, final String owner,
+            final String name, final String desc) {
+        boolean itf = opcode == Opcodes.INVOKEINTERFACE;
+        Item i = cw.newMethodItem(owner, name, desc, itf);
+        int argSize = i.intVal;
+        // Label currentBlock = this.currentBlock;
+        if (currentBlock != null) {
+            if (compute == FRAMES) {
+                currentBlock.frame.execute(opcode, 0, cw, i);
+            } else {
+                /*
+                 * computes the stack size variation. In order not to recompute
+                 * several times this variation for the same Item, we use the
+                 * intVal field of this item to store this variation, once it
+                 * has been computed. More precisely this intVal field stores
+                 * the sizes of the arguments and of the return value
+                 * corresponding to desc.
+                 */
+                if (argSize == 0) {
+                    // the above sizes have not been computed yet,
+                    // so we compute them...
+                    argSize = Type.getArgumentsAndReturnSizes(desc);
+                    // ... and we save them in order
+                    // not to recompute them in the future
+                    i.intVal = argSize;
+                }
+                int size;
+                if (opcode == Opcodes.INVOKESTATIC) {
+                    size = stackSize - (argSize >> 2) + (argSize & 0x03) + 1;
+                } else {
+                    size = stackSize - (argSize >> 2) + (argSize & 0x03);
+                }
+                // updates current and max stack sizes
+                if (size > maxStackSize) {
+                    maxStackSize = size;
+                }
+                stackSize = size;
+            }
+        }
+        // adds the instruction to the bytecode of the method
+        if (itf) {
+            if (argSize == 0) {
+                argSize = Type.getArgumentsAndReturnSizes(desc);
+                i.intVal = argSize;
+            }
+            code.put12(Opcodes.INVOKEINTERFACE, i.index).put11(argSize >> 2, 0);
+        } else {
+            code.put12(opcode, i.index);
+        }
+    }
+
+    @Override
+    public void visitInvokeDynamicInsn(final String name, final String desc,
+            final Handle bsm, final Object... bsmArgs) {
+        Item i = cw.newInvokeDynamicItem(name, desc, bsm, bsmArgs);
+        int argSize = i.intVal;
+        // Label currentBlock = this.currentBlock;
+        if (currentBlock != null) {
+            if (compute == FRAMES) {
+                currentBlock.frame.execute(Opcodes.INVOKEDYNAMIC, 0, cw, i);
+            } else {
+                /*
+                 * computes the stack size variation. In order not to recompute
+                 * several times this variation for the same Item, we use the
+                 * intVal field of this item to store this variation, once it
+                 * has been computed. More precisely this intVal field stores
+                 * the sizes of the arguments and of the return value
+                 * corresponding to desc.
+                 */
+                if (argSize == 0) {
+                    // the above sizes have not been computed yet,
+                    // so we compute them...
+                    argSize = Type.getArgumentsAndReturnSizes(desc);
+                    // ... and we save them in order
+                    // not to recompute them in the future
+                    i.intVal = argSize;
+                }
+                int size = stackSize - (argSize >> 2) + (argSize & 0x03) + 1;
+
+                // updates current and max stack sizes
+                if (size > maxStackSize) {
+                    maxStackSize = size;
+                }
+                stackSize = size;
+            }
+        }
+        // adds the instruction to the bytecode of the method
+        code.put12(Opcodes.INVOKEDYNAMIC, i.index);
+        code.putShort(0);
+    }
+
+    @Override
+    public void visitJumpInsn(final int opcode, final Label label) {
+        Label nextInsn = null;
+        // Label currentBlock = this.currentBlock;
+        if (currentBlock != null) {
+            if (compute == FRAMES) {
+                currentBlock.frame.execute(opcode, 0, null, null);
+                // 'label' is the target of a jump instruction
+                label.getFirst().status |= Label.TARGET;
+                // adds 'label' as a successor of this basic block
+                addSuccessor(Edge.NORMAL, label);
+                if (opcode != Opcodes.GOTO) {
+                    // creates a Label for the next basic block
+                    nextInsn = new Label();
+                }
+            } else {
+                if (opcode == Opcodes.JSR) {
+                    if ((label.status & Label.SUBROUTINE) == 0) {
+                        label.status |= Label.SUBROUTINE;
+                        ++subroutines;
+                    }
+                    currentBlock.status |= Label.JSR;
+                    addSuccessor(stackSize + 1, label);
+                    // creates a Label for the next basic block
+                    nextInsn = new Label();
+                    /*
+                     * note that, by construction in this method, a JSR block
+                     * has at least two successors in the control flow graph:
+                     * the first one leads the next instruction after the JSR,
+                     * while the second one leads to the JSR target.
+                     */
+                } else {
+                    // updates current stack size (max stack size unchanged
+                    // because stack size variation always negative in this
+                    // case)
+                    stackSize += Frame.SIZE[opcode];
+                    addSuccessor(stackSize, label);
+                }
+            }
+        }
+        // adds the instruction to the bytecode of the method
+        if ((label.status & Label.RESOLVED) != 0
+                && label.position - code.length < Short.MIN_VALUE) {
+            /*
+             * case of a backward jump with an offset < -32768. In this case we
+             * automatically replace GOTO with GOTO_W, JSR with JSR_W and IFxxx
+             * <l> with IFNOTxxx <l'> GOTO_W <l>, where IFNOTxxx is the
+             * "opposite" opcode of IFxxx (i.e., IFNE for IFEQ) and where <l'>
+             * designates the instruction just after the GOTO_W.
+             */
+            if (opcode == Opcodes.GOTO) {
+                code.putByte(200); // GOTO_W
+            } else if (opcode == Opcodes.JSR) {
+                code.putByte(201); // JSR_W
+            } else {
+                // if the IF instruction is transformed into IFNOT GOTO_W the
+                // next instruction becomes the target of the IFNOT instruction
+                if (nextInsn != null) {
+                    nextInsn.status |= Label.TARGET;
+                }
+                code.putByte(opcode <= 166 ? ((opcode + 1) ^ 1) - 1
+                        : opcode ^ 1);
+                code.putShort(8); // jump offset
+                code.putByte(200); // GOTO_W
+            }
+            label.put(this, code, code.length - 1, true);
+        } else {
+            /*
+             * case of a backward jump with an offset >= -32768, or of a forward
+             * jump with, of course, an unknown offset. In these cases we store
+             * the offset in 2 bytes (which will be increased in
+             * resizeInstructions, if needed).
+             */
+            code.putByte(opcode);
+            label.put(this, code, code.length - 1, false);
+        }
+        if (currentBlock != null) {
+            if (nextInsn != null) {
+                // if the jump instruction is not a GOTO, the next instruction
+                // is also a successor of this instruction. Calling visitLabel
+                // adds the label of this next instruction as a successor of the
+                // current block, and starts a new basic block
+                visitLabel(nextInsn);
+            }
+            if (opcode == Opcodes.GOTO) {
+                noSuccessor();
+            }
+        }
+    }
+
+    @Override
+    public void visitLabel(final Label label) {
+        // resolves previous forward references to label, if any
+        resize |= label.resolve(this, code.length, code.data);
+        // updates currentBlock
+        if ((label.status & Label.DEBUG) != 0) {
+            return;
+        }
+        if (compute == FRAMES) {
+            if (currentBlock != null) {
+                if (label.position == currentBlock.position) {
+                    // successive labels, do not start a new basic block
+                    currentBlock.status |= (label.status & Label.TARGET);
+                    label.frame = currentBlock.frame;
+                    return;
+                }
+                // ends current block (with one new successor)
+                addSuccessor(Edge.NORMAL, label);
+            }
+            // begins a new current block
+            currentBlock = label;
+            if (label.frame == null) {
+                label.frame = new Frame();
+                label.frame.owner = label;
+            }
+            // updates the basic block list
+            if (previousBlock != null) {
+                if (label.position == previousBlock.position) {
+                    previousBlock.status |= (label.status & Label.TARGET);
+                    label.frame = previousBlock.frame;
+                    currentBlock = previousBlock;
+                    return;
+                }
+                previousBlock.successor = label;
+            }
+            previousBlock = label;
+        } else if (compute == MAXS) {
+            if (currentBlock != null) {
+                // ends current block (with one new successor)
+                currentBlock.outputStackMax = maxStackSize;
+                addSuccessor(stackSize, label);
+            }
+            // begins a new current block
+            currentBlock = label;
+            // resets the relative current and max stack sizes
+            stackSize = 0;
+            maxStackSize = 0;
+            // updates the basic block list
+            if (previousBlock != null) {
+                previousBlock.successor = label;
+            }
+            previousBlock = label;
+        }
+    }
+
+    @Override
+    public void visitLdcInsn(final Object cst) {
+        Item i = cw.newConstItem(cst);
+        // Label currentBlock = this.currentBlock;
+        if (currentBlock != null) {
+            if (compute == FRAMES) {
+                currentBlock.frame.execute(Opcodes.LDC, 0, cw, i);
+            } else {
+                int size;
+                // computes the stack size variation
+                if (i.type == ClassWriter.LONG || i.type == ClassWriter.DOUBLE) {
+                    size = stackSize + 2;
+                } else {
+                    size = stackSize + 1;
+                }
+                // updates current and max stack sizes
+                if (size > maxStackSize) {
+                    maxStackSize = size;
+                }
+                stackSize = size;
+            }
+        }
+        // adds the instruction to the bytecode of the method
+        int index = i.index;
+        if (i.type == ClassWriter.LONG || i.type == ClassWriter.DOUBLE) {
+            code.put12(20 /* LDC2_W */, index);
+        } else if (index >= 256) {
+            code.put12(19 /* LDC_W */, index);
+        } else {
+            code.put11(Opcodes.LDC, index);
+        }
+    }
+
+    @Override
+    public void visitIincInsn(final int var, final int increment) {
+        if (currentBlock != null) {
+            if (compute == FRAMES) {
+                currentBlock.frame.execute(Opcodes.IINC, var, null, null);
+            }
+        }
+        if (compute != NOTHING) {
+            // updates max locals
+            int n = var + 1;
+            if (n > maxLocals) {
+                maxLocals = n;
+            }
+        }
+        // adds the instruction to the bytecode of the method
+        if ((var > 255) || (increment > 127) || (increment < -128)) {
+            code.putByte(196 /* WIDE */).put12(Opcodes.IINC, var)
+                    .putShort(increment);
+        } else {
+            code.putByte(Opcodes.IINC).put11(var, increment);
+        }
+    }
+
+    @Override
+    public void visitTableSwitchInsn(final int min, final int max,
+            final Label dflt, final Label... labels) {
+        // adds the instruction to the bytecode of the method
+        int source = code.length;
+        code.putByte(Opcodes.TABLESWITCH);
+        code.putByteArray(null, 0, (4 - code.length % 4) % 4);
+        dflt.put(this, code, source, true);
+        code.putInt(min).putInt(max);
+        for (int i = 0; i < labels.length; ++i) {
+            labels[i].put(this, code, source, true);
+        }
+        // updates currentBlock
+        visitSwitchInsn(dflt, labels);
+    }
+
+    @Override
+    public void visitLookupSwitchInsn(final Label dflt, final int[] keys,
+            final Label[] labels) {
+        // adds the instruction to the bytecode of the method
+        int source = code.length;
+        code.putByte(Opcodes.LOOKUPSWITCH);
+        code.putByteArray(null, 0, (4 - code.length % 4) % 4);
+        dflt.put(this, code, source, true);
+        code.putInt(labels.length);
+        for (int i = 0; i < labels.length; ++i) {
+            code.putInt(keys[i]);
+            labels[i].put(this, code, source, true);
+        }
+        // updates currentBlock
+        visitSwitchInsn(dflt, labels);
+    }
+
+    private void visitSwitchInsn(final Label dflt, final Label[] labels) {
+        // Label currentBlock = this.currentBlock;
+        if (currentBlock != null) {
+            if (compute == FRAMES) {
+                currentBlock.frame.execute(Opcodes.LOOKUPSWITCH, 0, null, null);
+                // adds current block successors
+                addSuccessor(Edge.NORMAL, dflt);
+                dflt.getFirst().status |= Label.TARGET;
+                for (int i = 0; i < labels.length; ++i) {
+                    addSuccessor(Edge.NORMAL, labels[i]);
+                    labels[i].getFirst().status |= Label.TARGET;
+                }
+            } else {
+                // updates current stack size (max stack size unchanged)
+                --stackSize;
+                // adds current block successors
+                addSuccessor(stackSize, dflt);
+                for (int i = 0; i < labels.length; ++i) {
+                    addSuccessor(stackSize, labels[i]);
+                }
+            }
+            // ends current block
+            noSuccessor();
+        }
+    }
+
+    @Override
+    public void visitMultiANewArrayInsn(final String desc, final int dims) {
+        Item i = cw.newClassItem(desc);
+        // Label currentBlock = this.currentBlock;
+        if (currentBlock != null) {
+            if (compute == FRAMES) {
+                currentBlock.frame.execute(Opcodes.MULTIANEWARRAY, dims, cw, i);
+            } else {
+                // updates current stack size (max stack size unchanged because
+                // stack size variation always negative or null)
+                stackSize += 1 - dims;
+            }
+        }
+        // adds the instruction to the bytecode of the method
+        code.put12(Opcodes.MULTIANEWARRAY, i.index).putByte(dims);
+    }
+
+    @Override
+    public void visitTryCatchBlock(final Label start, final Label end,
+            final Label handler, final String type) {
+        ++handlerCount;
+        Handler h = new Handler();
+        h.start = start;
+        h.end = end;
+        h.handler = handler;
+        h.desc = type;
+        h.type = type != null ? cw.newClass(type) : 0;
+        if (lastHandler == null) {
+            firstHandler = h;
+        } else {
+            lastHandler.next = h;
+        }
+        lastHandler = h;
+    }
+
+    @Override
+    public void visitLocalVariable(final String name, final String desc,
+            final String signature, final Label start, final Label end,
+            final int index) {
+        if (signature != null) {
+            if (localVarType == null) {
+                localVarType = new ByteVector();
+            }
+            ++localVarTypeCount;
+            localVarType.putShort(start.position)
+                    .putShort(end.position - start.position)
+                    .putShort(cw.newUTF8(name)).putShort(cw.newUTF8(signature))
+                    .putShort(index);
+        }
+        if (localVar == null) {
+            localVar = new ByteVector();
+        }
+        ++localVarCount;
+        localVar.putShort(start.position)
+                .putShort(end.position - start.position)
+                .putShort(cw.newUTF8(name)).putShort(cw.newUTF8(desc))
+                .putShort(index);
+        if (compute != NOTHING) {
+            // updates max locals
+            char c = desc.charAt(0);
+            int n = index + (c == 'J' || c == 'D' ? 2 : 1);
+            if (n > maxLocals) {
+                maxLocals = n;
+            }
+        }
+    }
+
+    @Override
+    public void visitLineNumber(final int line, final Label start) {
+        if (lineNumber == null) {
+            lineNumber = new ByteVector();
+        }
+        ++lineNumberCount;
+        lineNumber.putShort(start.position);
+        lineNumber.putShort(line);
+    }
+
+    @Override
+    public void visitMaxs(final int maxStack, final int maxLocals) {
+        if (ClassReader.FRAMES && compute == FRAMES) {
+            // completes the control flow graph with exception handler blocks
+            Handler handler = firstHandler;
+            while (handler != null) {
+                Label l = handler.start.getFirst();
+                Label h = handler.handler.getFirst();
+                Label e = handler.end.getFirst();
+                // computes the kind of the edges to 'h'
+                String t = handler.desc == null ? "java/lang/Throwable"
+                        : handler.desc;
+                int kind = Frame.OBJECT | cw.addType(t);
+                // h is an exception handler
+                h.status |= Label.TARGET;
+                // adds 'h' as a successor of labels between 'start' and 'end'
+                while (l != e) {
+                    // creates an edge to 'h'
+                    Edge b = new Edge();
+                    b.info = kind;
+                    b.successor = h;
+                    // adds it to the successors of 'l'
+                    b.next = l.successors;
+                    l.successors = b;
+                    // goes to the next label
+                    l = l.successor;
+                }
+                handler = handler.next;
+            }
+
+            // creates and visits the first (implicit) frame
+            Frame f = labels.frame;
+            Type[] args = Type.getArgumentTypes(descriptor);
+            f.initInputFrame(cw, access, args, this.maxLocals);
+            visitFrame(f);
+
+            /*
+             * fix point algorithm: mark the first basic block as 'changed'
+             * (i.e. put it in the 'changed' list) and, while there are changed
+             * basic blocks, choose one, mark it as unchanged, and update its
+             * successors (which can be changed in the process).
+             */
+            int max = 0;
+            Label changed = labels;
+            while (changed != null) {
+                // removes a basic block from the list of changed basic blocks
+                Label l = changed;
+                changed = changed.next;
+                l.next = null;
+                f = l.frame;
+                // a reachable jump target must be stored in the stack map
+                if ((l.status & Label.TARGET) != 0) {
+                    l.status |= Label.STORE;
+                }
+                // all visited labels are reachable, by definition
+                l.status |= Label.REACHABLE;
+                // updates the (absolute) maximum stack size
+                int blockMax = f.inputStack.length + l.outputStackMax;
+                if (blockMax > max) {
+                    max = blockMax;
+                }
+                // updates the successors of the current basic block
+                Edge e = l.successors;
+                while (e != null) {
+                    Label n = e.successor.getFirst();
+                    boolean change = f.merge(cw, n.frame, e.info);
+                    if (change && n.next == null) {
+                        // if n has changed and is not already in the 'changed'
+                        // list, adds it to this list
+                        n.next = changed;
+                        changed = n;
+                    }
+                    e = e.next;
+                }
+            }
+
+            // visits all the frames that must be stored in the stack map
+            Label l = labels;
+            while (l != null) {
+                f = l.frame;
+                if ((l.status & Label.STORE) != 0) {
+                    visitFrame(f);
+                }
+                if ((l.status & Label.REACHABLE) == 0) {
+                    // finds start and end of dead basic block
+                    Label k = l.successor;
+                    int start = l.position;
+                    int end = (k == null ? code.length : k.position) - 1;
+                    // if non empty basic block
+                    if (end >= start) {
+                        max = Math.max(max, 1);
+                        // replaces instructions with NOP ... NOP ATHROW
+                        for (int i = start; i < end; ++i) {
+                            code.data[i] = Opcodes.NOP;
+                        }
+                        code.data[end] = (byte) Opcodes.ATHROW;
+                        // emits a frame for this unreachable block
+                        int frameIndex = startFrame(start, 0, 1);
+                        frame[frameIndex] = Frame.OBJECT
+                                | cw.addType("java/lang/Throwable");
+                        endFrame();
+                        // removes the start-end range from the exception
+                        // handlers
+                        firstHandler = Handler.remove(firstHandler, l, k);
+                    }
+                }
+                l = l.successor;
+            }
+
+            handler = firstHandler;
+            handlerCount = 0;
+            while (handler != null) {
+                handlerCount += 1;
+                handler = handler.next;
+            }
+
+            this.maxStack = max;
+        } else if (compute == MAXS) {
+            // completes the control flow graph with exception handler blocks
+            Handler handler = firstHandler;
+            while (handler != null) {
+                Label l = handler.start;
+                Label h = handler.handler;
+                Label e = handler.end;
+                // adds 'h' as a successor of labels between 'start' and 'end'
+                while (l != e) {
+                    // creates an edge to 'h'
+                    Edge b = new Edge();
+                    b.info = Edge.EXCEPTION;
+                    b.successor = h;
+                    // adds it to the successors of 'l'
+                    if ((l.status & Label.JSR) == 0) {
+                        b.next = l.successors;
+                        l.successors = b;
+                    } else {
+                        // if l is a JSR block, adds b after the first two edges
+                        // to preserve the hypothesis about JSR block successors
+                        // order (see {@link #visitJumpInsn})
+                        b.next = l.successors.next.next;
+                        l.successors.next.next = b;
+                    }
+                    // goes to the next label
+                    l = l.successor;
+                }
+                handler = handler.next;
+            }
+
+            if (subroutines > 0) {
+                // completes the control flow graph with the RET successors
+                /*
+                 * first step: finds the subroutines. This step determines, for
+                 * each basic block, to which subroutine(s) it belongs.
+                 */
+                // finds the basic blocks that belong to the "main" subroutine
+                int id = 0;
+                labels.visitSubroutine(null, 1, subroutines);
+                // finds the basic blocks that belong to the real subroutines
+                Label l = labels;
+                while (l != null) {
+                    if ((l.status & Label.JSR) != 0) {
+                        // the subroutine is defined by l's TARGET, not by l
+                        Label subroutine = l.successors.next.successor;
+                        // if this subroutine has not been visited yet...
+                        if ((subroutine.status & Label.VISITED) == 0) {
+                            // ...assigns it a new id and finds its basic blocks
+                            id += 1;
+                            subroutine.visitSubroutine(null, (id / 32L) << 32
+                                    | (1L << (id % 32)), subroutines);
+                        }
+                    }
+                    l = l.successor;
+                }
+                // second step: finds the successors of RET blocks
+                l = labels;
+                while (l != null) {
+                    if ((l.status & Label.JSR) != 0) {
+                        Label L = labels;
+                        while (L != null) {
+                            L.status &= ~Label.VISITED2;
+                            L = L.successor;
+                        }
+                        // the subroutine is defined by l's TARGET, not by l
+                        Label subroutine = l.successors.next.successor;
+                        subroutine.visitSubroutine(l, 0, subroutines);
+                    }
+                    l = l.successor;
+                }
+            }
+
+            /*
+             * control flow analysis algorithm: while the block stack is not
+             * empty, pop a block from this stack, update the max stack size,
+             * compute the true (non relative) begin stack size of the
+             * successors of this block, and push these successors onto the
+             * stack (unless they have already been pushed onto the stack).
+             * Note: by hypothesis, the {@link Label#inputStackTop} of the
+             * blocks in the block stack are the true (non relative) beginning
+             * stack sizes of these blocks.
+             */
+            int max = 0;
+            Label stack = labels;
+            while (stack != null) {
+                // pops a block from the stack
+                Label l = stack;
+                stack = stack.next;
+                // computes the true (non relative) max stack size of this block
+                int start = l.inputStackTop;
+                int blockMax = start + l.outputStackMax;
+                // updates the global max stack size
+                if (blockMax > max) {
+                    max = blockMax;
+                }
+                // analyzes the successors of the block
+                Edge b = l.successors;
+                if ((l.status & Label.JSR) != 0) {
+                    // ignores the first edge of JSR blocks (virtual successor)
+                    b = b.next;
+                }
+                while (b != null) {
+                    l = b.successor;
+                    // if this successor has not already been pushed...
+                    if ((l.status & Label.PUSHED) == 0) {
+                        // computes its true beginning stack size...
+                        l.inputStackTop = b.info == Edge.EXCEPTION ? 1 : start
+                                + b.info;
+                        // ...and pushes it onto the stack
+                        l.status |= Label.PUSHED;
+                        l.next = stack;
+                        stack = l;
+                    }
+                    b = b.next;
+                }
+            }
+            this.maxStack = Math.max(maxStack, max);
+        } else {
+            this.maxStack = maxStack;
+            this.maxLocals = maxLocals;
+        }
+    }
+
+    @Override
+    public void visitEnd() {
+    }
+
+    // ------------------------------------------------------------------------
+    // Utility methods: control flow analysis algorithm
+    // ------------------------------------------------------------------------
+
+    /**
+     * Adds a successor to the {@link #currentBlock currentBlock} block.
+     * 
+     * @param info
+     *            information about the control flow edge to be added.
+     * @param successor
+     *            the successor block to be added to the current block.
+     */
+    private void addSuccessor(final int info, final Label successor) {
+        // creates and initializes an Edge object...
+        Edge b = new Edge();
+        b.info = info;
+        b.successor = successor;
+        // ...and adds it to the successor list of the currentBlock block
+        b.next = currentBlock.successors;
+        currentBlock.successors = b;
+    }
+
+    /**
+     * Ends the current basic block. This method must be used in the case where
+     * the current basic block does not have any successor.
+     */
+    private void noSuccessor() {
+        if (compute == FRAMES) {
+            Label l = new Label();
+            l.frame = new Frame();
+            l.frame.owner = l;
+            l.resolve(this, code.length, code.data);
+            previousBlock.successor = l;
+            previousBlock = l;
+        } else {
+            currentBlock.outputStackMax = maxStackSize;
+        }
+        currentBlock = null;
+    }
+
+    // ------------------------------------------------------------------------
+    // Utility methods: stack map frames
+    // ------------------------------------------------------------------------
+
+    /**
+     * Visits a frame that has been computed from scratch.
+     * 
+     * @param f
+     *            the frame that must be visited.
+     */
+    private void visitFrame(final Frame f) {
+        int i, t;
+        int nTop = 0;
+        int nLocal = 0;
+        int nStack = 0;
+        int[] locals = f.inputLocals;
+        int[] stacks = f.inputStack;
+        // computes the number of locals (ignores TOP types that are just after
+        // a LONG or a DOUBLE, and all trailing TOP types)
+        for (i = 0; i < locals.length; ++i) {
+            t = locals[i];
+            if (t == Frame.TOP) {
+                ++nTop;
+            } else {
+                nLocal += nTop + 1;
+                nTop = 0;
+            }
+            if (t == Frame.LONG || t == Frame.DOUBLE) {
+                ++i;
+            }
+        }
+        // computes the stack size (ignores TOP types that are just after
+        // a LONG or a DOUBLE)
+        for (i = 0; i < stacks.length; ++i) {
+            t = stacks[i];
+            ++nStack;
+            if (t == Frame.LONG || t == Frame.DOUBLE) {
+                ++i;
+            }
+        }
+        // visits the frame and its content
+        int frameIndex = startFrame(f.owner.position, nLocal, nStack);
+        for (i = 0; nLocal > 0; ++i, --nLocal) {
+            t = locals[i];
+            frame[frameIndex++] = t;
+            if (t == Frame.LONG || t == Frame.DOUBLE) {
+                ++i;
+            }
+        }
+        for (i = 0; i < stacks.length; ++i) {
+            t = stacks[i];
+            frame[frameIndex++] = t;
+            if (t == Frame.LONG || t == Frame.DOUBLE) {
+                ++i;
+            }
+        }
+        endFrame();
+    }
+
+    /**
+     * Visit the implicit first frame of this method.
+     */
+    private void visitImplicitFirstFrame() {
+        // There can be at most descriptor.length() + 1 locals
+        int frameIndex = startFrame(0, descriptor.length() + 1, 0);
+        if ((access & Opcodes.ACC_STATIC) == 0) {
+            if ((access & ACC_CONSTRUCTOR) == 0) {
+                frame[frameIndex++] = Frame.OBJECT | cw.addType(cw.thisName);
+            } else {
+                frame[frameIndex++] = 6; // Opcodes.UNINITIALIZED_THIS;
+            }
+        }
+        int i = 1;
+        loop: while (true) {
+            int j = i;
+            switch (descriptor.charAt(i++)) {
+            case 'Z':
+            case 'C':
+            case 'B':
+            case 'S':
+            case 'I':
+                frame[frameIndex++] = 1; // Opcodes.INTEGER;
+                break;
+            case 'F':
+                frame[frameIndex++] = 2; // Opcodes.FLOAT;
+                break;
+            case 'J':
+                frame[frameIndex++] = 4; // Opcodes.LONG;
+                break;
+            case 'D':
+                frame[frameIndex++] = 3; // Opcodes.DOUBLE;
+                break;
+            case '[':
+                while (descriptor.charAt(i) == '[') {
+                    ++i;
+                }
+                if (descriptor.charAt(i) == 'L') {
+                    ++i;
+                    while (descriptor.charAt(i) != ';') {
+                        ++i;
+                    }
+                }
+                frame[frameIndex++] = Frame.OBJECT
+                        | cw.addType(descriptor.substring(j, ++i));
+                break;
+            case 'L':
+                while (descriptor.charAt(i) != ';') {
+                    ++i;
+                }
+                frame[frameIndex++] = Frame.OBJECT
+                        | cw.addType(descriptor.substring(j + 1, i++));
+                break;
+            default:
+                break loop;
+            }
+        }
+        frame[1] = frameIndex - 3;
+        endFrame();
+    }
+
+    /**
+     * Starts the visit of a stack map frame.
+     * 
+     * @param offset
+     *            the offset of the instruction to which the frame corresponds.
+     * @param nLocal
+     *            the number of local variables in the frame.
+     * @param nStack
+     *            the number of stack elements in the frame.
+     * @return the index of the next element to be written in this frame.
+     */
+    private int startFrame(final int offset, final int nLocal, final int nStack) {
+        int n = 3 + nLocal + nStack;
+        if (frame == null || frame.length < n) {
+            frame = new int[n];
+        }
+        frame[0] = offset;
+        frame[1] = nLocal;
+        frame[2] = nStack;
+        return 3;
+    }
+
+    /**
+     * Checks if the visit of the current frame {@link #frame} is finished, and
+     * if yes, write it in the StackMapTable attribute.
+     */
+    private void endFrame() {
+        if (previousFrame != null) { // do not write the first frame
+            if (stackMap == null) {
+                stackMap = new ByteVector();
+            }
+            writeFrame();
+            ++frameCount;
+        }
+        previousFrame = frame;
+        frame = null;
+    }
+
+    /**
+     * Compress and writes the current frame {@link #frame} in the StackMapTable
+     * attribute.
+     */
+    private void writeFrame() {
+        int clocalsSize = frame[1];
+        int cstackSize = frame[2];
+        if ((cw.version & 0xFFFF) < Opcodes.V1_6) {
+            stackMap.putShort(frame[0]).putShort(clocalsSize);
+            writeFrameTypes(3, 3 + clocalsSize);
+            stackMap.putShort(cstackSize);
+            writeFrameTypes(3 + clocalsSize, 3 + clocalsSize + cstackSize);
+            return;
+        }
+        int localsSize = previousFrame[1];
+        int type = FULL_FRAME;
+        int k = 0;
+        int delta;
+        if (frameCount == 0) {
+            delta = frame[0];
+        } else {
+            delta = frame[0] - previousFrame[0] - 1;
+        }
+        if (cstackSize == 0) {
+            k = clocalsSize - localsSize;
+            switch (k) {
+            case -3:
+            case -2:
+            case -1:
+                type = CHOP_FRAME;
+                localsSize = clocalsSize;
+                break;
+            case 0:
+                type = delta < 64 ? SAME_FRAME : SAME_FRAME_EXTENDED;
+                break;
+            case 1:
+            case 2:
+            case 3:
+                type = APPEND_FRAME;
+                break;
+            }
+        } else if (clocalsSize == localsSize && cstackSize == 1) {
+            type = delta < 63 ? SAME_LOCALS_1_STACK_ITEM_FRAME
+                    : SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED;
+        }
+        if (type != FULL_FRAME) {
+            // verify if locals are the same
+            int l = 3;
+            for (int j = 0; j < localsSize; j++) {
+                if (frame[l] != previousFrame[l]) {
+                    type = FULL_FRAME;
+                    break;
+                }
+                l++;
+            }
+        }
+        switch (type) {
+        case SAME_FRAME:
+            stackMap.putByte(delta);
+            break;
+        case SAME_LOCALS_1_STACK_ITEM_FRAME:
+            stackMap.putByte(SAME_LOCALS_1_STACK_ITEM_FRAME + delta);
+            writeFrameTypes(3 + clocalsSize, 4 + clocalsSize);
+            break;
+        case SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED:
+            stackMap.putByte(SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED).putShort(
+                    delta);
+            writeFrameTypes(3 + clocalsSize, 4 + clocalsSize);
+            break;
+        case SAME_FRAME_EXTENDED:
+            stackMap.putByte(SAME_FRAME_EXTENDED).putShort(delta);
+            break;
+        case CHOP_FRAME:
+            stackMap.putByte(SAME_FRAME_EXTENDED + k).putShort(delta);
+            break;
+        case APPEND_FRAME:
+            stackMap.putByte(SAME_FRAME_EXTENDED + k).putShort(delta);
+            writeFrameTypes(3 + localsSize, 3 + clocalsSize);
+            break;
+        // case FULL_FRAME:
+        default:
+            stackMap.putByte(FULL_FRAME).putShort(delta).putShort(clocalsSize);
+            writeFrameTypes(3, 3 + clocalsSize);
+            stackMap.putShort(cstackSize);
+            writeFrameTypes(3 + clocalsSize, 3 + clocalsSize + cstackSize);
+        }
+    }
+
+    /**
+     * Writes some types of the current frame {@link #frame} into the
+     * StackMapTableAttribute. This method converts types from the format used
+     * in {@link Label} to the format used in StackMapTable attributes. In
+     * particular, it converts type table indexes to constant pool indexes.
+     * 
+     * @param start
+     *            index of the first type in {@link #frame} to write.
+     * @param end
+     *            index of last type in {@link #frame} to write (exclusive).
+     */
+    private void writeFrameTypes(final int start, final int end) {
+        for (int i = start; i < end; ++i) {
+            int t = frame[i];
+            int d = t & Frame.DIM;
+            if (d == 0) {
+                int v = t & Frame.BASE_VALUE;
+                switch (t & Frame.BASE_KIND) {
+                case Frame.OBJECT:
+                    stackMap.putByte(7).putShort(
+                            cw.newClass(cw.typeTable[v].strVal1));
+                    break;
+                case Frame.UNINITIALIZED:
+                    stackMap.putByte(8).putShort(cw.typeTable[v].intVal);
+                    break;
+                default:
+                    stackMap.putByte(v);
+                }
+            } else {
+                StringBuffer buf = new StringBuffer();
+                d >>= 28;
+                while (d-- > 0) {
+                    buf.append('[');
+                }
+                if ((t & Frame.BASE_KIND) == Frame.OBJECT) {
+                    buf.append('L');
+                    buf.append(cw.typeTable[t & Frame.BASE_VALUE].strVal1);
+                    buf.append(';');
+                } else {
+                    switch (t & 0xF) {
+                    case 1:
+                        buf.append('I');
+                        break;
+                    case 2:
+                        buf.append('F');
+                        break;
+                    case 3:
+                        buf.append('D');
+                        break;
+                    case 9:
+                        buf.append('Z');
+                        break;
+                    case 10:
+                        buf.append('B');
+                        break;
+                    case 11:
+                        buf.append('C');
+                        break;
+                    case 12:
+                        buf.append('S');
+                        break;
+                    default:
+                        buf.append('J');
+                    }
+                }
+                stackMap.putByte(7).putShort(cw.newClass(buf.toString()));
+            }
+        }
+    }
+
+    private void writeFrameType(final Object type) {
+        if (type instanceof String) {
+            stackMap.putByte(7).putShort(cw.newClass((String) type));
+        } else if (type instanceof Integer) {
+            stackMap.putByte(((Integer) type).intValue());
+        } else {
+            stackMap.putByte(8).putShort(((Label) type).position);
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // Utility methods: dump bytecode array
+    // ------------------------------------------------------------------------
+
+    /**
+     * Returns the size of the bytecode of this method.
+     * 
+     * @return the size of the bytecode of this method.
+     */
+    final int getSize() {
+        if (classReaderOffset != 0) {
+            return 6 + classReaderLength;
+        }
+        if (resize) {
+            // replaces the temporary jump opcodes introduced by Label.resolve.
+            if (ClassReader.RESIZE) {
+                resizeInstructions();
+            } else {
+                throw new RuntimeException("Method code too large!");
+            }
+        }
+        int size = 8;
+        if (code.length > 0) {
+            if (code.length > 65536) {
+                throw new RuntimeException("Method code too large!");
+            }
+            cw.newUTF8("Code");
+            size += 18 + code.length + 8 * handlerCount;
+            if (localVar != null) {
+                cw.newUTF8("LocalVariableTable");
+                size += 8 + localVar.length;
+            }
+            if (localVarType != null) {
+                cw.newUTF8("LocalVariableTypeTable");
+                size += 8 + localVarType.length;
+            }
+            if (lineNumber != null) {
+                cw.newUTF8("LineNumberTable");
+                size += 8 + lineNumber.length;
+            }
+            if (stackMap != null) {
+                boolean zip = (cw.version & 0xFFFF) >= Opcodes.V1_6;
+                cw.newUTF8(zip ? "StackMapTable" : "StackMap");
+                size += 8 + stackMap.length;
+            }
+            if (cattrs != null) {
+                size += cattrs.getSize(cw, code.data, code.length, maxStack,
+                        maxLocals);
+            }
+        }
+        if (exceptionCount > 0) {
+            cw.newUTF8("Exceptions");
+            size += 8 + 2 * exceptionCount;
+        }
+        if ((access & Opcodes.ACC_SYNTHETIC) != 0) {
+            if ((cw.version & 0xFFFF) < Opcodes.V1_5
+                    || (access & ClassWriter.ACC_SYNTHETIC_ATTRIBUTE) != 0) {
+                cw.newUTF8("Synthetic");
+                size += 6;
+            }
+        }
+        if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+            cw.newUTF8("Deprecated");
+            size += 6;
+        }
+        if (ClassReader.SIGNATURES && signature != null) {
+            cw.newUTF8("Signature");
+            cw.newUTF8(signature);
+            size += 8;
+        }
+        if (ClassReader.ANNOTATIONS && annd != null) {
+            cw.newUTF8("AnnotationDefault");
+            size += 6 + annd.length;
+        }
+        if (ClassReader.ANNOTATIONS && anns != null) {
+            cw.newUTF8("RuntimeVisibleAnnotations");
+            size += 8 + anns.getSize();
+        }
+        if (ClassReader.ANNOTATIONS && ianns != null) {
+            cw.newUTF8("RuntimeInvisibleAnnotations");
+            size += 8 + ianns.getSize();
+        }
+        if (ClassReader.ANNOTATIONS && panns != null) {
+            cw.newUTF8("RuntimeVisibleParameterAnnotations");
+            size += 7 + 2 * (panns.length - synthetics);
+            for (int i = panns.length - 1; i >= synthetics; --i) {
+                size += panns[i] == null ? 0 : panns[i].getSize();
+            }
+        }
+        if (ClassReader.ANNOTATIONS && ipanns != null) {
+            cw.newUTF8("RuntimeInvisibleParameterAnnotations");
+            size += 7 + 2 * (ipanns.length - synthetics);
+            for (int i = ipanns.length - 1; i >= synthetics; --i) {
+                size += ipanns[i] == null ? 0 : ipanns[i].getSize();
+            }
+        }
+        if (attrs != null) {
+            size += attrs.getSize(cw, null, 0, -1, -1);
+        }
+        return size;
+    }
+
+    /**
+     * Puts the bytecode of this method in the given byte vector.
+     * 
+     * @param out
+     *            the byte vector into which the bytecode of this method must be
+     *            copied.
+     */
+    final void put(final ByteVector out) {
+        final int FACTOR = ClassWriter.TO_ACC_SYNTHETIC;
+        int mask = ACC_CONSTRUCTOR | Opcodes.ACC_DEPRECATED
+                | ClassWriter.ACC_SYNTHETIC_ATTRIBUTE
+                | ((access & ClassWriter.ACC_SYNTHETIC_ATTRIBUTE) / FACTOR);
+        out.putShort(access & ~mask).putShort(name).putShort(desc);
+        if (classReaderOffset != 0) {
+            out.putByteArray(cw.cr.b, classReaderOffset, classReaderLength);
+            return;
+        }
+        int attributeCount = 0;
+        if (code.length > 0) {
+            ++attributeCount;
+        }
+        if (exceptionCount > 0) {
+            ++attributeCount;
+        }
+        if ((access & Opcodes.ACC_SYNTHETIC) != 0) {
+            if ((cw.version & 0xFFFF) < Opcodes.V1_5
+                    || (access & ClassWriter.ACC_SYNTHETIC_ATTRIBUTE) != 0) {
+                ++attributeCount;
+            }
+        }
+        if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+            ++attributeCount;
+        }
+        if (ClassReader.SIGNATURES && signature != null) {
+            ++attributeCount;
+        }
+        if (ClassReader.ANNOTATIONS && annd != null) {
+            ++attributeCount;
+        }
+        if (ClassReader.ANNOTATIONS && anns != null) {
+            ++attributeCount;
+        }
+        if (ClassReader.ANNOTATIONS && ianns != null) {
+            ++attributeCount;
+        }
+        if (ClassReader.ANNOTATIONS && panns != null) {
+            ++attributeCount;
+        }
+        if (ClassReader.ANNOTATIONS && ipanns != null) {
+            ++attributeCount;
+        }
+        if (attrs != null) {
+            attributeCount += attrs.getCount();
+        }
+        out.putShort(attributeCount);
+        if (code.length > 0) {
+            int size = 12 + code.length + 8 * handlerCount;
+            if (localVar != null) {
+                size += 8 + localVar.length;
+            }
+            if (localVarType != null) {
+                size += 8 + localVarType.length;
+            }
+            if (lineNumber != null) {
+                size += 8 + lineNumber.length;
+            }
+            if (stackMap != null) {
+                size += 8 + stackMap.length;
+            }
+            if (cattrs != null) {
+                size += cattrs.getSize(cw, code.data, code.length, maxStack,
+                        maxLocals);
+            }
+            out.putShort(cw.newUTF8("Code")).putInt(size);
+            out.putShort(maxStack).putShort(maxLocals);
+            out.putInt(code.length).putByteArray(code.data, 0, code.length);
+            out.putShort(handlerCount);
+            if (handlerCount > 0) {
+                Handler h = firstHandler;
+                while (h != null) {
+                    out.putShort(h.start.position).putShort(h.end.position)
+                            .putShort(h.handler.position).putShort(h.type);
+                    h = h.next;
+                }
+            }
+            attributeCount = 0;
+            if (localVar != null) {
+                ++attributeCount;
+            }
+            if (localVarType != null) {
+                ++attributeCount;
+            }
+            if (lineNumber != null) {
+                ++attributeCount;
+            }
+            if (stackMap != null) {
+                ++attributeCount;
+            }
+            if (cattrs != null) {
+                attributeCount += cattrs.getCount();
+            }
+            out.putShort(attributeCount);
+            if (localVar != null) {
+                out.putShort(cw.newUTF8("LocalVariableTable"));
+                out.putInt(localVar.length + 2).putShort(localVarCount);
+                out.putByteArray(localVar.data, 0, localVar.length);
+            }
+            if (localVarType != null) {
+                out.putShort(cw.newUTF8("LocalVariableTypeTable"));
+                out.putInt(localVarType.length + 2).putShort(localVarTypeCount);
+                out.putByteArray(localVarType.data, 0, localVarType.length);
+            }
+            if (lineNumber != null) {
+                out.putShort(cw.newUTF8("LineNumberTable"));
+                out.putInt(lineNumber.length + 2).putShort(lineNumberCount);
+                out.putByteArray(lineNumber.data, 0, lineNumber.length);
+            }
+            if (stackMap != null) {
+                boolean zip = (cw.version & 0xFFFF) >= Opcodes.V1_6;
+                out.putShort(cw.newUTF8(zip ? "StackMapTable" : "StackMap"));
+                out.putInt(stackMap.length + 2).putShort(frameCount);
+                out.putByteArray(stackMap.data, 0, stackMap.length);
+            }
+            if (cattrs != null) {
+                cattrs.put(cw, code.data, code.length, maxLocals, maxStack, out);
+            }
+        }
+        if (exceptionCount > 0) {
+            out.putShort(cw.newUTF8("Exceptions")).putInt(
+                    2 * exceptionCount + 2);
+            out.putShort(exceptionCount);
+            for (int i = 0; i < exceptionCount; ++i) {
+                out.putShort(exceptions[i]);
+            }
+        }
+        if ((access & Opcodes.ACC_SYNTHETIC) != 0) {
+            if ((cw.version & 0xFFFF) < Opcodes.V1_5
+                    || (access & ClassWriter.ACC_SYNTHETIC_ATTRIBUTE) != 0) {
+                out.putShort(cw.newUTF8("Synthetic")).putInt(0);
+            }
+        }
+        if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+            out.putShort(cw.newUTF8("Deprecated")).putInt(0);
+        }
+        if (ClassReader.SIGNATURES && signature != null) {
+            out.putShort(cw.newUTF8("Signature")).putInt(2)
+                    .putShort(cw.newUTF8(signature));
+        }
+        if (ClassReader.ANNOTATIONS && annd != null) {
+            out.putShort(cw.newUTF8("AnnotationDefault"));
+            out.putInt(annd.length);
+            out.putByteArray(annd.data, 0, annd.length);
+        }
+        if (ClassReader.ANNOTATIONS && anns != null) {
+            out.putShort(cw.newUTF8("RuntimeVisibleAnnotations"));
+            anns.put(out);
+        }
+        if (ClassReader.ANNOTATIONS && ianns != null) {
+            out.putShort(cw.newUTF8("RuntimeInvisibleAnnotations"));
+            ianns.put(out);
+        }
+        if (ClassReader.ANNOTATIONS && panns != null) {
+            out.putShort(cw.newUTF8("RuntimeVisibleParameterAnnotations"));
+            AnnotationWriter.put(panns, synthetics, out);
+        }
+        if (ClassReader.ANNOTATIONS && ipanns != null) {
+            out.putShort(cw.newUTF8("RuntimeInvisibleParameterAnnotations"));
+            AnnotationWriter.put(ipanns, synthetics, out);
+        }
+        if (attrs != null) {
+            attrs.put(cw, null, 0, -1, -1, out);
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // Utility methods: instruction resizing (used to handle GOTO_W and JSR_W)
+    // ------------------------------------------------------------------------
+
+    /**
+     * Resizes and replaces the temporary instructions inserted by
+     * {@link Label#resolve} for wide forward jumps, while keeping jump offsets
+     * and instruction addresses consistent. This may require to resize other
+     * existing instructions, or even to introduce new instructions: for
+     * example, increasing the size of an instruction by 2 at the middle of a
+     * method can increases the offset of an IFEQ instruction from 32766 to
+     * 32768, in which case IFEQ 32766 must be replaced with IFNEQ 8 GOTO_W
+     * 32765. This, in turn, may require to increase the size of another jump
+     * instruction, and so on... All these operations are handled automatically
+     * by this method.
+     * <p>
+     * <i>This method must be called after all the method that is being built
+     * has been visited</i>. In particular, the {@link Label Label} objects used
+     * to construct the method are no longer valid after this method has been
+     * called.
+     */
+    private void resizeInstructions() {
+        byte[] b = code.data; // bytecode of the method
+        int u, v, label; // indexes in b
+        int i, j; // loop indexes
+        /*
+         * 1st step: As explained above, resizing an instruction may require to
+         * resize another one, which may require to resize yet another one, and
+         * so on. The first step of the algorithm consists in finding all the
+         * instructions that need to be resized, without modifying the code.
+         * This is done by the following "fix point" algorithm:
+         * 
+         * Parse the code to find the jump instructions whose offset will need
+         * more than 2 bytes to be stored (the future offset is computed from
+         * the current offset and from the number of bytes that will be inserted
+         * or removed between the source and target instructions). For each such
+         * instruction, adds an entry in (a copy of) the indexes and sizes
+         * arrays (if this has not already been done in a previous iteration!).
+         * 
+         * If at least one entry has been added during the previous step, go
+         * back to the beginning, otherwise stop.
+         * 
+         * In fact the real algorithm is complicated by the fact that the size
+         * of TABLESWITCH and LOOKUPSWITCH instructions depends on their
+         * position in the bytecode (because of padding). In order to ensure the
+         * convergence of the algorithm, the number of bytes to be added or
+         * removed from these instructions is over estimated during the previous
+         * loop, and computed exactly only after the loop is finished (this
+         * requires another pass to parse the bytecode of the method).
+         */
+        int[] allIndexes = new int[0]; // copy of indexes
+        int[] allSizes = new int[0]; // copy of sizes
+        boolean[] resize; // instructions to be resized
+        int newOffset; // future offset of a jump instruction
+
+        resize = new boolean[code.length];
+
+        // 3 = loop again, 2 = loop ended, 1 = last pass, 0 = done
+        int state = 3;
+        do {
+            if (state == 3) {
+                state = 2;
+            }
+            u = 0;
+            while (u < b.length) {
+                int opcode = b[u] & 0xFF; // opcode of current instruction
+                int insert = 0; // bytes to be added after this instruction
+
+                switch (ClassWriter.TYPE[opcode]) {
+                case ClassWriter.NOARG_INSN:
+                case ClassWriter.IMPLVAR_INSN:
+                    u += 1;
+                    break;
+                case ClassWriter.LABEL_INSN:
+                    if (opcode > 201) {
+                        // converts temporary opcodes 202 to 217, 218 and
+                        // 219 to IFEQ ... JSR (inclusive), IFNULL and
+                        // IFNONNULL
+                        opcode = opcode < 218 ? opcode - 49 : opcode - 20;
+                        label = u + readUnsignedShort(b, u + 1);
+                    } else {
+                        label = u + readShort(b, u + 1);
+                    }
+                    newOffset = getNewOffset(allIndexes, allSizes, u, label);
+                    if (newOffset < Short.MIN_VALUE
+                            || newOffset > Short.MAX_VALUE) {
+                        if (!resize[u]) {
+                            if (opcode == Opcodes.GOTO || opcode == Opcodes.JSR) {
+                                // two additional bytes will be required to
+                                // replace this GOTO or JSR instruction with
+                                // a GOTO_W or a JSR_W
+                                insert = 2;
+                            } else {
+                                // five additional bytes will be required to
+                                // replace this IFxxx <l> instruction with
+                                // IFNOTxxx <l'> GOTO_W <l>, where IFNOTxxx
+                                // is the "opposite" opcode of IFxxx (i.e.,
+                                // IFNE for IFEQ) and where <l'> designates
+                                // the instruction just after the GOTO_W.
+                                insert = 5;
+                            }
+                            resize[u] = true;
+                        }
+                    }
+                    u += 3;
+                    break;
+                case ClassWriter.LABELW_INSN:
+                    u += 5;
+                    break;
+                case ClassWriter.TABL_INSN:
+                    if (state == 1) {
+                        // true number of bytes to be added (or removed)
+                        // from this instruction = (future number of padding
+                        // bytes - current number of padding byte) -
+                        // previously over estimated variation =
+                        // = ((3 - newOffset%4) - (3 - u%4)) - u%4
+                        // = (-newOffset%4 + u%4) - u%4
+                        // = -(newOffset & 3)
+                        newOffset = getNewOffset(allIndexes, allSizes, 0, u);
+                        insert = -(newOffset & 3);
+                    } else if (!resize[u]) {
+                        // over estimation of the number of bytes to be
+                        // added to this instruction = 3 - current number
+                        // of padding bytes = 3 - (3 - u%4) = u%4 = u & 3
+                        insert = u & 3;
+                        resize[u] = true;
+                    }
+                    // skips instruction
+                    u = u + 4 - (u & 3);
+                    u += 4 * (readInt(b, u + 8) - readInt(b, u + 4) + 1) + 12;
+                    break;
+                case ClassWriter.LOOK_INSN:
+                    if (state == 1) {
+                        // like TABL_INSN
+                        newOffset = getNewOffset(allIndexes, allSizes, 0, u);
+                        insert = -(newOffset & 3);
+                    } else if (!resize[u]) {
+                        // like TABL_INSN
+                        insert = u & 3;
+                        resize[u] = true;
+                    }
+                    // skips instruction
+                    u = u + 4 - (u & 3);
+                    u += 8 * readInt(b, u + 4) + 8;
+                    break;
+                case ClassWriter.WIDE_INSN:
+                    opcode = b[u + 1] & 0xFF;
+                    if (opcode == Opcodes.IINC) {
+                        u += 6;
+                    } else {
+                        u += 4;
+                    }
+                    break;
+                case ClassWriter.VAR_INSN:
+                case ClassWriter.SBYTE_INSN:
+                case ClassWriter.LDC_INSN:
+                    u += 2;
+                    break;
+                case ClassWriter.SHORT_INSN:
+                case ClassWriter.LDCW_INSN:
+                case ClassWriter.FIELDORMETH_INSN:
+                case ClassWriter.TYPE_INSN:
+                case ClassWriter.IINC_INSN:
+                    u += 3;
+                    break;
+                case ClassWriter.ITFMETH_INSN:
+                case ClassWriter.INDYMETH_INSN:
+                    u += 5;
+                    break;
+                // case ClassWriter.MANA_INSN:
+                default:
+                    u += 4;
+                    break;
+                }
+                if (insert != 0) {
+                    // adds a new (u, insert) entry in the allIndexes and
+                    // allSizes arrays
+                    int[] newIndexes = new int[allIndexes.length + 1];
+                    int[] newSizes = new int[allSizes.length + 1];
+                    System.arraycopy(allIndexes, 0, newIndexes, 0,
+                            allIndexes.length);
+                    System.arraycopy(allSizes, 0, newSizes, 0, allSizes.length);
+                    newIndexes[allIndexes.length] = u;
+                    newSizes[allSizes.length] = insert;
+                    allIndexes = newIndexes;
+                    allSizes = newSizes;
+                    if (insert > 0) {
+                        state = 3;
+                    }
+                }
+            }
+            if (state < 3) {
+                --state;
+            }
+        } while (state != 0);
+
+        // 2nd step:
+        // copies the bytecode of the method into a new bytevector, updates the
+        // offsets, and inserts (or removes) bytes as requested.
+
+        ByteVector newCode = new ByteVector(code.length);
+
+        u = 0;
+        while (u < code.length) {
+            int opcode = b[u] & 0xFF;
+            switch (ClassWriter.TYPE[opcode]) {
+            case ClassWriter.NOARG_INSN:
+            case ClassWriter.IMPLVAR_INSN:
+                newCode.putByte(opcode);
+                u += 1;
+                break;
+            case ClassWriter.LABEL_INSN:
+                if (opcode > 201) {
+                    // changes temporary opcodes 202 to 217 (inclusive), 218
+                    // and 219 to IFEQ ... JSR (inclusive), IFNULL and
+                    // IFNONNULL
+                    opcode = opcode < 218 ? opcode - 49 : opcode - 20;
+                    label = u + readUnsignedShort(b, u + 1);
+                } else {
+                    label = u + readShort(b, u + 1);
+                }
+                newOffset = getNewOffset(allIndexes, allSizes, u, label);
+                if (resize[u]) {
+                    // replaces GOTO with GOTO_W, JSR with JSR_W and IFxxx
+                    // <l> with IFNOTxxx <l'> GOTO_W <l>, where IFNOTxxx is
+                    // the "opposite" opcode of IFxxx (i.e., IFNE for IFEQ)
+                    // and where <l'> designates the instruction just after
+                    // the GOTO_W.
+                    if (opcode == Opcodes.GOTO) {
+                        newCode.putByte(200); // GOTO_W
+                    } else if (opcode == Opcodes.JSR) {
+                        newCode.putByte(201); // JSR_W
+                    } else {
+                        newCode.putByte(opcode <= 166 ? ((opcode + 1) ^ 1) - 1
+                                : opcode ^ 1);
+                        newCode.putShort(8); // jump offset
+                        newCode.putByte(200); // GOTO_W
+                        // newOffset now computed from start of GOTO_W
+                        newOffset -= 3;
+                    }
+                    newCode.putInt(newOffset);
+                } else {
+                    newCode.putByte(opcode);
+                    newCode.putShort(newOffset);
+                }
+                u += 3;
+                break;
+            case ClassWriter.LABELW_INSN:
+                label = u + readInt(b, u + 1);
+                newOffset = getNewOffset(allIndexes, allSizes, u, label);
+                newCode.putByte(opcode);
+                newCode.putInt(newOffset);
+                u += 5;
+                break;
+            case ClassWriter.TABL_INSN:
+                // skips 0 to 3 padding bytes
+                v = u;
+                u = u + 4 - (v & 3);
+                // reads and copies instruction
+                newCode.putByte(Opcodes.TABLESWITCH);
+                newCode.putByteArray(null, 0, (4 - newCode.length % 4) % 4);
+                label = v + readInt(b, u);
+                u += 4;
+                newOffset = getNewOffset(allIndexes, allSizes, v, label);
+                newCode.putInt(newOffset);
+                j = readInt(b, u);
+                u += 4;
+                newCode.putInt(j);
+                j = readInt(b, u) - j + 1;
+                u += 4;
+                newCode.putInt(readInt(b, u - 4));
+                for (; j > 0; --j) {
+                    label = v + readInt(b, u);
+                    u += 4;
+                    newOffset = getNewOffset(allIndexes, allSizes, v, label);
+                    newCode.putInt(newOffset);
+                }
+                break;
+            case ClassWriter.LOOK_INSN:
+                // skips 0 to 3 padding bytes
+                v = u;
+                u = u + 4 - (v & 3);
+                // reads and copies instruction
+                newCode.putByte(Opcodes.LOOKUPSWITCH);
+                newCode.putByteArray(null, 0, (4 - newCode.length % 4) % 4);
+                label = v + readInt(b, u);
+                u += 4;
+                newOffset = getNewOffset(allIndexes, allSizes, v, label);
+                newCode.putInt(newOffset);
+                j = readInt(b, u);
+                u += 4;
+                newCode.putInt(j);
+                for (; j > 0; --j) {
+                    newCode.putInt(readInt(b, u));
+                    u += 4;
+                    label = v + readInt(b, u);
+                    u += 4;
+                    newOffset = getNewOffset(allIndexes, allSizes, v, label);
+                    newCode.putInt(newOffset);
+                }
+                break;
+            case ClassWriter.WIDE_INSN:
+                opcode = b[u + 1] & 0xFF;
+                if (opcode == Opcodes.IINC) {
+                    newCode.putByteArray(b, u, 6);
+                    u += 6;
+                } else {
+                    newCode.putByteArray(b, u, 4);
+                    u += 4;
+                }
+                break;
+            case ClassWriter.VAR_INSN:
+            case ClassWriter.SBYTE_INSN:
+            case ClassWriter.LDC_INSN:
+                newCode.putByteArray(b, u, 2);
+                u += 2;
+                break;
+            case ClassWriter.SHORT_INSN:
+            case ClassWriter.LDCW_INSN:
+            case ClassWriter.FIELDORMETH_INSN:
+            case ClassWriter.TYPE_INSN:
+            case ClassWriter.IINC_INSN:
+                newCode.putByteArray(b, u, 3);
+                u += 3;
+                break;
+            case ClassWriter.ITFMETH_INSN:
+            case ClassWriter.INDYMETH_INSN:
+                newCode.putByteArray(b, u, 5);
+                u += 5;
+                break;
+            // case MANA_INSN:
+            default:
+                newCode.putByteArray(b, u, 4);
+                u += 4;
+                break;
+            }
+        }
+
+        // recomputes the stack map frames
+        if (frameCount > 0) {
+            if (compute == FRAMES) {
+                frameCount = 0;
+                stackMap = null;
+                previousFrame = null;
+                frame = null;
+                Frame f = new Frame();
+                f.owner = labels;
+                Type[] args = Type.getArgumentTypes(descriptor);
+                f.initInputFrame(cw, access, args, maxLocals);
+                visitFrame(f);
+                Label l = labels;
+                while (l != null) {
+                    /*
+                     * here we need the original label position. getNewOffset
+                     * must therefore never have been called for this label.
+                     */
+                    u = l.position - 3;
+                    if ((l.status & Label.STORE) != 0 || (u >= 0 && resize[u])) {
+                        getNewOffset(allIndexes, allSizes, l);
+                        // TODO update offsets in UNINITIALIZED values
+                        visitFrame(l.frame);
+                    }
+                    l = l.successor;
+                }
+            } else {
+                /*
+                 * Resizing an existing stack map frame table is really hard.
+                 * Not only the table must be parsed to update the offets, but
+                 * new frames may be needed for jump instructions that were
+                 * inserted by this method. And updating the offsets or
+                 * inserting frames can change the format of the following
+                 * frames, in case of packed frames. In practice the whole table
+                 * must be recomputed. For this the frames are marked as
+                 * potentially invalid. This will cause the whole class to be
+                 * reread and rewritten with the COMPUTE_FRAMES option (see the
+                 * ClassWriter.toByteArray method). This is not very efficient
+                 * but is much easier and requires much less code than any other
+                 * method I can think of.
+                 */
+                cw.invalidFrames = true;
+            }
+        }
+        // updates the exception handler block labels
+        Handler h = firstHandler;
+        while (h != null) {
+            getNewOffset(allIndexes, allSizes, h.start);
+            getNewOffset(allIndexes, allSizes, h.end);
+            getNewOffset(allIndexes, allSizes, h.handler);
+            h = h.next;
+        }
+        // updates the instructions addresses in the
+        // local var and line number tables
+        for (i = 0; i < 2; ++i) {
+            ByteVector bv = i == 0 ? localVar : localVarType;
+            if (bv != null) {
+                b = bv.data;
+                u = 0;
+                while (u < bv.length) {
+                    label = readUnsignedShort(b, u);
+                    newOffset = getNewOffset(allIndexes, allSizes, 0, label);
+                    writeShort(b, u, newOffset);
+                    label += readUnsignedShort(b, u + 2);
+                    newOffset = getNewOffset(allIndexes, allSizes, 0, label)
+                            - newOffset;
+                    writeShort(b, u + 2, newOffset);
+                    u += 10;
+                }
+            }
+        }
+        if (lineNumber != null) {
+            b = lineNumber.data;
+            u = 0;
+            while (u < lineNumber.length) {
+                writeShort(
+                        b,
+                        u,
+                        getNewOffset(allIndexes, allSizes, 0,
+                                readUnsignedShort(b, u)));
+                u += 4;
+            }
+        }
+        // updates the labels of the other attributes
+        Attribute attr = cattrs;
+        while (attr != null) {
+            Label[] labels = attr.getLabels();
+            if (labels != null) {
+                for (i = labels.length - 1; i >= 0; --i) {
+                    getNewOffset(allIndexes, allSizes, labels[i]);
+                }
+            }
+            attr = attr.next;
+        }
+
+        // replaces old bytecodes with new ones
+        code = newCode;
+    }
+
+    /**
+     * Reads an unsigned short value in the given byte array.
+     * 
+     * @param b
+     *            a byte array.
+     * @param index
+     *            the start index of the value to be read.
+     * @return the read value.
+     */
+    static int readUnsignedShort(final byte[] b, final int index) {
+        return ((b[index] & 0xFF) << 8) | (b[index + 1] & 0xFF);
+    }
+
+    /**
+     * Reads a signed short value in the given byte array.
+     * 
+     * @param b
+     *            a byte array.
+     * @param index
+     *            the start index of the value to be read.
+     * @return the read value.
+     */
+    static short readShort(final byte[] b, final int index) {
+        return (short) (((b[index] & 0xFF) << 8) | (b[index + 1] & 0xFF));
+    }
+
+    /**
+     * Reads a signed int value in the given byte array.
+     * 
+     * @param b
+     *            a byte array.
+     * @param index
+     *            the start index of the value to be read.
+     * @return the read value.
+     */
+    static int readInt(final byte[] b, final int index) {
+        return ((b[index] & 0xFF) << 24) | ((b[index + 1] & 0xFF) << 16)
+                | ((b[index + 2] & 0xFF) << 8) | (b[index + 3] & 0xFF);
+    }
+
+    /**
+     * Writes a short value in the given byte array.
+     * 
+     * @param b
+     *            a byte array.
+     * @param index
+     *            where the first byte of the short value must be written.
+     * @param s
+     *            the value to be written in the given byte array.
+     */
+    static void writeShort(final byte[] b, final int index, final int s) {
+        b[index] = (byte) (s >>> 8);
+        b[index + 1] = (byte) s;
+    }
+
+    /**
+     * Computes the future value of a bytecode offset.
+     * <p>
+     * Note: it is possible to have several entries for the same instruction in
+     * the <tt>indexes</tt> and <tt>sizes</tt>: two entries (index=a,size=b) and
+     * (index=a,size=b') are equivalent to a single entry (index=a,size=b+b').
+     * 
+     * @param indexes
+     *            current positions of the instructions to be resized. Each
+     *            instruction must be designated by the index of its <i>last</i>
+     *            byte, plus one (or, in other words, by the index of the
+     *            <i>first</i> byte of the <i>next</i> instruction).
+     * @param sizes
+     *            the number of bytes to be <i>added</i> to the above
+     *            instructions. More precisely, for each i < <tt>len</tt>,
+     *            <tt>sizes</tt>[i] bytes will be added at the end of the
+     *            instruction designated by <tt>indexes</tt>[i] or, if
+     *            <tt>sizes</tt>[i] is negative, the <i>last</i> |
+     *            <tt>sizes[i]</tt>| bytes of the instruction will be removed
+     *            (the instruction size <i>must not</i> become negative or
+     *            null).
+     * @param begin
+     *            index of the first byte of the source instruction.
+     * @param end
+     *            index of the first byte of the target instruction.
+     * @return the future value of the given bytecode offset.
+     */
+    static int getNewOffset(final int[] indexes, final int[] sizes,
+            final int begin, final int end) {
+        int offset = end - begin;
+        for (int i = 0; i < indexes.length; ++i) {
+            if (begin < indexes[i] && indexes[i] <= end) {
+                // forward jump
+                offset += sizes[i];
+            } else if (end < indexes[i] && indexes[i] <= begin) {
+                // backward jump
+                offset -= sizes[i];
+            }
+        }
+        return offset;
+    }
+
+    /**
+     * Updates the offset of the given label.
+     * 
+     * @param indexes
+     *            current positions of the instructions to be resized. Each
+     *            instruction must be designated by the index of its <i>last</i>
+     *            byte, plus one (or, in other words, by the index of the
+     *            <i>first</i> byte of the <i>next</i> instruction).
+     * @param sizes
+     *            the number of bytes to be <i>added</i> to the above
+     *            instructions. More precisely, for each i < <tt>len</tt>,
+     *            <tt>sizes</tt>[i] bytes will be added at the end of the
+     *            instruction designated by <tt>indexes</tt>[i] or, if
+     *            <tt>sizes</tt>[i] is negative, the <i>last</i> |
+     *            <tt>sizes[i]</tt>| bytes of the instruction will be removed
+     *            (the instruction size <i>must not</i> become negative or
+     *            null).
+     * @param label
+     *            the label whose offset must be updated.
+     */
+    static void getNewOffset(final int[] indexes, final int[] sizes,
+            final Label label) {
+        if ((label.status & Label.RESIZED) == 0) {
+            label.position = getNewOffset(indexes, sizes, 0, label.position);
+            label.status |= Label.RESIZED;
+        }
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/Opcodes.java b/src/main/asm/org/objectweb/asm/Opcodes.java
new file mode 100644
index 0000000..f9b6af1
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/Opcodes.java
@@ -0,0 +1,360 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm;
+
+/**
+ * Defines the JVM opcodes, access flags and array type codes. This interface
+ * does not define all the JVM opcodes because some opcodes are automatically
+ * handled. For example, the xLOAD and xSTORE opcodes are automatically replaced
+ * by xLOAD_n and xSTORE_n opcodes when possible. The xLOAD_n and xSTORE_n
+ * opcodes are therefore not defined in this interface. Likewise for LDC,
+ * automatically replaced by LDC_W or LDC2_W when necessary, WIDE, GOTO_W and
+ * JSR_W.
+ * 
+ * @author Eric Bruneton
+ * @author Eugene Kuleshov
+ */
+public interface Opcodes {
+
+    // ASM API versions
+
+    int ASM4 = 4 << 16 | 0 << 8 | 0;
+
+    // versions
+
+    int V1_1 = 3 << 16 | 45;
+    int V1_2 = 0 << 16 | 46;
+    int V1_3 = 0 << 16 | 47;
+    int V1_4 = 0 << 16 | 48;
+    int V1_5 = 0 << 16 | 49;
+    int V1_6 = 0 << 16 | 50;
+    int V1_7 = 0 << 16 | 51;
+    int V1_8 = 0 << 16 | 52;
+
+
+    // access flags
+
+    int ACC_PUBLIC = 0x0001; // class, field, method
+    int ACC_PRIVATE = 0x0002; // class, field, method
+    int ACC_PROTECTED = 0x0004; // class, field, method
+    int ACC_STATIC = 0x0008; // field, method
+    int ACC_FINAL = 0x0010; // class, field, method
+    int ACC_SUPER = 0x0020; // class
+    int ACC_SYNCHRONIZED = 0x0020; // method
+    int ACC_VOLATILE = 0x0040; // field
+    int ACC_BRIDGE = 0x0040; // method
+    int ACC_VARARGS = 0x0080; // method
+    int ACC_TRANSIENT = 0x0080; // field
+    int ACC_NATIVE = 0x0100; // method
+    int ACC_INTERFACE = 0x0200; // class
+    int ACC_ABSTRACT = 0x0400; // class, method
+    int ACC_STRICT = 0x0800; // method
+    int ACC_SYNTHETIC = 0x1000; // class, field, method
+    int ACC_ANNOTATION = 0x2000; // class
+    int ACC_ENUM = 0x4000; // class(?) field inner
+
+    // ASM specific pseudo access flags
+
+    int ACC_DEPRECATED = 0x20000; // class, field, method
+
+    // types for NEWARRAY
+
+    int T_BOOLEAN = 4;
+    int T_CHAR = 5;
+    int T_FLOAT = 6;
+    int T_DOUBLE = 7;
+    int T_BYTE = 8;
+    int T_SHORT = 9;
+    int T_INT = 10;
+    int T_LONG = 11;
+
+    // tags for Handle
+
+    int H_GETFIELD = 1;
+    int H_GETSTATIC = 2;
+    int H_PUTFIELD = 3;
+    int H_PUTSTATIC = 4;
+    int H_INVOKEVIRTUAL = 5;
+    int H_INVOKESTATIC = 6;
+    int H_INVOKESPECIAL = 7;
+    int H_NEWINVOKESPECIAL = 8;
+    int H_INVOKEINTERFACE = 9;
+
+    // stack map frame types
+
+    /**
+     * Represents an expanded frame. See {@link ClassReader#EXPAND_FRAMES}.
+     */
+    int F_NEW = -1;
+
+    /**
+     * Represents a compressed frame with complete frame data.
+     */
+    int F_FULL = 0;
+
+    /**
+     * Represents a compressed frame where locals are the same as the locals in
+     * the previous frame, except that additional 1-3 locals are defined, and
+     * with an empty stack.
+     */
+    int F_APPEND = 1;
+
+    /**
+     * Represents a compressed frame where locals are the same as the locals in
+     * the previous frame, except that the last 1-3 locals are absent and with
+     * an empty stack.
+     */
+    int F_CHOP = 2;
+
+    /**
+     * Represents a compressed frame with exactly the same locals as the
+     * previous frame and with an empty stack.
+     */
+    int F_SAME = 3;
+
+    /**
+     * Represents a compressed frame with exactly the same locals as the
+     * previous frame and with a single value on the stack.
+     */
+    int F_SAME1 = 4;
+
+    Integer TOP = new Integer(0);
+    Integer INTEGER = new Integer(1);
+    Integer FLOAT = new Integer(2);
+    Integer DOUBLE = new Integer(3);
+    Integer LONG = new Integer(4);
+    Integer NULL = new Integer(5);
+    Integer UNINITIALIZED_THIS = new Integer(6);
+
+    // opcodes // visit method (- = idem)
+
+    int NOP = 0; // visitInsn
+    int ACONST_NULL = 1; // -
+    int ICONST_M1 = 2; // -
+    int ICONST_0 = 3; // -
+    int ICONST_1 = 4; // -
+    int ICONST_2 = 5; // -
+    int ICONST_3 = 6; // -
+    int ICONST_4 = 7; // -
+    int ICONST_5 = 8; // -
+    int LCONST_0 = 9; // -
+    int LCONST_1 = 10; // -
+    int FCONST_0 = 11; // -
+    int FCONST_1 = 12; // -
+    int FCONST_2 = 13; // -
+    int DCONST_0 = 14; // -
+    int DCONST_1 = 15; // -
+    int BIPUSH = 16; // visitIntInsn
+    int SIPUSH = 17; // -
+    int LDC = 18; // visitLdcInsn
+    // int LDC_W = 19; // -
+    // int LDC2_W = 20; // -
+    int ILOAD = 21; // visitVarInsn
+    int LLOAD = 22; // -
+    int FLOAD = 23; // -
+    int DLOAD = 24; // -
+    int ALOAD = 25; // -
+    // int ILOAD_0 = 26; // -
+    // int ILOAD_1 = 27; // -
+    // int ILOAD_2 = 28; // -
+    // int ILOAD_3 = 29; // -
+    // int LLOAD_0 = 30; // -
+    // int LLOAD_1 = 31; // -
+    // int LLOAD_2 = 32; // -
+    // int LLOAD_3 = 33; // -
+    // int FLOAD_0 = 34; // -
+    // int FLOAD_1 = 35; // -
+    // int FLOAD_2 = 36; // -
+    // int FLOAD_3 = 37; // -
+    // int DLOAD_0 = 38; // -
+    // int DLOAD_1 = 39; // -
+    // int DLOAD_2 = 40; // -
+    // int DLOAD_3 = 41; // -
+    // int ALOAD_0 = 42; // -
+    // int ALOAD_1 = 43; // -
+    // int ALOAD_2 = 44; // -
+    // int ALOAD_3 = 45; // -
+    int IALOAD = 46; // visitInsn
+    int LALOAD = 47; // -
+    int FALOAD = 48; // -
+    int DALOAD = 49; // -
+    int AALOAD = 50; // -
+    int BALOAD = 51; // -
+    int CALOAD = 52; // -
+    int SALOAD = 53; // -
+    int ISTORE = 54; // visitVarInsn
+    int LSTORE = 55; // -
+    int FSTORE = 56; // -
+    int DSTORE = 57; // -
+    int ASTORE = 58; // -
+    // int ISTORE_0 = 59; // -
+    // int ISTORE_1 = 60; // -
+    // int ISTORE_2 = 61; // -
+    // int ISTORE_3 = 62; // -
+    // int LSTORE_0 = 63; // -
+    // int LSTORE_1 = 64; // -
+    // int LSTORE_2 = 65; // -
+    // int LSTORE_3 = 66; // -
+    // int FSTORE_0 = 67; // -
+    // int FSTORE_1 = 68; // -
+    // int FSTORE_2 = 69; // -
+    // int FSTORE_3 = 70; // -
+    // int DSTORE_0 = 71; // -
+    // int DSTORE_1 = 72; // -
+    // int DSTORE_2 = 73; // -
+    // int DSTORE_3 = 74; // -
+    // int ASTORE_0 = 75; // -
+    // int ASTORE_1 = 76; // -
+    // int ASTORE_2 = 77; // -
+    // int ASTORE_3 = 78; // -
+    int IASTORE = 79; // visitInsn
+    int LASTORE = 80; // -
+    int FASTORE = 81; // -
+    int DASTORE = 82; // -
+    int AASTORE = 83; // -
+    int BASTORE = 84; // -
+    int CASTORE = 85; // -
+    int SASTORE = 86; // -
+    int POP = 87; // -
+    int POP2 = 88; // -
+    int DUP = 89; // -
+    int DUP_X1 = 90; // -
+    int DUP_X2 = 91; // -
+    int DUP2 = 92; // -
+    int DUP2_X1 = 93; // -
+    int DUP2_X2 = 94; // -
+    int SWAP = 95; // -
+    int IADD = 96; // -
+    int LADD = 97; // -
+    int FADD = 98; // -
+    int DADD = 99; // -
+    int ISUB = 100; // -
+    int LSUB = 101; // -
+    int FSUB = 102; // -
+    int DSUB = 103; // -
+    int IMUL = 104; // -
+    int LMUL = 105; // -
+    int FMUL = 106; // -
+    int DMUL = 107; // -
+    int IDIV = 108; // -
+    int LDIV = 109; // -
+    int FDIV = 110; // -
+    int DDIV = 111; // -
+    int IREM = 112; // -
+    int LREM = 113; // -
+    int FREM = 114; // -
+    int DREM = 115; // -
+    int INEG = 116; // -
+    int LNEG = 117; // -
+    int FNEG = 118; // -
+    int DNEG = 119; // -
+    int ISHL = 120; // -
+    int LSHL = 121; // -
+    int ISHR = 122; // -
+    int LSHR = 123; // -
+    int IUSHR = 124; // -
+    int LUSHR = 125; // -
+    int IAND = 126; // -
+    int LAND = 127; // -
+    int IOR = 128; // -
+    int LOR = 129; // -
+    int IXOR = 130; // -
+    int LXOR = 131; // -
+    int IINC = 132; // visitIincInsn
+    int I2L = 133; // visitInsn
+    int I2F = 134; // -
+    int I2D = 135; // -
+    int L2I = 136; // -
+    int L2F = 137; // -
+    int L2D = 138; // -
+    int F2I = 139; // -
+    int F2L = 140; // -
+    int F2D = 141; // -
+    int D2I = 142; // -
+    int D2L = 143; // -
+    int D2F = 144; // -
+    int I2B = 145; // -
+    int I2C = 146; // -
+    int I2S = 147; // -
+    int LCMP = 148; // -
+    int FCMPL = 149; // -
+    int FCMPG = 150; // -
+    int DCMPL = 151; // -
+    int DCMPG = 152; // -
+    int IFEQ = 153; // visitJumpInsn
+    int IFNE = 154; // -
+    int IFLT = 155; // -
+    int IFGE = 156; // -
+    int IFGT = 157; // -
+    int IFLE = 158; // -
+    int IF_ICMPEQ = 159; // -
+    int IF_ICMPNE = 160; // -
+    int IF_ICMPLT = 161; // -
+    int IF_ICMPGE = 162; // -
+    int IF_ICMPGT = 163; // -
+    int IF_ICMPLE = 164; // -
+    int IF_ACMPEQ = 165; // -
+    int IF_ACMPNE = 166; // -
+    int GOTO = 167; // -
+    int JSR = 168; // -
+    int RET = 169; // visitVarInsn
+    int TABLESWITCH = 170; // visiTableSwitchInsn
+    int LOOKUPSWITCH = 171; // visitLookupSwitch
+    int IRETURN = 172; // visitInsn
+    int LRETURN = 173; // -
+    int FRETURN = 174; // -
+    int DRETURN = 175; // -
+    int ARETURN = 176; // -
+    int RETURN = 177; // -
+    int GETSTATIC = 178; // visitFieldInsn
+    int PUTSTATIC = 179; // -
+    int GETFIELD = 180; // -
+    int PUTFIELD = 181; // -
+    int INVOKEVIRTUAL = 182; // visitMethodInsn
+    int INVOKESPECIAL = 183; // -
+    int INVOKESTATIC = 184; // -
+    int INVOKEINTERFACE = 185; // -
+    int INVOKEDYNAMIC = 186; // visitInvokeDynamicInsn
+    int NEW = 187; // visitTypeInsn
+    int NEWARRAY = 188; // visitIntInsn
+    int ANEWARRAY = 189; // visitTypeInsn
+    int ARRAYLENGTH = 190; // visitInsn
+    int ATHROW = 191; // -
+    int CHECKCAST = 192; // visitTypeInsn
+    int INSTANCEOF = 193; // -
+    int MONITORENTER = 194; // visitInsn
+    int MONITOREXIT = 195; // -
+    // int WIDE = 196; // NOT VISITED
+    int MULTIANEWARRAY = 197; // visitMultiANewArrayInsn
+    int IFNULL = 198; // visitJumpInsn
+    int IFNONNULL = 199; // -
+    // int GOTO_W = 200; // -
+    // int JSR_W = 201; // -
+}
diff --git a/src/main/asm/org/objectweb/asm/Type.java b/src/main/asm/org/objectweb/asm/Type.java
new file mode 100644
index 0000000..be69a2c
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/Type.java
@@ -0,0 +1,895 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+
+/**
+ * A Java field or method type. This class can be used to make it easier to
+ * manipulate type and method descriptors.
+ * 
+ * @author Eric Bruneton
+ * @author Chris Nokleberg
+ */
+public class Type {
+
+    /**
+     * The sort of the <tt>void</tt> type. See {@link #getSort getSort}.
+     */
+    public static final int VOID = 0;
+
+    /**
+     * The sort of the <tt>boolean</tt> type. See {@link #getSort getSort}.
+     */
+    public static final int BOOLEAN = 1;
+
+    /**
+     * The sort of the <tt>char</tt> type. See {@link #getSort getSort}.
+     */
+    public static final int CHAR = 2;
+
+    /**
+     * The sort of the <tt>byte</tt> type. See {@link #getSort getSort}.
+     */
+    public static final int BYTE = 3;
+
+    /**
+     * The sort of the <tt>short</tt> type. See {@link #getSort getSort}.
+     */
+    public static final int SHORT = 4;
+
+    /**
+     * The sort of the <tt>int</tt> type. See {@link #getSort getSort}.
+     */
+    public static final int INT = 5;
+
+    /**
+     * The sort of the <tt>float</tt> type. See {@link #getSort getSort}.
+     */
+    public static final int FLOAT = 6;
+
+    /**
+     * The sort of the <tt>long</tt> type. See {@link #getSort getSort}.
+     */
+    public static final int LONG = 7;
+
+    /**
+     * The sort of the <tt>double</tt> type. See {@link #getSort getSort}.
+     */
+    public static final int DOUBLE = 8;
+
+    /**
+     * The sort of array reference types. See {@link #getSort getSort}.
+     */
+    public static final int ARRAY = 9;
+
+    /**
+     * The sort of object reference types. See {@link #getSort getSort}.
+     */
+    public static final int OBJECT = 10;
+
+    /**
+     * The sort of method types. See {@link #getSort getSort}.
+     */
+    public static final int METHOD = 11;
+
+    /**
+     * The <tt>void</tt> type.
+     */
+    public static final Type VOID_TYPE = new Type(VOID, null, ('V' << 24)
+            | (5 << 16) | (0 << 8) | 0, 1);
+
+    /**
+     * The <tt>boolean</tt> type.
+     */
+    public static final Type BOOLEAN_TYPE = new Type(BOOLEAN, null, ('Z' << 24)
+            | (0 << 16) | (5 << 8) | 1, 1);
+
+    /**
+     * The <tt>char</tt> type.
+     */
+    public static final Type CHAR_TYPE = new Type(CHAR, null, ('C' << 24)
+            | (0 << 16) | (6 << 8) | 1, 1);
+
+    /**
+     * The <tt>byte</tt> type.
+     */
+    public static final Type BYTE_TYPE = new Type(BYTE, null, ('B' << 24)
+            | (0 << 16) | (5 << 8) | 1, 1);
+
+    /**
+     * The <tt>short</tt> type.
+     */
+    public static final Type SHORT_TYPE = new Type(SHORT, null, ('S' << 24)
+            | (0 << 16) | (7 << 8) | 1, 1);
+
+    /**
+     * The <tt>int</tt> type.
+     */
+    public static final Type INT_TYPE = new Type(INT, null, ('I' << 24)
+            | (0 << 16) | (0 << 8) | 1, 1);
+
+    /**
+     * The <tt>float</tt> type.
+     */
+    public static final Type FLOAT_TYPE = new Type(FLOAT, null, ('F' << 24)
+            | (2 << 16) | (2 << 8) | 1, 1);
+
+    /**
+     * The <tt>long</tt> type.
+     */
+    public static final Type LONG_TYPE = new Type(LONG, null, ('J' << 24)
+            | (1 << 16) | (1 << 8) | 2, 1);
+
+    /**
+     * The <tt>double</tt> type.
+     */
+    public static final Type DOUBLE_TYPE = new Type(DOUBLE, null, ('D' << 24)
+            | (3 << 16) | (3 << 8) | 2, 1);
+
+    // ------------------------------------------------------------------------
+    // Fields
+    // ------------------------------------------------------------------------
+
+    /**
+     * The sort of this Java type.
+     */
+    private final int sort;
+
+    /**
+     * A buffer containing the internal name of this Java type. This field is
+     * only used for reference types.
+     */
+    private final char[] buf;
+
+    /**
+     * The offset of the internal name of this Java type in {@link #buf buf} or,
+     * for primitive types, the size, descriptor and getOpcode offsets for this
+     * type (byte 0 contains the size, byte 1 the descriptor, byte 2 the offset
+     * for IALOAD or IASTORE, byte 3 the offset for all other instructions).
+     */
+    private final int off;
+
+    /**
+     * The length of the internal name of this Java type.
+     */
+    private final int len;
+
+    // ------------------------------------------------------------------------
+    // Constructors
+    // ------------------------------------------------------------------------
+
+    /**
+     * Constructs a reference type.
+     * 
+     * @param sort
+     *            the sort of the reference type to be constructed.
+     * @param buf
+     *            a buffer containing the descriptor of the previous type.
+     * @param off
+     *            the offset of this descriptor in the previous buffer.
+     * @param len
+     *            the length of this descriptor.
+     */
+    private Type(final int sort, final char[] buf, final int off, final int len) {
+        this.sort = sort;
+        this.buf = buf;
+        this.off = off;
+        this.len = len;
+    }
+
+    /**
+     * Returns the Java type corresponding to the given type descriptor.
+     * 
+     * @param typeDescriptor
+     *            a field or method type descriptor.
+     * @return the Java type corresponding to the given type descriptor.
+     */
+    public static Type getType(final String typeDescriptor) {
+        return getType(typeDescriptor.toCharArray(), 0);
+    }
+
+    /**
+     * Returns the Java type corresponding to the given internal name.
+     * 
+     * @param internalName
+     *            an internal name.
+     * @return the Java type corresponding to the given internal name.
+     */
+    public static Type getObjectType(final String internalName) {
+        char[] buf = internalName.toCharArray();
+        return new Type(buf[0] == '[' ? ARRAY : OBJECT, buf, 0, buf.length);
+    }
+
+    /**
+     * Returns the Java type corresponding to the given method descriptor.
+     * Equivalent to <code>Type.getType(methodDescriptor)</code>.
+     * 
+     * @param methodDescriptor
+     *            a method descriptor.
+     * @return the Java type corresponding to the given method descriptor.
+     */
+    public static Type getMethodType(final String methodDescriptor) {
+        return getType(methodDescriptor.toCharArray(), 0);
+    }
+
+    /**
+     * Returns the Java method type corresponding to the given argument and
+     * return types.
+     * 
+     * @param returnType
+     *            the return type of the method.
+     * @param argumentTypes
+     *            the argument types of the method.
+     * @return the Java type corresponding to the given argument and return
+     *         types.
+     */
+    public static Type getMethodType(final Type returnType,
+            final Type... argumentTypes) {
+        return getType(getMethodDescriptor(returnType, argumentTypes));
+    }
+
+    /**
+     * Returns the Java type corresponding to the given class.
+     * 
+     * @param c
+     *            a class.
+     * @return the Java type corresponding to the given class.
+     */
+    public static Type getType(final Class<?> c) {
+        if (c.isPrimitive()) {
+            if (c == Integer.TYPE) {
+                return INT_TYPE;
+            } else if (c == Void.TYPE) {
+                return VOID_TYPE;
+            } else if (c == Boolean.TYPE) {
+                return BOOLEAN_TYPE;
+            } else if (c == Byte.TYPE) {
+                return BYTE_TYPE;
+            } else if (c == Character.TYPE) {
+                return CHAR_TYPE;
+            } else if (c == Short.TYPE) {
+                return SHORT_TYPE;
+            } else if (c == Double.TYPE) {
+                return DOUBLE_TYPE;
+            } else if (c == Float.TYPE) {
+                return FLOAT_TYPE;
+            } else /* if (c == Long.TYPE) */{
+                return LONG_TYPE;
+            }
+        } else {
+            return getType(getDescriptor(c));
+        }
+    }
+
+    /**
+     * Returns the Java method type corresponding to the given constructor.
+     * 
+     * @param c
+     *            a {@link Constructor Constructor} object.
+     * @return the Java method type corresponding to the given constructor.
+     */
+    public static Type getType(final Constructor<?> c) {
+        return getType(getConstructorDescriptor(c));
+    }
+
+    /**
+     * Returns the Java method type corresponding to the given method.
+     * 
+     * @param m
+     *            a {@link Method Method} object.
+     * @return the Java method type corresponding to the given method.
+     */
+    public static Type getType(final Method m) {
+        return getType(getMethodDescriptor(m));
+    }
+
+    /**
+     * Returns the Java types corresponding to the argument types of the given
+     * method descriptor.
+     * 
+     * @param methodDescriptor
+     *            a method descriptor.
+     * @return the Java types corresponding to the argument types of the given
+     *         method descriptor.
+     */
+    public static Type[] getArgumentTypes(final String methodDescriptor) {
+        char[] buf = methodDescriptor.toCharArray();
+        int off = 1;
+        int size = 0;
+        while (true) {
+            char car = buf[off++];
+            if (car == ')') {
+                break;
+            } else if (car == 'L') {
+                while (buf[off++] != ';') {
+                }
+                ++size;
+            } else if (car != '[') {
+                ++size;
+            }
+        }
+        Type[] args = new Type[size];
+        off = 1;
+        size = 0;
+        while (buf[off] != ')') {
+            args[size] = getType(buf, off);
+            off += args[size].len + (args[size].sort == OBJECT ? 2 : 0);
+            size += 1;
+        }
+        return args;
+    }
+
+    /**
+     * Returns the Java types corresponding to the argument types of the given
+     * method.
+     * 
+     * @param method
+     *            a method.
+     * @return the Java types corresponding to the argument types of the given
+     *         method.
+     */
+    public static Type[] getArgumentTypes(final Method method) {
+        Class<?>[] classes = method.getParameterTypes();
+        Type[] types = new Type[classes.length];
+        for (int i = classes.length - 1; i >= 0; --i) {
+            types[i] = getType(classes[i]);
+        }
+        return types;
+    }
+
+    /**
+     * Returns the Java type corresponding to the return type of the given
+     * method descriptor.
+     * 
+     * @param methodDescriptor
+     *            a method descriptor.
+     * @return the Java type corresponding to the return type of the given
+     *         method descriptor.
+     */
+    public static Type getReturnType(final String methodDescriptor) {
+        char[] buf = methodDescriptor.toCharArray();
+        return getType(buf, methodDescriptor.indexOf(')') + 1);
+    }
+
+    /**
+     * Returns the Java type corresponding to the return type of the given
+     * method.
+     * 
+     * @param method
+     *            a method.
+     * @return the Java type corresponding to the return type of the given
+     *         method.
+     */
+    public static Type getReturnType(final Method method) {
+        return getType(method.getReturnType());
+    }
+
+    /**
+     * Computes the size of the arguments and of the return value of a method.
+     * 
+     * @param desc
+     *            the descriptor of a method.
+     * @return the size of the arguments of the method (plus one for the
+     *         implicit this argument), argSize, and the size of its return
+     *         value, retSize, packed into a single int i =
+     *         <tt>(argSize << 2) | retSize</tt> (argSize is therefore equal to
+     *         <tt>i >> 2</tt>, and retSize to <tt>i & 0x03</tt>).
+     */
+    public static int getArgumentsAndReturnSizes(final String desc) {
+        int n = 1;
+        int c = 1;
+        while (true) {
+            char car = desc.charAt(c++);
+            if (car == ')') {
+                car = desc.charAt(c);
+                return n << 2
+                        | (car == 'V' ? 0 : (car == 'D' || car == 'J' ? 2 : 1));
+            } else if (car == 'L') {
+                while (desc.charAt(c++) != ';') {
+                }
+                n += 1;
+            } else if (car == '[') {
+                while ((car = desc.charAt(c)) == '[') {
+                    ++c;
+                }
+                if (car == 'D' || car == 'J') {
+                    n -= 1;
+                }
+            } else if (car == 'D' || car == 'J') {
+                n += 2;
+            } else {
+                n += 1;
+            }
+        }
+    }
+
+    /**
+     * Returns the Java type corresponding to the given type descriptor. For
+     * method descriptors, buf is supposed to contain nothing more than the
+     * descriptor itself.
+     * 
+     * @param buf
+     *            a buffer containing a type descriptor.
+     * @param off
+     *            the offset of this descriptor in the previous buffer.
+     * @return the Java type corresponding to the given type descriptor.
+     */
+    private static Type getType(final char[] buf, final int off) {
+        int len;
+        switch (buf[off]) {
+        case 'V':
+            return VOID_TYPE;
+        case 'Z':
+            return BOOLEAN_TYPE;
+        case 'C':
+            return CHAR_TYPE;
+        case 'B':
+            return BYTE_TYPE;
+        case 'S':
+            return SHORT_TYPE;
+        case 'I':
+            return INT_TYPE;
+        case 'F':
+            return FLOAT_TYPE;
+        case 'J':
+            return LONG_TYPE;
+        case 'D':
+            return DOUBLE_TYPE;
+        case '[':
+            len = 1;
+            while (buf[off + len] == '[') {
+                ++len;
+            }
+            if (buf[off + len] == 'L') {
+                ++len;
+                while (buf[off + len] != ';') {
+                    ++len;
+                }
+            }
+            return new Type(ARRAY, buf, off, len + 1);
+        case 'L':
+            len = 1;
+            while (buf[off + len] != ';') {
+                ++len;
+            }
+            return new Type(OBJECT, buf, off + 1, len - 1);
+            // case '(':
+        default:
+            return new Type(METHOD, buf, off, buf.length - off);
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // Accessors
+    // ------------------------------------------------------------------------
+
+    /**
+     * Returns the sort of this Java type.
+     * 
+     * @return {@link #VOID VOID}, {@link #BOOLEAN BOOLEAN}, {@link #CHAR CHAR},
+     *         {@link #BYTE BYTE}, {@link #SHORT SHORT}, {@link #INT INT},
+     *         {@link #FLOAT FLOAT}, {@link #LONG LONG}, {@link #DOUBLE DOUBLE},
+     *         {@link #ARRAY ARRAY}, {@link #OBJECT OBJECT} or {@link #METHOD
+     *         METHOD}.
+     */
+    public int getSort() {
+        return sort;
+    }
+
+    /**
+     * Returns the number of dimensions of this array type. This method should
+     * only be used for an array type.
+     * 
+     * @return the number of dimensions of this array type.
+     */
+    public int getDimensions() {
+        int i = 1;
+        while (buf[off + i] == '[') {
+            ++i;
+        }
+        return i;
+    }
+
+    /**
+     * Returns the type of the elements of this array type. This method should
+     * only be used for an array type.
+     * 
+     * @return Returns the type of the elements of this array type.
+     */
+    public Type getElementType() {
+        return getType(buf, off + getDimensions());
+    }
+
+    /**
+     * Returns the binary name of the class corresponding to this type. This
+     * method must not be used on method types.
+     * 
+     * @return the binary name of the class corresponding to this type.
+     */
+    public String getClassName() {
+        switch (sort) {
+        case VOID:
+            return "void";
+        case BOOLEAN:
+            return "boolean";
+        case CHAR:
+            return "char";
+        case BYTE:
+            return "byte";
+        case SHORT:
+            return "short";
+        case INT:
+            return "int";
+        case FLOAT:
+            return "float";
+        case LONG:
+            return "long";
+        case DOUBLE:
+            return "double";
+        case ARRAY:
+            StringBuffer b = new StringBuffer(getElementType().getClassName());
+            for (int i = getDimensions(); i > 0; --i) {
+                b.append("[]");
+            }
+            return b.toString();
+        case OBJECT:
+            return new String(buf, off, len).replace('/', '.');
+        default:
+            return null;
+        }
+    }
+
+    /**
+     * Returns the internal name of the class corresponding to this object or
+     * array type. The internal name of a class is its fully qualified name (as
+     * returned by Class.getName(), where '.' are replaced by '/'. This method
+     * should only be used for an object or array type.
+     * 
+     * @return the internal name of the class corresponding to this object type.
+     */
+    public String getInternalName() {
+        return new String(buf, off, len);
+    }
+
+    /**
+     * Returns the argument types of methods of this type. This method should
+     * only be used for method types.
+     * 
+     * @return the argument types of methods of this type.
+     */
+    public Type[] getArgumentTypes() {
+        return getArgumentTypes(getDescriptor());
+    }
+
+    /**
+     * Returns the return type of methods of this type. This method should only
+     * be used for method types.
+     * 
+     * @return the return type of methods of this type.
+     */
+    public Type getReturnType() {
+        return getReturnType(getDescriptor());
+    }
+
+    /**
+     * Returns the size of the arguments and of the return value of methods of
+     * this type. This method should only be used for method types.
+     * 
+     * @return the size of the arguments (plus one for the implicit this
+     *         argument), argSize, and the size of the return value, retSize,
+     *         packed into a single int i = <tt>(argSize << 2) | retSize</tt>
+     *         (argSize is therefore equal to <tt>i >> 2</tt>, and retSize to
+     *         <tt>i & 0x03</tt>).
+     */
+    public int getArgumentsAndReturnSizes() {
+        return getArgumentsAndReturnSizes(getDescriptor());
+    }
+
+    // ------------------------------------------------------------------------
+    // Conversion to type descriptors
+    // ------------------------------------------------------------------------
+
+    /**
+     * Returns the descriptor corresponding to this Java type.
+     * 
+     * @return the descriptor corresponding to this Java type.
+     */
+    public String getDescriptor() {
+        StringBuffer buf = new StringBuffer();
+        getDescriptor(buf);
+        return buf.toString();
+    }
+
+    /**
+     * Returns the descriptor corresponding to the given argument and return
+     * types.
+     * 
+     * @param returnType
+     *            the return type of the method.
+     * @param argumentTypes
+     *            the argument types of the method.
+     * @return the descriptor corresponding to the given argument and return
+     *         types.
+     */
+    public static String getMethodDescriptor(final Type returnType,
+            final Type... argumentTypes) {
+        StringBuffer buf = new StringBuffer();
+        buf.append('(');
+        for (int i = 0; i < argumentTypes.length; ++i) {
+            argumentTypes[i].getDescriptor(buf);
+        }
+        buf.append(')');
+        returnType.getDescriptor(buf);
+        return buf.toString();
+    }
+
+    /**
+     * Appends the descriptor corresponding to this Java type to the given
+     * string buffer.
+     * 
+     * @param buf
+     *            the string buffer to which the descriptor must be appended.
+     */
+    private void getDescriptor(final StringBuffer buf) {
+        if (this.buf == null) {
+            // descriptor is in byte 3 of 'off' for primitive types (buf ==
+            // null)
+            buf.append((char) ((off & 0xFF000000) >>> 24));
+        } else if (sort == OBJECT) {
+            buf.append('L');
+            buf.append(this.buf, off, len);
+            buf.append(';');
+        } else { // sort == ARRAY || sort == METHOD
+            buf.append(this.buf, off, len);
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // Direct conversion from classes to type descriptors,
+    // without intermediate Type objects
+    // ------------------------------------------------------------------------
+
+    /**
+     * Returns the internal name of the given class. The internal name of a
+     * class is its fully qualified name, as returned by Class.getName(), where
+     * '.' are replaced by '/'.
+     * 
+     * @param c
+     *            an object or array class.
+     * @return the internal name of the given class.
+     */
+    public static String getInternalName(final Class<?> c) {
+        return c.getName().replace('.', '/');
+    }
+
+    /**
+     * Returns the descriptor corresponding to the given Java type.
+     * 
+     * @param c
+     *            an object class, a primitive class or an array class.
+     * @return the descriptor corresponding to the given class.
+     */
+    public static String getDescriptor(final Class<?> c) {
+        StringBuffer buf = new StringBuffer();
+        getDescriptor(buf, c);
+        return buf.toString();
+    }
+
+    /**
+     * Returns the descriptor corresponding to the given constructor.
+     * 
+     * @param c
+     *            a {@link Constructor Constructor} object.
+     * @return the descriptor of the given constructor.
+     */
+    public static String getConstructorDescriptor(final Constructor<?> c) {
+        Class<?>[] parameters = c.getParameterTypes();
+        StringBuffer buf = new StringBuffer();
+        buf.append('(');
+        for (int i = 0; i < parameters.length; ++i) {
+            getDescriptor(buf, parameters[i]);
+        }
+        return buf.append(")V").toString();
+    }
+
+    /**
+     * Returns the descriptor corresponding to the given method.
+     * 
+     * @param m
+     *            a {@link Method Method} object.
+     * @return the descriptor of the given method.
+     */
+    public static String getMethodDescriptor(final Method m) {
+        Class<?>[] parameters = m.getParameterTypes();
+        StringBuffer buf = new StringBuffer();
+        buf.append('(');
+        for (int i = 0; i < parameters.length; ++i) {
+            getDescriptor(buf, parameters[i]);
+        }
+        buf.append(')');
+        getDescriptor(buf, m.getReturnType());
+        return buf.toString();
+    }
+
+    /**
+     * Appends the descriptor of the given class to the given string buffer.
+     * 
+     * @param buf
+     *            the string buffer to which the descriptor must be appended.
+     * @param c
+     *            the class whose descriptor must be computed.
+     */
+    private static void getDescriptor(final StringBuffer buf, final Class<?> c) {
+        Class<?> d = c;
+        while (true) {
+            if (d.isPrimitive()) {
+                char car;
+                if (d == Integer.TYPE) {
+                    car = 'I';
+                } else if (d == Void.TYPE) {
+                    car = 'V';
+                } else if (d == Boolean.TYPE) {
+                    car = 'Z';
+                } else if (d == Byte.TYPE) {
+                    car = 'B';
+                } else if (d == Character.TYPE) {
+                    car = 'C';
+                } else if (d == Short.TYPE) {
+                    car = 'S';
+                } else if (d == Double.TYPE) {
+                    car = 'D';
+                } else if (d == Float.TYPE) {
+                    car = 'F';
+                } else /* if (d == Long.TYPE) */{
+                    car = 'J';
+                }
+                buf.append(car);
+                return;
+            } else if (d.isArray()) {
+                buf.append('[');
+                d = d.getComponentType();
+            } else {
+                buf.append('L');
+                String name = d.getName();
+                int len = name.length();
+                for (int i = 0; i < len; ++i) {
+                    char car = name.charAt(i);
+                    buf.append(car == '.' ? '/' : car);
+                }
+                buf.append(';');
+                return;
+            }
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // Corresponding size and opcodes
+    // ------------------------------------------------------------------------
+
+    /**
+     * Returns the size of values of this type. This method must not be used for
+     * method types.
+     * 
+     * @return the size of values of this type, i.e., 2 for <tt>long</tt> and
+     *         <tt>double</tt>, 0 for <tt>void</tt> and 1 otherwise.
+     */
+    public int getSize() {
+        // the size is in byte 0 of 'off' for primitive types (buf == null)
+        return buf == null ? (off & 0xFF) : 1;
+    }
+
+    /**
+     * Returns a JVM instruction opcode adapted to this Java type. This method
+     * must not be used for method types.
+     * 
+     * @param opcode
+     *            a JVM instruction opcode. This opcode must be one of ILOAD,
+     *            ISTORE, IALOAD, IASTORE, IADD, ISUB, IMUL, IDIV, IREM, INEG,
+     *            ISHL, ISHR, IUSHR, IAND, IOR, IXOR and IRETURN.
+     * @return an opcode that is similar to the given opcode, but adapted to
+     *         this Java type. For example, if this type is <tt>float</tt> and
+     *         <tt>opcode</tt> is IRETURN, this method returns FRETURN.
+     */
+    public int getOpcode(final int opcode) {
+        if (opcode == Opcodes.IALOAD || opcode == Opcodes.IASTORE) {
+            // the offset for IALOAD or IASTORE is in byte 1 of 'off' for
+            // primitive types (buf == null)
+            return opcode + (buf == null ? (off & 0xFF00) >> 8 : 4);
+        } else {
+            // the offset for other instructions is in byte 2 of 'off' for
+            // primitive types (buf == null)
+            return opcode + (buf == null ? (off & 0xFF0000) >> 16 : 4);
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // Equals, hashCode and toString
+    // ------------------------------------------------------------------------
+
+    /**
+     * Tests if the given object is equal to this type.
+     * 
+     * @param o
+     *            the object to be compared to this type.
+     * @return <tt>true</tt> if the given object is equal to this type.
+     */
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof Type)) {
+            return false;
+        }
+        Type t = (Type) o;
+        if (sort != t.sort) {
+            return false;
+        }
+        if (sort >= ARRAY) {
+            if (len != t.len) {
+                return false;
+            }
+            for (int i = off, j = t.off, end = i + len; i < end; i++, j++) {
+                if (buf[i] != t.buf[j]) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Returns a hash code value for this type.
+     * 
+     * @return a hash code value for this type.
+     */
+    @Override
+    public int hashCode() {
+        int hc = 13 * sort;
+        if (sort >= ARRAY) {
+            for (int i = off, end = i + len; i < end; i++) {
+                hc = 17 * (hc + buf[i]);
+            }
+        }
+        return hc;
+    }
+
+    /**
+     * Returns a string representation of this type.
+     * 
+     * @return the descriptor of this type.
+     */
+    @Override
+    public String toString() {
+        return getDescriptor();
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/attrs/package.html b/src/main/asm/org/objectweb/asm/attrs/package.html
new file mode 100644
index 0000000..28d827d
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/attrs/package.html
@@ -0,0 +1,48 @@
+<html>
+<!--
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<body>
+Provides an implementation for optional class, field and method attributes.
+
+<p>
+
+By default ASM strips optional attributes, in order to keep them in
+the bytecode that is being readed you should pass an array of required attribute
+instances to {@link org.objectweb.asm.ClassReader#accept(org.objectweb.asm.ClassVisitor, org.objectweb.asm.Attribute[], boolean) ClassReader.accept()} method.
+In order to add custom attributes to the manually constructed bytecode concrete
+subclasses of the {@link org.objectweb.asm.Attribute Attribute} can be passed to
+the visitAttribute methods of the
+{@link org.objectweb.asm.ClassVisitor ClassVisitor},
+{@link org.objectweb.asm.FieldVisitor FieldVisitor} and
+{@link org.objectweb.asm.MethodVisitor MethodVisitor} interfaces.
+
+@since ASM 1.4.1
+</body>
+</html>
diff --git a/src/main/asm/org/objectweb/asm/commons/AdviceAdapter.java b/src/main/asm/org/objectweb/asm/commons/AdviceAdapter.java
new file mode 100644
index 0000000..c693215
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/commons/AdviceAdapter.java
@@ -0,0 +1,625 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.commons;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+
+/**
+ * A {@link org.objectweb.asm.MethodVisitor} to insert before, after and around
+ * advices in methods and constructors.
+ * <p>
+ * The behavior for constructors is like this:
+ * <ol>
+ * 
+ * <li>as long as the INVOKESPECIAL for the object initialization has not been
+ * reached, every bytecode instruction is dispatched in the ctor code visitor</li>
+ * 
+ * <li>when this one is reached, it is only added in the ctor code visitor and a
+ * JP invoke is added</li>
+ * 
+ * <li>after that, only the other code visitor receives the instructions</li>
+ * 
+ * </ol>
+ * 
+ * @author Eugene Kuleshov
+ * @author Eric Bruneton
+ */
+public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes {
+
+    private static final Object THIS = new Object();
+
+    private static final Object OTHER = new Object();
+
+    protected int methodAccess;
+
+    protected String methodDesc;
+
+    private boolean constructor;
+
+    private boolean superInitialized;
+
+    private List<Object> stackFrame;
+
+    private Map<Label, List<Object>> branches;
+
+    /**
+     * Creates a new {@link AdviceAdapter}.
+     * 
+     * @param api
+     *            the ASM API version implemented by this visitor. Must be one
+     *            of {@link Opcodes#ASM4}.
+     * @param mv
+     *            the method visitor to which this adapter delegates calls.
+     * @param access
+     *            the method's access flags (see {@link Opcodes}).
+     * @param name
+     *            the method's name.
+     * @param desc
+     *            the method's descriptor (see {@link Type Type}).
+     */
+    protected AdviceAdapter(final int api, final MethodVisitor mv,
+            final int access, final String name, final String desc) {
+        super(api, mv, access, name, desc);
+        methodAccess = access;
+        methodDesc = desc;
+        constructor = "<init>".equals(name);
+    }
+
+    @Override
+    public void visitCode() {
+        mv.visitCode();
+        if (constructor) {
+            stackFrame = new ArrayList<Object>();
+            branches = new HashMap<Label, List<Object>>();
+        } else {
+            superInitialized = true;
+            onMethodEnter();
+        }
+    }
+
+    @Override
+    public void visitLabel(final Label label) {
+        mv.visitLabel(label);
+        if (constructor && branches != null) {
+            List<Object> frame = branches.get(label);
+            if (frame != null) {
+                stackFrame = frame;
+                branches.remove(label);
+            }
+        }
+    }
+
+    @Override
+    public void visitInsn(final int opcode) {
+        if (constructor) {
+            int s;
+            switch (opcode) {
+            case RETURN: // empty stack
+                onMethodExit(opcode);
+                break;
+            case IRETURN: // 1 before n/a after
+            case FRETURN: // 1 before n/a after
+            case ARETURN: // 1 before n/a after
+            case ATHROW: // 1 before n/a after
+                popValue();
+                onMethodExit(opcode);
+                break;
+            case LRETURN: // 2 before n/a after
+            case DRETURN: // 2 before n/a after
+                popValue();
+                popValue();
+                onMethodExit(opcode);
+                break;
+            case NOP:
+            case LALOAD: // remove 2 add 2
+            case DALOAD: // remove 2 add 2
+            case LNEG:
+            case DNEG:
+            case FNEG:
+            case INEG:
+            case L2D:
+            case D2L:
+            case F2I:
+            case I2B:
+            case I2C:
+            case I2S:
+            case I2F:
+            case ARRAYLENGTH:
+                break;
+            case ACONST_NULL:
+            case ICONST_M1:
+            case ICONST_0:
+            case ICONST_1:
+            case ICONST_2:
+            case ICONST_3:
+            case ICONST_4:
+            case ICONST_5:
+            case FCONST_0:
+            case FCONST_1:
+            case FCONST_2:
+            case F2L: // 1 before 2 after
+            case F2D:
+            case I2L:
+            case I2D:
+                pushValue(OTHER);
+                break;
+            case LCONST_0:
+            case LCONST_1:
+            case DCONST_0:
+            case DCONST_1:
+                pushValue(OTHER);
+                pushValue(OTHER);
+                break;
+            case IALOAD: // remove 2 add 1
+            case FALOAD: // remove 2 add 1
+            case AALOAD: // remove 2 add 1
+            case BALOAD: // remove 2 add 1
+            case CALOAD: // remove 2 add 1
+            case SALOAD: // remove 2 add 1
+            case POP:
+            case IADD:
+            case FADD:
+            case ISUB:
+            case LSHL: // 3 before 2 after
+            case LSHR: // 3 before 2 after
+            case LUSHR: // 3 before 2 after
+            case L2I: // 2 before 1 after
+            case L2F: // 2 before 1 after
+            case D2I: // 2 before 1 after
+            case D2F: // 2 before 1 after
+            case FSUB:
+            case FMUL:
+            case FDIV:
+            case FREM:
+            case FCMPL: // 2 before 1 after
+            case FCMPG: // 2 before 1 after
+            case IMUL:
+            case IDIV:
+            case IREM:
+            case ISHL:
+            case ISHR:
+            case IUSHR:
+            case IAND:
+            case IOR:
+            case IXOR:
+            case MONITORENTER:
+            case MONITOREXIT:
+                popValue();
+                break;
+            case POP2:
+            case LSUB:
+            case LMUL:
+            case LDIV:
+            case LREM:
+            case LADD:
+            case LAND:
+            case LOR:
+            case LXOR:
+            case DADD:
+            case DMUL:
+            case DSUB:
+            case DDIV:
+            case DREM:
+                popValue();
+                popValue();
+                break;
+            case IASTORE:
+            case FASTORE:
+            case AASTORE:
+            case BASTORE:
+            case CASTORE:
+            case SASTORE:
+            case LCMP: // 4 before 1 after
+            case DCMPL:
+            case DCMPG:
+                popValue();
+                popValue();
+                popValue();
+                break;
+            case LASTORE:
+            case DASTORE:
+                popValue();
+                popValue();
+                popValue();
+                popValue();
+                break;
+            case DUP:
+                pushValue(peekValue());
+                break;
+            case DUP_X1:
+                s = stackFrame.size();
+                stackFrame.add(s - 2, stackFrame.get(s - 1));
+                break;
+            case DUP_X2:
+                s = stackFrame.size();
+                stackFrame.add(s - 3, stackFrame.get(s - 1));
+                break;
+            case DUP2:
+                s = stackFrame.size();
+                stackFrame.add(s - 2, stackFrame.get(s - 1));
+                stackFrame.add(s - 2, stackFrame.get(s - 1));
+                break;
+            case DUP2_X1:
+                s = stackFrame.size();
+                stackFrame.add(s - 3, stackFrame.get(s - 1));
+                stackFrame.add(s - 3, stackFrame.get(s - 1));
+                break;
+            case DUP2_X2:
+                s = stackFrame.size();
+                stackFrame.add(s - 4, stackFrame.get(s - 1));
+                stackFrame.add(s - 4, stackFrame.get(s - 1));
+                break;
+            case SWAP:
+                s = stackFrame.size();
+                stackFrame.add(s - 2, stackFrame.get(s - 1));
+                stackFrame.remove(s);
+                break;
+            }
+        } else {
+            switch (opcode) {
+            case RETURN:
+            case IRETURN:
+            case FRETURN:
+            case ARETURN:
+            case LRETURN:
+            case DRETURN:
+            case ATHROW:
+                onMethodExit(opcode);
+                break;
+            }
+        }
+        mv.visitInsn(opcode);
+    }
+
+    @Override
+    public void visitVarInsn(final int opcode, final int var) {
+        super.visitVarInsn(opcode, var);
+        if (constructor) {
+            switch (opcode) {
+            case ILOAD:
+            case FLOAD:
+                pushValue(OTHER);
+                break;
+            case LLOAD:
+            case DLOAD:
+                pushValue(OTHER);
+                pushValue(OTHER);
+                break;
+            case ALOAD:
+                pushValue(var == 0 ? THIS : OTHER);
+                break;
+            case ASTORE:
+            case ISTORE:
+            case FSTORE:
+                popValue();
+                break;
+            case LSTORE:
+            case DSTORE:
+                popValue();
+                popValue();
+                break;
+            }
+        }
+    }
+
+    @Override
+    public void visitFieldInsn(final int opcode, final String owner,
+            final String name, final String desc) {
+        mv.visitFieldInsn(opcode, owner, name, desc);
+        if (constructor) {
+            char c = desc.charAt(0);
+            boolean longOrDouble = c == 'J' || c == 'D';
+            switch (opcode) {
+            case GETSTATIC:
+                pushValue(OTHER);
+                if (longOrDouble) {
+                    pushValue(OTHER);
+                }
+                break;
+            case PUTSTATIC:
+                popValue();
+                if (longOrDouble) {
+                    popValue();
+                }
+                break;
+            case PUTFIELD:
+                popValue();
+                if (longOrDouble) {
+                    popValue();
+                    popValue();
+                }
+                break;
+            // case GETFIELD:
+            default:
+                if (longOrDouble) {
+                    pushValue(OTHER);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void visitIntInsn(final int opcode, final int operand) {
+        mv.visitIntInsn(opcode, operand);
+        if (constructor && opcode != NEWARRAY) {
+            pushValue(OTHER);
+        }
+    }
+
+    @Override
+    public void visitLdcInsn(final Object cst) {
+        mv.visitLdcInsn(cst);
+        if (constructor) {
+            pushValue(OTHER);
+            if (cst instanceof Double || cst instanceof Long) {
+                pushValue(OTHER);
+            }
+        }
+    }
+
+    @Override
+    public void visitMultiANewArrayInsn(final String desc, final int dims) {
+        mv.visitMultiANewArrayInsn(desc, dims);
+        if (constructor) {
+            for (int i = 0; i < dims; i++) {
+                popValue();
+            }
+            pushValue(OTHER);
+        }
+    }
+
+    @Override
+    public void visitTypeInsn(final int opcode, final String type) {
+        mv.visitTypeInsn(opcode, type);
+        // ANEWARRAY, CHECKCAST or INSTANCEOF don't change stack
+        if (constructor && opcode == NEW) {
+            pushValue(OTHER);
+        }
+    }
+
+    @Override
+    public void visitMethodInsn(final int opcode, final String owner,
+            final String name, final String desc) {
+        mv.visitMethodInsn(opcode, owner, name, desc);
+        if (constructor) {
+            Type[] types = Type.getArgumentTypes(desc);
+            for (int i = 0; i < types.length; i++) {
+                popValue();
+                if (types[i].getSize() == 2) {
+                    popValue();
+                }
+            }
+            switch (opcode) {
+            // case INVOKESTATIC:
+            // break;
+            case INVOKEINTERFACE:
+            case INVOKEVIRTUAL:
+                popValue(); // objectref
+                break;
+            case INVOKESPECIAL:
+                Object type = popValue(); // objectref
+                if (type == THIS && !superInitialized) {
+                    onMethodEnter();
+                    superInitialized = true;
+                    // once super has been initialized it is no longer
+                    // necessary to keep track of stack state
+                    constructor = false;
+                }
+                break;
+            }
+
+            Type returnType = Type.getReturnType(desc);
+            if (returnType != Type.VOID_TYPE) {
+                pushValue(OTHER);
+                if (returnType.getSize() == 2) {
+                    pushValue(OTHER);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void visitInvokeDynamicInsn(String name, String desc, Handle bsm,
+            Object... bsmArgs) {
+        mv.visitInvokeDynamicInsn(name, desc, bsm, bsmArgs);
+        if (constructor) {
+            Type[] types = Type.getArgumentTypes(desc);
+            for (int i = 0; i < types.length; i++) {
+                popValue();
+                if (types[i].getSize() == 2) {
+                    popValue();
+                }
+            }
+
+            Type returnType = Type.getReturnType(desc);
+            if (returnType != Type.VOID_TYPE) {
+                pushValue(OTHER);
+                if (returnType.getSize() == 2) {
+                    pushValue(OTHER);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void visitJumpInsn(final int opcode, final Label label) {
+        mv.visitJumpInsn(opcode, label);
+        if (constructor) {
+            switch (opcode) {
+            case IFEQ:
+            case IFNE:
+            case IFLT:
+            case IFGE:
+            case IFGT:
+            case IFLE:
+            case IFNULL:
+            case IFNONNULL:
+                popValue();
+                break;
+            case IF_ICMPEQ:
+            case IF_ICMPNE:
+            case IF_ICMPLT:
+            case IF_ICMPGE:
+            case IF_ICMPGT:
+            case IF_ICMPLE:
+            case IF_ACMPEQ:
+            case IF_ACMPNE:
+                popValue();
+                popValue();
+                break;
+            case JSR:
+                pushValue(OTHER);
+                break;
+            }
+            addBranch(label);
+        }
+    }
+
+    @Override
+    public void visitLookupSwitchInsn(final Label dflt, final int[] keys,
+            final Label[] labels) {
+        mv.visitLookupSwitchInsn(dflt, keys, labels);
+        if (constructor) {
+            popValue();
+            addBranches(dflt, labels);
+        }
+    }
+
+    @Override
+    public void visitTableSwitchInsn(final int min, final int max,
+            final Label dflt, final Label... labels) {
+        mv.visitTableSwitchInsn(min, max, dflt, labels);
+        if (constructor) {
+            popValue();
+            addBranches(dflt, labels);
+        }
+    }
+
+    @Override
+    public void visitTryCatchBlock(Label start, Label end, Label handler,
+            String type) {
+        super.visitTryCatchBlock(start, end, handler, type);
+        if (constructor && !branches.containsKey(handler)) {
+            List<Object> stackFrame = new ArrayList<Object>();
+            stackFrame.add(OTHER);
+            branches.put(handler, stackFrame);
+        }
+    }
+
+    private void addBranches(final Label dflt, final Label[] labels) {
+        addBranch(dflt);
+        for (int i = 0; i < labels.length; i++) {
+            addBranch(labels[i]);
+        }
+    }
+
+    private void addBranch(final Label label) {
+        if (branches.containsKey(label)) {
+            return;
+        }
+        branches.put(label, new ArrayList<Object>(stackFrame));
+    }
+
+    private Object popValue() {
+        return stackFrame.remove(stackFrame.size() - 1);
+    }
+
+    private Object peekValue() {
+        return stackFrame.get(stackFrame.size() - 1);
+    }
+
+    private void pushValue(final Object o) {
+        stackFrame.add(o);
+    }
+
+    /**
+     * Called at the beginning of the method or after super class class call in
+     * the constructor. <br>
+     * <br>
+     * 
+     * <i>Custom code can use or change all the local variables, but should not
+     * change state of the stack.</i>
+     */
+    protected void onMethodEnter() {
+    }
+
+    /**
+     * Called before explicit exit from the method using either return or throw.
+     * Top element on the stack contains the return value or exception instance.
+     * For example:
+     * 
+     * <pre>
+     *   public void onMethodExit(int opcode) {
+     *     if(opcode==RETURN) {
+     *         visitInsn(ACONST_NULL);
+     *     } else if(opcode==ARETURN || opcode==ATHROW) {
+     *         dup();
+     *     } else {
+     *         if(opcode==LRETURN || opcode==DRETURN) {
+     *             dup2();
+     *         } else {
+     *             dup();
+     *         }
+     *         box(Type.getReturnType(this.methodDesc));
+     *     }
+     *     visitIntInsn(SIPUSH, opcode);
+     *     visitMethodInsn(INVOKESTATIC, owner, "onExit", "(Ljava/lang/Object;I)V");
+     *   }
+     * 
+     *   // an actual call back method
+     *   public static void onExit(Object param, int opcode) {
+     *     ...
+     * </pre>
+     * 
+     * <br>
+     * <br>
+     * 
+     * <i>Custom code can use or change all the local variables, but should not
+     * change state of the stack.</i>
+     * 
+     * @param opcode
+     *            one of the RETURN, IRETURN, FRETURN, ARETURN, LRETURN, DRETURN
+     *            or ATHROW
+     * 
+     */
+    protected void onMethodExit(int opcode) {
+    }
+
+    // TODO onException, onMethodCall
+}
diff --git a/src/main/asm/org/objectweb/asm/commons/AnalyzerAdapter.java b/src/main/asm/org/objectweb/asm/commons/AnalyzerAdapter.java
new file mode 100644
index 0000000..156af0c
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/commons/AnalyzerAdapter.java
@@ -0,0 +1,920 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.commons;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+
+/**
+ * A {@link MethodVisitor} that keeps track of stack map frame changes between
+ * {@link #visitFrame(int, int, Object[], int, Object[]) visitFrame} calls. This
+ * adapter must be used with the
+ * {@link org.objectweb.asm.ClassReader#EXPAND_FRAMES} option. Each
+ * visit<i>X</i> instruction delegates to the next visitor in the chain, if any,
+ * and then simulates the effect of this instruction on the stack map frame,
+ * represented by {@link #locals} and {@link #stack}. The next visitor in the
+ * chain can get the state of the stack map frame <i>before</i> each instruction
+ * by reading the value of these fields in its visit<i>X</i> methods (this
+ * requires a reference to the AnalyzerAdapter that is before it in the chain).
+ * If this adapter is used with a class that does not contain stack map table
+ * attributes (i.e., pre Java 6 classes) then this adapter may not be able to
+ * compute the stack map frame for each instruction. In this case no exception
+ * is thrown but the {@link #locals} and {@link #stack} fields will be null for
+ * these instructions.
+ * 
+ * @author Eric Bruneton
+ */
+public class AnalyzerAdapter extends MethodVisitor {
+
+    /**
+     * <code>List</code> of the local variable slots for current execution
+     * frame. Primitive types are represented by {@link Opcodes#TOP},
+     * {@link Opcodes#INTEGER}, {@link Opcodes#FLOAT}, {@link Opcodes#LONG},
+     * {@link Opcodes#DOUBLE},{@link Opcodes#NULL} or
+     * {@link Opcodes#UNINITIALIZED_THIS} (long and double are represented by
+     * two elements, the second one being TOP). Reference types are represented
+     * by String objects (representing internal names), and uninitialized types
+     * by Label objects (this label designates the NEW instruction that created
+     * this uninitialized value). This field is <tt>null</tt> for unreachable
+     * instructions.
+     */
+    public List<Object> locals;
+
+    /**
+     * <code>List</code> of the operand stack slots for current execution frame.
+     * Primitive types are represented by {@link Opcodes#TOP},
+     * {@link Opcodes#INTEGER}, {@link Opcodes#FLOAT}, {@link Opcodes#LONG},
+     * {@link Opcodes#DOUBLE},{@link Opcodes#NULL} or
+     * {@link Opcodes#UNINITIALIZED_THIS} (long and double are represented by
+     * two elements, the second one being TOP). Reference types are represented
+     * by String objects (representing internal names), and uninitialized types
+     * by Label objects (this label designates the NEW instruction that created
+     * this uninitialized value). This field is <tt>null</tt> for unreachable
+     * instructions.
+     */
+    public List<Object> stack;
+
+    /**
+     * The labels that designate the next instruction to be visited. May be
+     * <tt>null</tt>.
+     */
+    private List<Label> labels;
+
+    /**
+     * Information about uninitialized types in the current execution frame.
+     * This map associates internal names to Label objects. Each label
+     * designates a NEW instruction that created the currently uninitialized
+     * types, and the associated internal name represents the NEW operand, i.e.
+     * the final, initialized type value.
+     */
+    public Map<Object, Object> uninitializedTypes;
+
+    /**
+     * The maximum stack size of this method.
+     */
+    private int maxStack;
+
+    /**
+     * The maximum number of local variables of this method.
+     */
+    private int maxLocals;
+
+    /**
+     * The owner's class name.
+     */
+    private String owner;
+
+    /**
+     * Creates a new {@link AnalyzerAdapter}. <i>Subclasses must not use this
+     * constructor</i>. Instead, they must use the
+     * {@link #AnalyzerAdapter(int, String, int, String, String, MethodVisitor)}
+     * version.
+     * 
+     * @param owner
+     *            the owner's class name.
+     * @param access
+     *            the method's access flags (see {@link Opcodes}).
+     * @param name
+     *            the method's name.
+     * @param desc
+     *            the method's descriptor (see {@link Type Type}).
+     * @param mv
+     *            the method visitor to which this adapter delegates calls. May
+     *            be <tt>null</tt>.
+     */
+    public AnalyzerAdapter(final String owner, final int access,
+            final String name, final String desc, final MethodVisitor mv) {
+        this(Opcodes.ASM4, owner, access, name, desc, mv);
+    }
+
+    /**
+     * Creates a new {@link AnalyzerAdapter}.
+     * 
+     * @param api
+     *            the ASM API version implemented by this visitor. Must be one
+     *            of {@link Opcodes#ASM4}.
+     * @param owner
+     *            the owner's class name.
+     * @param access
+     *            the method's access flags (see {@link Opcodes}).
+     * @param name
+     *            the method's name.
+     * @param desc
+     *            the method's descriptor (see {@link Type Type}).
+     * @param mv
+     *            the method visitor to which this adapter delegates calls. May
+     *            be <tt>null</tt>.
+     */
+    protected AnalyzerAdapter(final int api, final String owner,
+            final int access, final String name, final String desc,
+            final MethodVisitor mv) {
+        super(api, mv);
+        this.owner = owner;
+        locals = new ArrayList<Object>();
+        stack = new ArrayList<Object>();
+        uninitializedTypes = new HashMap<Object, Object>();
+
+        if ((access & Opcodes.ACC_STATIC) == 0) {
+            if ("<init>".equals(name)) {
+                locals.add(Opcodes.UNINITIALIZED_THIS);
+            } else {
+                locals.add(owner);
+            }
+        }
+        Type[] types = Type.getArgumentTypes(desc);
+        for (int i = 0; i < types.length; ++i) {
+            Type type = types[i];
+            switch (type.getSort()) {
+            case Type.BOOLEAN:
+            case Type.CHAR:
+            case Type.BYTE:
+            case Type.SHORT:
+            case Type.INT:
+                locals.add(Opcodes.INTEGER);
+                break;
+            case Type.FLOAT:
+                locals.add(Opcodes.FLOAT);
+                break;
+            case Type.LONG:
+                locals.add(Opcodes.LONG);
+                locals.add(Opcodes.TOP);
+                break;
+            case Type.DOUBLE:
+                locals.add(Opcodes.DOUBLE);
+                locals.add(Opcodes.TOP);
+                break;
+            case Type.ARRAY:
+                locals.add(types[i].getDescriptor());
+                break;
+            // case Type.OBJECT:
+            default:
+                locals.add(types[i].getInternalName());
+            }
+        }
+    }
+
+    @Override
+    public void visitFrame(final int type, final int nLocal,
+            final Object[] local, final int nStack, final Object[] stack) {
+        if (type != Opcodes.F_NEW) { // uncompressed frame
+            throw new IllegalStateException(
+                    "ClassReader.accept() should be called with EXPAND_FRAMES flag");
+        }
+
+        if (mv != null) {
+            mv.visitFrame(type, nLocal, local, nStack, stack);
+        }
+
+        if (this.locals != null) {
+            this.locals.clear();
+            this.stack.clear();
+        } else {
+            this.locals = new ArrayList<Object>();
+            this.stack = new ArrayList<Object>();
+        }
+        visitFrameTypes(nLocal, local, this.locals);
+        visitFrameTypes(nStack, stack, this.stack);
+        maxStack = Math.max(maxStack, this.stack.size());
+    }
+
+    private static void visitFrameTypes(final int n, final Object[] types,
+            final List<Object> result) {
+        for (int i = 0; i < n; ++i) {
+            Object type = types[i];
+            result.add(type);
+            if (type == Opcodes.LONG || type == Opcodes.DOUBLE) {
+                result.add(Opcodes.TOP);
+            }
+        }
+    }
+
+    @Override
+    public void visitInsn(final int opcode) {
+        if (mv != null) {
+            mv.visitInsn(opcode);
+        }
+        execute(opcode, 0, null);
+        if ((opcode >= Opcodes.IRETURN && opcode <= Opcodes.RETURN)
+                || opcode == Opcodes.ATHROW) {
+            this.locals = null;
+            this.stack = null;
+        }
+    }
+
+    @Override
+    public void visitIntInsn(final int opcode, final int operand) {
+        if (mv != null) {
+            mv.visitIntInsn(opcode, operand);
+        }
+        execute(opcode, operand, null);
+    }
+
+    @Override
+    public void visitVarInsn(final int opcode, final int var) {
+        if (mv != null) {
+            mv.visitVarInsn(opcode, var);
+        }
+        execute(opcode, var, null);
+    }
+
+    @Override
+    public void visitTypeInsn(final int opcode, final String type) {
+        if (opcode == Opcodes.NEW) {
+            if (labels == null) {
+                Label l = new Label();
+                labels = new ArrayList<Label>(3);
+                labels.add(l);
+                if (mv != null) {
+                    mv.visitLabel(l);
+                }
+            }
+            for (int i = 0; i < labels.size(); ++i) {
+                uninitializedTypes.put(labels.get(i), type);
+            }
+        }
+        if (mv != null) {
+            mv.visitTypeInsn(opcode, type);
+        }
+        execute(opcode, 0, type);
+    }
+
+    @Override
+    public void visitFieldInsn(final int opcode, final String owner,
+            final String name, final String desc) {
+        if (mv != null) {
+            mv.visitFieldInsn(opcode, owner, name, desc);
+        }
+        execute(opcode, 0, desc);
+    }
+
+    @Override
+    public void visitMethodInsn(final int opcode, final String owner,
+            final String name, final String desc) {
+        if (mv != null) {
+            mv.visitMethodInsn(opcode, owner, name, desc);
+        }
+        if (this.locals == null) {
+            labels = null;
+            return;
+        }
+        pop(desc);
+        if (opcode != Opcodes.INVOKESTATIC) {
+            Object t = pop();
+            if (opcode == Opcodes.INVOKESPECIAL && name.charAt(0) == '<') {
+                Object u;
+                if (t == Opcodes.UNINITIALIZED_THIS) {
+                    u = this.owner;
+                } else {
+                    u = uninitializedTypes.get(t);
+                }
+                for (int i = 0; i < locals.size(); ++i) {
+                    if (locals.get(i) == t) {
+                        locals.set(i, u);
+                    }
+                }
+                for (int i = 0; i < stack.size(); ++i) {
+                    if (stack.get(i) == t) {
+                        stack.set(i, u);
+                    }
+                }
+            }
+        }
+        pushDesc(desc);
+        labels = null;
+    }
+
+    @Override
+    public void visitInvokeDynamicInsn(String name, String desc, Handle bsm,
+            Object... bsmArgs) {
+        if (mv != null) {
+            mv.visitInvokeDynamicInsn(name, desc, bsm, bsmArgs);
+        }
+        if (this.locals == null) {
+            labels = null;
+            return;
+        }
+        pop(desc);
+        pushDesc(desc);
+        labels = null;
+    }
+
+    @Override
+    public void visitJumpInsn(final int opcode, final Label label) {
+        if (mv != null) {
+            mv.visitJumpInsn(opcode, label);
+        }
+        execute(opcode, 0, null);
+        if (opcode == Opcodes.GOTO) {
+            this.locals = null;
+            this.stack = null;
+        }
+    }
+
+    @Override
+    public void visitLabel(final Label label) {
+        if (mv != null) {
+            mv.visitLabel(label);
+        }
+        if (labels == null) {
+            labels = new ArrayList<Label>(3);
+        }
+        labels.add(label);
+    }
+
+    @Override
+    public void visitLdcInsn(final Object cst) {
+        if (mv != null) {
+            mv.visitLdcInsn(cst);
+        }
+        if (this.locals == null) {
+            labels = null;
+            return;
+        }
+        if (cst instanceof Integer) {
+            push(Opcodes.INTEGER);
+        } else if (cst instanceof Long) {
+            push(Opcodes.LONG);
+            push(Opcodes.TOP);
+        } else if (cst instanceof Float) {
+            push(Opcodes.FLOAT);
+        } else if (cst instanceof Double) {
+            push(Opcodes.DOUBLE);
+            push(Opcodes.TOP);
+        } else if (cst instanceof String) {
+            push("java/lang/String");
+        } else if (cst instanceof Type) {
+            int sort = ((Type) cst).getSort();
+            if (sort == Type.OBJECT || sort == Type.ARRAY) {
+                push("java/lang/Class");
+            } else if (sort == Type.METHOD) {
+                push("java/lang/invoke/MethodType");
+            } else {
+                throw new IllegalArgumentException();
+            }
+        } else if (cst instanceof Handle) {
+            push("java/lang/invoke/MethodHandle");
+        } else {
+            throw new IllegalArgumentException();
+        }
+        labels = null;
+    }
+
+    @Override
+    public void visitIincInsn(final int var, final int increment) {
+        if (mv != null) {
+            mv.visitIincInsn(var, increment);
+        }
+        execute(Opcodes.IINC, var, null);
+    }
+
+    @Override
+    public void visitTableSwitchInsn(final int min, final int max,
+            final Label dflt, final Label... labels) {
+        if (mv != null) {
+            mv.visitTableSwitchInsn(min, max, dflt, labels);
+        }
+        execute(Opcodes.TABLESWITCH, 0, null);
+        this.locals = null;
+        this.stack = null;
+    }
+
+    @Override
+    public void visitLookupSwitchInsn(final Label dflt, final int[] keys,
+            final Label[] labels) {
+        if (mv != null) {
+            mv.visitLookupSwitchInsn(dflt, keys, labels);
+        }
+        execute(Opcodes.LOOKUPSWITCH, 0, null);
+        this.locals = null;
+        this.stack = null;
+    }
+
+    @Override
+    public void visitMultiANewArrayInsn(final String desc, final int dims) {
+        if (mv != null) {
+            mv.visitMultiANewArrayInsn(desc, dims);
+        }
+        execute(Opcodes.MULTIANEWARRAY, dims, desc);
+    }
+
+    @Override
+    public void visitMaxs(final int maxStack, final int maxLocals) {
+        if (mv != null) {
+            this.maxStack = Math.max(this.maxStack, maxStack);
+            this.maxLocals = Math.max(this.maxLocals, maxLocals);
+            mv.visitMaxs(this.maxStack, this.maxLocals);
+        }
+    }
+
+    // ------------------------------------------------------------------------
+
+    private Object get(final int local) {
+        maxLocals = Math.max(maxLocals, local);
+        return local < locals.size() ? locals.get(local) : Opcodes.TOP;
+    }
+
+    private void set(final int local, final Object type) {
+        maxLocals = Math.max(maxLocals, local);
+        while (local >= locals.size()) {
+            locals.add(Opcodes.TOP);
+        }
+        locals.set(local, type);
+    }
+
+    private void push(final Object type) {
+        stack.add(type);
+        maxStack = Math.max(maxStack, stack.size());
+    }
+
+    private void pushDesc(final String desc) {
+        int index = desc.charAt(0) == '(' ? desc.indexOf(')') + 1 : 0;
+        switch (desc.charAt(index)) {
+        case 'V':
+            return;
+        case 'Z':
+        case 'C':
+        case 'B':
+        case 'S':
+        case 'I':
+            push(Opcodes.INTEGER);
+            return;
+        case 'F':
+            push(Opcodes.FLOAT);
+            return;
+        case 'J':
+            push(Opcodes.LONG);
+            push(Opcodes.TOP);
+            return;
+        case 'D':
+            push(Opcodes.DOUBLE);
+            push(Opcodes.TOP);
+            return;
+        case '[':
+            if (index == 0) {
+                push(desc);
+            } else {
+                push(desc.substring(index, desc.length()));
+            }
+            break;
+        // case 'L':
+        default:
+            if (index == 0) {
+                push(desc.substring(1, desc.length() - 1));
+            } else {
+                push(desc.substring(index + 1, desc.length() - 1));
+            }
+        }
+    }
+
+    private Object pop() {
+        return stack.remove(stack.size() - 1);
+    }
+
+    private void pop(final int n) {
+        int size = stack.size();
+        int end = size - n;
+        for (int i = size - 1; i >= end; --i) {
+            stack.remove(i);
+        }
+    }
+
+    private void pop(final String desc) {
+        char c = desc.charAt(0);
+        if (c == '(') {
+            int n = 0;
+            Type[] types = Type.getArgumentTypes(desc);
+            for (int i = 0; i < types.length; ++i) {
+                n += types[i].getSize();
+            }
+            pop(n);
+        } else if (c == 'J' || c == 'D') {
+            pop(2);
+        } else {
+            pop(1);
+        }
+    }
+
+    private void execute(final int opcode, final int iarg, final String sarg) {
+        if (this.locals == null) {
+            labels = null;
+            return;
+        }
+        Object t1, t2, t3, t4;
+        switch (opcode) {
+        case Opcodes.NOP:
+        case Opcodes.INEG:
+        case Opcodes.LNEG:
+        case Opcodes.FNEG:
+        case Opcodes.DNEG:
+        case Opcodes.I2B:
+        case Opcodes.I2C:
+        case Opcodes.I2S:
+        case Opcodes.GOTO:
+        case Opcodes.RETURN:
+            break;
+        case Opcodes.ACONST_NULL:
+            push(Opcodes.NULL);
+            break;
+        case Opcodes.ICONST_M1:
+        case Opcodes.ICONST_0:
+        case Opcodes.ICONST_1:
+        case Opcodes.ICONST_2:
+        case Opcodes.ICONST_3:
+        case Opcodes.ICONST_4:
+        case Opcodes.ICONST_5:
+        case Opcodes.BIPUSH:
+        case Opcodes.SIPUSH:
+            push(Opcodes.INTEGER);
+            break;
+        case Opcodes.LCONST_0:
+        case Opcodes.LCONST_1:
+            push(Opcodes.LONG);
+            push(Opcodes.TOP);
+            break;
+        case Opcodes.FCONST_0:
+        case Opcodes.FCONST_1:
+        case Opcodes.FCONST_2:
+            push(Opcodes.FLOAT);
+            break;
+        case Opcodes.DCONST_0:
+        case Opcodes.DCONST_1:
+            push(Opcodes.DOUBLE);
+            push(Opcodes.TOP);
+            break;
+        case Opcodes.ILOAD:
+        case Opcodes.FLOAD:
+        case Opcodes.ALOAD:
+            push(get(iarg));
+            break;
+        case Opcodes.LLOAD:
+        case Opcodes.DLOAD:
+            push(get(iarg));
+            push(Opcodes.TOP);
+            break;
+        case Opcodes.IALOAD:
+        case Opcodes.BALOAD:
+        case Opcodes.CALOAD:
+        case Opcodes.SALOAD:
+            pop(2);
+            push(Opcodes.INTEGER);
+            break;
+        case Opcodes.LALOAD:
+        case Opcodes.D2L:
+            pop(2);
+            push(Opcodes.LONG);
+            push(Opcodes.TOP);
+            break;
+        case Opcodes.FALOAD:
+            pop(2);
+            push(Opcodes.FLOAT);
+            break;
+        case Opcodes.DALOAD:
+        case Opcodes.L2D:
+            pop(2);
+            push(Opcodes.DOUBLE);
+            push(Opcodes.TOP);
+            break;
+        case Opcodes.AALOAD:
+            pop(1);
+            t1 = pop();
+            if (t1 instanceof String) {
+                pushDesc(((String) t1).substring(1));
+            } else {
+                push("java/lang/Object");
+            }
+            break;
+        case Opcodes.ISTORE:
+        case Opcodes.FSTORE:
+        case Opcodes.ASTORE:
+            t1 = pop();
+            set(iarg, t1);
+            if (iarg > 0) {
+                t2 = get(iarg - 1);
+                if (t2 == Opcodes.LONG || t2 == Opcodes.DOUBLE) {
+                    set(iarg - 1, Opcodes.TOP);
+                }
+            }
+            break;
+        case Opcodes.LSTORE:
+        case Opcodes.DSTORE:
+            pop(1);
+            t1 = pop();
+            set(iarg, t1);
+            set(iarg + 1, Opcodes.TOP);
+            if (iarg > 0) {
+                t2 = get(iarg - 1);
+                if (t2 == Opcodes.LONG || t2 == Opcodes.DOUBLE) {
+                    set(iarg - 1, Opcodes.TOP);
+                }
+            }
+            break;
+        case Opcodes.IASTORE:
+        case Opcodes.BASTORE:
+        case Opcodes.CASTORE:
+        case Opcodes.SASTORE:
+        case Opcodes.FASTORE:
+        case Opcodes.AASTORE:
+            pop(3);
+            break;
+        case Opcodes.LASTORE:
+        case Opcodes.DASTORE:
+            pop(4);
+            break;
+        case Opcodes.POP:
+        case Opcodes.IFEQ:
+        case Opcodes.IFNE:
+        case Opcodes.IFLT:
+        case Opcodes.IFGE:
+        case Opcodes.IFGT:
+        case Opcodes.IFLE:
+        case Opcodes.IRETURN:
+        case Opcodes.FRETURN:
+        case Opcodes.ARETURN:
+        case Opcodes.TABLESWITCH:
+        case Opcodes.LOOKUPSWITCH:
+        case Opcodes.ATHROW:
+        case Opcodes.MONITORENTER:
+        case Opcodes.MONITOREXIT:
+        case Opcodes.IFNULL:
+        case Opcodes.IFNONNULL:
+            pop(1);
+            break;
+        case Opcodes.POP2:
+        case Opcodes.IF_ICMPEQ:
+        case Opcodes.IF_ICMPNE:
+        case Opcodes.IF_ICMPLT:
+        case Opcodes.IF_ICMPGE:
+        case Opcodes.IF_ICMPGT:
+        case Opcodes.IF_ICMPLE:
+        case Opcodes.IF_ACMPEQ:
+        case Opcodes.IF_ACMPNE:
+        case Opcodes.LRETURN:
+        case Opcodes.DRETURN:
+            pop(2);
+            break;
+        case Opcodes.DUP:
+            t1 = pop();
+            push(t1);
+            push(t1);
+            break;
+        case Opcodes.DUP_X1:
+            t1 = pop();
+            t2 = pop();
+            push(t1);
+            push(t2);
+            push(t1);
+            break;
+        case Opcodes.DUP_X2:
+            t1 = pop();
+            t2 = pop();
+            t3 = pop();
+            push(t1);
+            push(t3);
+            push(t2);
+            push(t1);
+            break;
+        case Opcodes.DUP2:
+            t1 = pop();
+            t2 = pop();
+            push(t2);
+            push(t1);
+            push(t2);
+            push(t1);
+            break;
+        case Opcodes.DUP2_X1:
+            t1 = pop();
+            t2 = pop();
+            t3 = pop();
+            push(t2);
+            push(t1);
+            push(t3);
+            push(t2);
+            push(t1);
+            break;
+        case Opcodes.DUP2_X2:
+            t1 = pop();
+            t2 = pop();
+            t3 = pop();
+            t4 = pop();
+            push(t2);
+            push(t1);
+            push(t4);
+            push(t3);
+            push(t2);
+            push(t1);
+            break;
+        case Opcodes.SWAP:
+            t1 = pop();
+            t2 = pop();
+            push(t1);
+            push(t2);
+            break;
+        case Opcodes.IADD:
+        case Opcodes.ISUB:
+        case Opcodes.IMUL:
+        case Opcodes.IDIV:
+        case Opcodes.IREM:
+        case Opcodes.IAND:
+        case Opcodes.IOR:
+        case Opcodes.IXOR:
+        case Opcodes.ISHL:
+        case Opcodes.ISHR:
+        case Opcodes.IUSHR:
+        case Opcodes.L2I:
+        case Opcodes.D2I:
+        case Opcodes.FCMPL:
+        case Opcodes.FCMPG:
+            pop(2);
+            push(Opcodes.INTEGER);
+            break;
+        case Opcodes.LADD:
+        case Opcodes.LSUB:
+        case Opcodes.LMUL:
+        case Opcodes.LDIV:
+        case Opcodes.LREM:
+        case Opcodes.LAND:
+        case Opcodes.LOR:
+        case Opcodes.LXOR:
+            pop(4);
+            push(Opcodes.LONG);
+            push(Opcodes.TOP);
+            break;
+        case Opcodes.FADD:
+        case Opcodes.FSUB:
+        case Opcodes.FMUL:
+        case Opcodes.FDIV:
+        case Opcodes.FREM:
+        case Opcodes.L2F:
+        case Opcodes.D2F:
+            pop(2);
+            push(Opcodes.FLOAT);
+            break;
+        case Opcodes.DADD:
+        case Opcodes.DSUB:
+        case Opcodes.DMUL:
+        case Opcodes.DDIV:
+        case Opcodes.DREM:
+            pop(4);
+            push(Opcodes.DOUBLE);
+            push(Opcodes.TOP);
+            break;
+        case Opcodes.LSHL:
+        case Opcodes.LSHR:
+        case Opcodes.LUSHR:
+            pop(3);
+            push(Opcodes.LONG);
+            push(Opcodes.TOP);
+            break;
+        case Opcodes.IINC:
+            set(iarg, Opcodes.INTEGER);
+            break;
+        case Opcodes.I2L:
+        case Opcodes.F2L:
+            pop(1);
+            push(Opcodes.LONG);
+            push(Opcodes.TOP);
+            break;
+        case Opcodes.I2F:
+            pop(1);
+            push(Opcodes.FLOAT);
+            break;
+        case Opcodes.I2D:
+        case Opcodes.F2D:
+            pop(1);
+            push(Opcodes.DOUBLE);
+            push(Opcodes.TOP);
+            break;
+        case Opcodes.F2I:
+        case Opcodes.ARRAYLENGTH:
+        case Opcodes.INSTANCEOF:
+            pop(1);
+            push(Opcodes.INTEGER);
+            break;
+        case Opcodes.LCMP:
+        case Opcodes.DCMPL:
+        case Opcodes.DCMPG:
+            pop(4);
+            push(Opcodes.INTEGER);
+            break;
+        case Opcodes.JSR:
+        case Opcodes.RET:
+            throw new RuntimeException("JSR/RET are not supported");
+        case Opcodes.GETSTATIC:
+            pushDesc(sarg);
+            break;
+        case Opcodes.PUTSTATIC:
+            pop(sarg);
+            break;
+        case Opcodes.GETFIELD:
+            pop(1);
+            pushDesc(sarg);
+            break;
+        case Opcodes.PUTFIELD:
+            pop(sarg);
+            pop();
+            break;
+        case Opcodes.NEW:
+            push(labels.get(0));
+            break;
+        case Opcodes.NEWARRAY:
+            pop();
+            switch (iarg) {
+            case Opcodes.T_BOOLEAN:
+                pushDesc("[Z");
+                break;
+            case Opcodes.T_CHAR:
+                pushDesc("[C");
+                break;
+            case Opcodes.T_BYTE:
+                pushDesc("[B");
+                break;
+            case Opcodes.T_SHORT:
+                pushDesc("[S");
+                break;
+            case Opcodes.T_INT:
+                pushDesc("[I");
+                break;
+            case Opcodes.T_FLOAT:
+                pushDesc("[F");
+                break;
+            case Opcodes.T_DOUBLE:
+                pushDesc("[D");
+                break;
+            // case Opcodes.T_LONG:
+            default:
+                pushDesc("[J");
+                break;
+            }
+            break;
+        case Opcodes.ANEWARRAY:
+            pop();
+            pushDesc("[" + Type.getObjectType(sarg));
+            break;
+        case Opcodes.CHECKCAST:
+            pop();
+            pushDesc(Type.getObjectType(sarg).getDescriptor());
+            break;
+        // case Opcodes.MULTIANEWARRAY:
+        default:
+            pop(iarg);
+            pushDesc(sarg);
+            break;
+        }
+        labels = null;
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/commons/CodeSizeEvaluator.java b/src/main/asm/org/objectweb/asm/commons/CodeSizeEvaluator.java
new file mode 100644
index 0000000..ddeb26d
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/commons/CodeSizeEvaluator.java
@@ -0,0 +1,217 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.commons;
+
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+/**
+ * A {@link MethodVisitor} that can be used to approximate method size.
+ * 
+ * @author Eugene Kuleshov
+ */
+public class CodeSizeEvaluator extends MethodVisitor implements Opcodes {
+
+    private int minSize;
+
+    private int maxSize;
+
+    public CodeSizeEvaluator(final MethodVisitor mv) {
+        this(Opcodes.ASM4, mv);
+    }
+
+    protected CodeSizeEvaluator(final int api, final MethodVisitor mv) {
+        super(api, mv);
+    }
+
+    public int getMinSize() {
+        return this.minSize;
+    }
+
+    public int getMaxSize() {
+        return this.maxSize;
+    }
+
+    @Override
+    public void visitInsn(final int opcode) {
+        minSize += 1;
+        maxSize += 1;
+        if (mv != null) {
+            mv.visitInsn(opcode);
+        }
+    }
+
+    @Override
+    public void visitIntInsn(final int opcode, final int operand) {
+        if (opcode == SIPUSH) {
+            minSize += 3;
+            maxSize += 3;
+        } else {
+            minSize += 2;
+            maxSize += 2;
+        }
+        if (mv != null) {
+            mv.visitIntInsn(opcode, operand);
+        }
+    }
+
+    @Override
+    public void visitVarInsn(final int opcode, final int var) {
+        if (var < 4 && opcode != RET) {
+            minSize += 1;
+            maxSize += 1;
+        } else if (var >= 256) {
+            minSize += 4;
+            maxSize += 4;
+        } else {
+            minSize += 2;
+            maxSize += 2;
+        }
+        if (mv != null) {
+            mv.visitVarInsn(opcode, var);
+        }
+    }
+
+    @Override
+    public void visitTypeInsn(final int opcode, final String type) {
+        minSize += 3;
+        maxSize += 3;
+        if (mv != null) {
+            mv.visitTypeInsn(opcode, type);
+        }
+    }
+
+    @Override
+    public void visitFieldInsn(final int opcode, final String owner,
+            final String name, final String desc) {
+        minSize += 3;
+        maxSize += 3;
+        if (mv != null) {
+            mv.visitFieldInsn(opcode, owner, name, desc);
+        }
+    }
+
+    @Override
+    public void visitMethodInsn(final int opcode, final String owner,
+            final String name, final String desc) {
+        if (opcode == INVOKEINTERFACE) {
+            minSize += 5;
+            maxSize += 5;
+        } else {
+            minSize += 3;
+            maxSize += 3;
+        }
+        if (mv != null) {
+            mv.visitMethodInsn(opcode, owner, name, desc);
+        }
+    }
+
+    @Override
+    public void visitInvokeDynamicInsn(String name, String desc, Handle bsm,
+            Object... bsmArgs) {
+        minSize += 5;
+        maxSize += 5;
+        if (mv != null) {
+            mv.visitInvokeDynamicInsn(name, desc, bsm, bsmArgs);
+        }
+    }
+
+    @Override
+    public void visitJumpInsn(final int opcode, final Label label) {
+        minSize += 3;
+        if (opcode == GOTO || opcode == JSR) {
+            maxSize += 5;
+        } else {
+            maxSize += 8;
+        }
+        if (mv != null) {
+            mv.visitJumpInsn(opcode, label);
+        }
+    }
+
+    @Override
+    public void visitLdcInsn(final Object cst) {
+        if (cst instanceof Long || cst instanceof Double) {
+            minSize += 3;
+            maxSize += 3;
+        } else {
+            minSize += 2;
+            maxSize += 3;
+        }
+        if (mv != null) {
+            mv.visitLdcInsn(cst);
+        }
+    }
+
+    @Override
+    public void visitIincInsn(final int var, final int increment) {
+        if (var > 255 || increment > 127 || increment < -128) {
+            minSize += 6;
+            maxSize += 6;
+        } else {
+            minSize += 3;
+            maxSize += 3;
+        }
+        if (mv != null) {
+            mv.visitIincInsn(var, increment);
+        }
+    }
+
+    @Override
+    public void visitTableSwitchInsn(final int min, final int max,
+            final Label dflt, final Label... labels) {
+        minSize += 13 + labels.length * 4;
+        maxSize += 16 + labels.length * 4;
+        if (mv != null) {
+            mv.visitTableSwitchInsn(min, max, dflt, labels);
+        }
+    }
+
+    @Override
+    public void visitLookupSwitchInsn(final Label dflt, final int[] keys,
+            final Label[] labels) {
+        minSize += 9 + keys.length * 8;
+        maxSize += 12 + keys.length * 8;
+        if (mv != null) {
+            mv.visitLookupSwitchInsn(dflt, keys, labels);
+        }
+    }
+
+    @Override
+    public void visitMultiANewArrayInsn(final String desc, final int dims) {
+        minSize += 4;
+        maxSize += 4;
+        if (mv != null) {
+            mv.visitMultiANewArrayInsn(desc, dims);
+        }
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/commons/GeneratorAdapter.java b/src/main/asm/org/objectweb/asm/commons/GeneratorAdapter.java
new file mode 100644
index 0000000..ea2a097
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/commons/GeneratorAdapter.java
@@ -0,0 +1,1623 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.commons;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+
+/**
+ * A {@link org.objectweb.asm.MethodVisitor} with convenient methods to generate
+ * code. For example, using this adapter, the class below
+ * 
+ * <pre>
+ * public class Example {
+ *     public static void main(String[] args) {
+ *         System.out.println(&quot;Hello world!&quot;);
+ *     }
+ * }
+ * </pre>
+ * 
+ * can be generated as follows:
+ * 
+ * <pre>
+ * ClassWriter cw = new ClassWriter(true);
+ * cw.visit(V1_1, ACC_PUBLIC, &quot;Example&quot;, null, &quot;java/lang/Object&quot;, null);
+ * 
+ * Method m = Method.getMethod(&quot;void &lt;init&gt; ()&quot;);
+ * GeneratorAdapter mg = new GeneratorAdapter(ACC_PUBLIC, m, null, null, cw);
+ * mg.loadThis();
+ * mg.invokeConstructor(Type.getType(Object.class), m);
+ * mg.returnValue();
+ * mg.endMethod();
+ * 
+ * m = Method.getMethod(&quot;void main (String[])&quot;);
+ * mg = new GeneratorAdapter(ACC_PUBLIC + ACC_STATIC, m, null, null, cw);
+ * mg.getStatic(Type.getType(System.class), &quot;out&quot;, Type.getType(PrintStream.class));
+ * mg.push(&quot;Hello world!&quot;);
+ * mg.invokeVirtual(Type.getType(PrintStream.class),
+ *         Method.getMethod(&quot;void println (String)&quot;));
+ * mg.returnValue();
+ * mg.endMethod();
+ * 
+ * cw.visitEnd();
+ * </pre>
+ * 
+ * @author Juozas Baliuka
+ * @author Chris Nokleberg
+ * @author Eric Bruneton
+ * @author Prashant Deva
+ */
+public class GeneratorAdapter extends LocalVariablesSorter {
+
+    private static final String CLDESC = "Ljava/lang/Class;";
+
+    private static final Type BYTE_TYPE = Type.getObjectType("java/lang/Byte");
+
+    private static final Type BOOLEAN_TYPE = Type
+            .getObjectType("java/lang/Boolean");
+
+    private static final Type SHORT_TYPE = Type
+            .getObjectType("java/lang/Short");
+
+    private static final Type CHARACTER_TYPE = Type
+            .getObjectType("java/lang/Character");
+
+    private static final Type INTEGER_TYPE = Type
+            .getObjectType("java/lang/Integer");
+
+    private static final Type FLOAT_TYPE = Type
+            .getObjectType("java/lang/Float");
+
+    private static final Type LONG_TYPE = Type.getObjectType("java/lang/Long");
+
+    private static final Type DOUBLE_TYPE = Type
+            .getObjectType("java/lang/Double");
+
+    private static final Type NUMBER_TYPE = Type
+            .getObjectType("java/lang/Number");
+
+    private static final Type OBJECT_TYPE = Type
+            .getObjectType("java/lang/Object");
+
+    private static final Method BOOLEAN_VALUE = Method
+            .getMethod("boolean booleanValue()");
+
+    private static final Method CHAR_VALUE = Method
+            .getMethod("char charValue()");
+
+    private static final Method INT_VALUE = Method.getMethod("int intValue()");
+
+    private static final Method FLOAT_VALUE = Method
+            .getMethod("float floatValue()");
+
+    private static final Method LONG_VALUE = Method
+            .getMethod("long longValue()");
+
+    private static final Method DOUBLE_VALUE = Method
+            .getMethod("double doubleValue()");
+
+    /**
+     * Constant for the {@link #math math} method.
+     */
+    public static final int ADD = Opcodes.IADD;
+
+    /**
+     * Constant for the {@link #math math} method.
+     */
+    public static final int SUB = Opcodes.ISUB;
+
+    /**
+     * Constant for the {@link #math math} method.
+     */
+    public static final int MUL = Opcodes.IMUL;
+
+    /**
+     * Constant for the {@link #math math} method.
+     */
+    public static final int DIV = Opcodes.IDIV;
+
+    /**
+     * Constant for the {@link #math math} method.
+     */
+    public static final int REM = Opcodes.IREM;
+
+    /**
+     * Constant for the {@link #math math} method.
+     */
+    public static final int NEG = Opcodes.INEG;
+
+    /**
+     * Constant for the {@link #math math} method.
+     */
+    public static final int SHL = Opcodes.ISHL;
+
+    /**
+     * Constant for the {@link #math math} method.
+     */
+    public static final int SHR = Opcodes.ISHR;
+
+    /**
+     * Constant for the {@link #math math} method.
+     */
+    public static final int USHR = Opcodes.IUSHR;
+
+    /**
+     * Constant for the {@link #math math} method.
+     */
+    public static final int AND = Opcodes.IAND;
+
+    /**
+     * Constant for the {@link #math math} method.
+     */
+    public static final int OR = Opcodes.IOR;
+
+    /**
+     * Constant for the {@link #math math} method.
+     */
+    public static final int XOR = Opcodes.IXOR;
+
+    /**
+     * Constant for the {@link #ifCmp ifCmp} method.
+     */
+    public static final int EQ = Opcodes.IFEQ;
+
+    /**
+     * Constant for the {@link #ifCmp ifCmp} method.
+     */
+    public static final int NE = Opcodes.IFNE;
+
+    /**
+     * Constant for the {@link #ifCmp ifCmp} method.
+     */
+    public static final int LT = Opcodes.IFLT;
+
+    /**
+     * Constant for the {@link #ifCmp ifCmp} method.
+     */
+    public static final int GE = Opcodes.IFGE;
+
+    /**
+     * Constant for the {@link #ifCmp ifCmp} method.
+     */
+    public static final int GT = Opcodes.IFGT;
+
+    /**
+     * Constant for the {@link #ifCmp ifCmp} method.
+     */
+    public static final int LE = Opcodes.IFLE;
+
+    /**
+     * Access flags of the method visited by this adapter.
+     */
+    private final int access;
+
+    /**
+     * Return type of the method visited by this adapter.
+     */
+    private final Type returnType;
+
+    /**
+     * Argument types of the method visited by this adapter.
+     */
+    private final Type[] argumentTypes;
+
+    /**
+     * Types of the local variables of the method visited by this adapter.
+     */
+    private final List<Type> localTypes = new ArrayList<Type>();
+
+    /**
+     * Creates a new {@link GeneratorAdapter}. <i>Subclasses must not use this
+     * constructor</i>. Instead, they must use the
+     * {@link #GeneratorAdapter(int, MethodVisitor, int, String, String)}
+     * version.
+     * 
+     * @param mv
+     *            the method visitor to which this adapter delegates calls.
+     * @param access
+     *            the method's access flags (see {@link Opcodes}).
+     * @param name
+     *            the method's name.
+     * @param desc
+     *            the method's descriptor (see {@link Type Type}).
+     */
+    public GeneratorAdapter(final MethodVisitor mv, final int access,
+            final String name, final String desc) {
+        this(Opcodes.ASM4, mv, access, name, desc);
+    }
+
+    /**
+     * Creates a new {@link GeneratorAdapter}.
+     * 
+     * @param api
+     *            the ASM API version implemented by this visitor. Must be one
+     *            of {@link Opcodes#ASM4}.
+     * @param mv
+     *            the method visitor to which this adapter delegates calls.
+     * @param access
+     *            the method's access flags (see {@link Opcodes}).
+     * @param name
+     *            the method's name.
+     * @param desc
+     *            the method's descriptor (see {@link Type Type}).
+     */
+    protected GeneratorAdapter(final int api, final MethodVisitor mv,
+            final int access, final String name, final String desc) {
+        super(api, access, desc, mv);
+        this.access = access;
+        this.returnType = Type.getReturnType(desc);
+        this.argumentTypes = Type.getArgumentTypes(desc);
+    }
+
+    /**
+     * Creates a new {@link GeneratorAdapter}. <i>Subclasses must not use this
+     * constructor</i>. Instead, they must use the
+     * {@link #GeneratorAdapter(int, MethodVisitor, int, String, String)}
+     * version.
+     * 
+     * @param access
+     *            access flags of the adapted method.
+     * @param method
+     *            the adapted method.
+     * @param mv
+     *            the method visitor to which this adapter delegates calls.
+     */
+    public GeneratorAdapter(final int access, final Method method,
+            final MethodVisitor mv) {
+        this(mv, access, null, method.getDescriptor());
+    }
+
+    /**
+     * Creates a new {@link GeneratorAdapter}. <i>Subclasses must not use this
+     * constructor</i>. Instead, they must use the
+     * {@link #GeneratorAdapter(int, MethodVisitor, int, String, String)}
+     * version.
+     * 
+     * @param access
+     *            access flags of the adapted method.
+     * @param method
+     *            the adapted method.
+     * @param signature
+     *            the signature of the adapted method (may be <tt>null</tt>).
+     * @param exceptions
+     *            the exceptions thrown by the adapted method (may be
+     *            <tt>null</tt>).
+     * @param cv
+     *            the class visitor to which this adapter delegates calls.
+     */
+    public GeneratorAdapter(final int access, final Method method,
+            final String signature, final Type[] exceptions,
+            final ClassVisitor cv) {
+        this(access, method, cv
+                .visitMethod(access, method.getName(), method.getDescriptor(),
+                        signature, getInternalNames(exceptions)));
+    }
+
+    /**
+     * Returns the internal names of the given types.
+     * 
+     * @param types
+     *            a set of types.
+     * @return the internal names of the given types.
+     */
+    private static String[] getInternalNames(final Type[] types) {
+        if (types == null) {
+            return null;
+        }
+        String[] names = new String[types.length];
+        for (int i = 0; i < names.length; ++i) {
+            names[i] = types[i].getInternalName();
+        }
+        return names;
+    }
+
+    // ------------------------------------------------------------------------
+    // Instructions to push constants on the stack
+    // ------------------------------------------------------------------------
+
+    /**
+     * Generates the instruction to push the given value on the stack.
+     * 
+     * @param value
+     *            the value to be pushed on the stack.
+     */
+    public void push(final boolean value) {
+        push(value ? 1 : 0);
+    }
+
+    /**
+     * Generates the instruction to push the given value on the stack.
+     * 
+     * @param value
+     *            the value to be pushed on the stack.
+     */
+    public void push(final int value) {
+        if (value >= -1 && value <= 5) {
+            mv.visitInsn(Opcodes.ICONST_0 + value);
+        } else if (value >= Byte.MIN_VALUE && value <= Byte.MAX_VALUE) {
+            mv.visitIntInsn(Opcodes.BIPUSH, value);
+        } else if (value >= Short.MIN_VALUE && value <= Short.MAX_VALUE) {
+            mv.visitIntInsn(Opcodes.SIPUSH, value);
+        } else {
+            mv.visitLdcInsn(new Integer(value));
+        }
+    }
+
+    /**
+     * Generates the instruction to push the given value on the stack.
+     * 
+     * @param value
+     *            the value to be pushed on the stack.
+     */
+    public void push(final long value) {
+        if (value == 0L || value == 1L) {
+            mv.visitInsn(Opcodes.LCONST_0 + (int) value);
+        } else {
+            mv.visitLdcInsn(new Long(value));
+        }
+    }
+
+    /**
+     * Generates the instruction to push the given value on the stack.
+     * 
+     * @param value
+     *            the value to be pushed on the stack.
+     */
+    public void push(final float value) {
+        int bits = Float.floatToIntBits(value);
+        if (bits == 0L || bits == 0x3f800000 || bits == 0x40000000) { // 0..2
+            mv.visitInsn(Opcodes.FCONST_0 + (int) value);
+        } else {
+            mv.visitLdcInsn(new Float(value));
+        }
+    }
+
+    /**
+     * Generates the instruction to push the given value on the stack.
+     * 
+     * @param value
+     *            the value to be pushed on the stack.
+     */
+    public void push(final double value) {
+        long bits = Double.doubleToLongBits(value);
+        if (bits == 0L || bits == 0x3ff0000000000000L) { // +0.0d and 1.0d
+            mv.visitInsn(Opcodes.DCONST_0 + (int) value);
+        } else {
+            mv.visitLdcInsn(new Double(value));
+        }
+    }
+
+    /**
+     * Generates the instruction to push the given value on the stack.
+     * 
+     * @param value
+     *            the value to be pushed on the stack. May be <tt>null</tt>.
+     */
+    public void push(final String value) {
+        if (value == null) {
+            mv.visitInsn(Opcodes.ACONST_NULL);
+        } else {
+            mv.visitLdcInsn(value);
+        }
+    }
+
+    /**
+     * Generates the instruction to push the given value on the stack.
+     * 
+     * @param value
+     *            the value to be pushed on the stack.
+     */
+    public void push(final Type value) {
+        if (value == null) {
+            mv.visitInsn(Opcodes.ACONST_NULL);
+        } else {
+            switch (value.getSort()) {
+            case Type.BOOLEAN:
+                mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Boolean",
+                        "TYPE", CLDESC);
+                break;
+            case Type.CHAR:
+                mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Character",
+                        "TYPE", CLDESC);
+                break;
+            case Type.BYTE:
+                mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Byte", "TYPE",
+                        CLDESC);
+                break;
+            case Type.SHORT:
+                mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Short", "TYPE",
+                        CLDESC);
+                break;
+            case Type.INT:
+                mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Integer",
+                        "TYPE", CLDESC);
+                break;
+            case Type.FLOAT:
+                mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Float", "TYPE",
+                        CLDESC);
+                break;
+            case Type.LONG:
+                mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Long", "TYPE",
+                        CLDESC);
+                break;
+            case Type.DOUBLE:
+                mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Double",
+                        "TYPE", CLDESC);
+                break;
+            default:
+                mv.visitLdcInsn(value);
+            }
+        }
+    }
+
+    /**
+     * Generates the instruction to push a handle on the stack.
+     * 
+     * @param handle
+     *            the handle to be pushed on the stack.
+     */
+    public void push(final Handle handle) {
+        mv.visitLdcInsn(handle);
+    }
+
+    // ------------------------------------------------------------------------
+    // Instructions to load and store method arguments
+    // ------------------------------------------------------------------------
+
+    /**
+     * Returns the index of the given method argument in the frame's local
+     * variables array.
+     * 
+     * @param arg
+     *            the index of a method argument.
+     * @return the index of the given method argument in the frame's local
+     *         variables array.
+     */
+    private int getArgIndex(final int arg) {
+        int index = (access & Opcodes.ACC_STATIC) == 0 ? 1 : 0;
+        for (int i = 0; i < arg; i++) {
+            index += argumentTypes[i].getSize();
+        }
+        return index;
+    }
+
+    /**
+     * Generates the instruction to push a local variable on the stack.
+     * 
+     * @param type
+     *            the type of the local variable to be loaded.
+     * @param index
+     *            an index in the frame's local variables array.
+     */
+    private void loadInsn(final Type type, final int index) {
+        mv.visitVarInsn(type.getOpcode(Opcodes.ILOAD), index);
+    }
+
+    /**
+     * Generates the instruction to store the top stack value in a local
+     * variable.
+     * 
+     * @param type
+     *            the type of the local variable to be stored.
+     * @param index
+     *            an index in the frame's local variables array.
+     */
+    private void storeInsn(final Type type, final int index) {
+        mv.visitVarInsn(type.getOpcode(Opcodes.ISTORE), index);
+    }
+
+    /**
+     * Generates the instruction to load 'this' on the stack.
+     */
+    public void loadThis() {
+        if ((access & Opcodes.ACC_STATIC) != 0) {
+            throw new IllegalStateException(
+                    "no 'this' pointer within static method");
+        }
+        mv.visitVarInsn(Opcodes.ALOAD, 0);
+    }
+
+    /**
+     * Generates the instruction to load the given method argument on the stack.
+     * 
+     * @param arg
+     *            the index of a method argument.
+     */
+    public void loadArg(final int arg) {
+        loadInsn(argumentTypes[arg], getArgIndex(arg));
+    }
+
+    /**
+     * Generates the instructions to load the given method arguments on the
+     * stack.
+     * 
+     * @param arg
+     *            the index of the first method argument to be loaded.
+     * @param count
+     *            the number of method arguments to be loaded.
+     */
+    public void loadArgs(final int arg, final int count) {
+        int index = getArgIndex(arg);
+        for (int i = 0; i < count; ++i) {
+            Type t = argumentTypes[arg + i];
+            loadInsn(t, index);
+            index += t.getSize();
+        }
+    }
+
+    /**
+     * Generates the instructions to load all the method arguments on the stack.
+     */
+    public void loadArgs() {
+        loadArgs(0, argumentTypes.length);
+    }
+
+    /**
+     * Generates the instructions to load all the method arguments on the stack,
+     * as a single object array.
+     */
+    public void loadArgArray() {
+        push(argumentTypes.length);
+        newArray(OBJECT_TYPE);
+        for (int i = 0; i < argumentTypes.length; i++) {
+            dup();
+            push(i);
+            loadArg(i);
+            box(argumentTypes[i]);
+            arrayStore(OBJECT_TYPE);
+        }
+    }
+
+    /**
+     * Generates the instruction to store the top stack value in the given
+     * method argument.
+     * 
+     * @param arg
+     *            the index of a method argument.
+     */
+    public void storeArg(final int arg) {
+        storeInsn(argumentTypes[arg], getArgIndex(arg));
+    }
+
+    // ------------------------------------------------------------------------
+    // Instructions to load and store local variables
+    // ------------------------------------------------------------------------
+
+    /**
+     * Returns the type of the given local variable.
+     * 
+     * @param local
+     *            a local variable identifier, as returned by
+     *            {@link LocalVariablesSorter#newLocal(Type) newLocal()}.
+     * @return the type of the given local variable.
+     */
+    public Type getLocalType(final int local) {
+        return localTypes.get(local - firstLocal);
+    }
+
+    @Override
+    protected void setLocalType(final int local, final Type type) {
+        int index = local - firstLocal;
+        while (localTypes.size() < index + 1) {
+            localTypes.add(null);
+        }
+        localTypes.set(index, type);
+    }
+
+    /**
+     * Generates the instruction to load the given local variable on the stack.
+     * 
+     * @param local
+     *            a local variable identifier, as returned by
+     *            {@link LocalVariablesSorter#newLocal(Type) newLocal()}.
+     */
+    public void loadLocal(final int local) {
+        loadInsn(getLocalType(local), local);
+    }
+
+    /**
+     * Generates the instruction to load the given local variable on the stack.
+     * 
+     * @param local
+     *            a local variable identifier, as returned by
+     *            {@link LocalVariablesSorter#newLocal(Type) newLocal()}.
+     * @param type
+     *            the type of this local variable.
+     */
+    public void loadLocal(final int local, final Type type) {
+        setLocalType(local, type);
+        loadInsn(type, local);
+    }
+
+    /**
+     * Generates the instruction to store the top stack value in the given local
+     * variable.
+     * 
+     * @param local
+     *            a local variable identifier, as returned by
+     *            {@link LocalVariablesSorter#newLocal(Type) newLocal()}.
+     */
+    public void storeLocal(final int local) {
+        storeInsn(getLocalType(local), local);
+    }
+
+    /**
+     * Generates the instruction to store the top stack value in the given local
+     * variable.
+     * 
+     * @param local
+     *            a local variable identifier, as returned by
+     *            {@link LocalVariablesSorter#newLocal(Type) newLocal()}.
+     * @param type
+     *            the type of this local variable.
+     */
+    public void storeLocal(final int local, final Type type) {
+        setLocalType(local, type);
+        storeInsn(type, local);
+    }
+
+    /**
+     * Generates the instruction to load an element from an array.
+     * 
+     * @param type
+     *            the type of the array element to be loaded.
+     */
+    public void arrayLoad(final Type type) {
+        mv.visitInsn(type.getOpcode(Opcodes.IALOAD));
+    }
+
+    /**
+     * Generates the instruction to store an element in an array.
+     * 
+     * @param type
+     *            the type of the array element to be stored.
+     */
+    public void arrayStore(final Type type) {
+        mv.visitInsn(type.getOpcode(Opcodes.IASTORE));
+    }
+
+    // ------------------------------------------------------------------------
+    // Instructions to manage the stack
+    // ------------------------------------------------------------------------
+
+    /**
+     * Generates a POP instruction.
+     */
+    public void pop() {
+        mv.visitInsn(Opcodes.POP);
+    }
+
+    /**
+     * Generates a POP2 instruction.
+     */
+    public void pop2() {
+        mv.visitInsn(Opcodes.POP2);
+    }
+
+    /**
+     * Generates a DUP instruction.
+     */
+    public void dup() {
+        mv.visitInsn(Opcodes.DUP);
+    }
+
+    /**
+     * Generates a DUP2 instruction.
+     */
+    public void dup2() {
+        mv.visitInsn(Opcodes.DUP2);
+    }
+
+    /**
+     * Generates a DUP_X1 instruction.
+     */
+    public void dupX1() {
+        mv.visitInsn(Opcodes.DUP_X1);
+    }
+
+    /**
+     * Generates a DUP_X2 instruction.
+     */
+    public void dupX2() {
+        mv.visitInsn(Opcodes.DUP_X2);
+    }
+
+    /**
+     * Generates a DUP2_X1 instruction.
+     */
+    public void dup2X1() {
+        mv.visitInsn(Opcodes.DUP2_X1);
+    }
+
+    /**
+     * Generates a DUP2_X2 instruction.
+     */
+    public void dup2X2() {
+        mv.visitInsn(Opcodes.DUP2_X2);
+    }
+
+    /**
+     * Generates a SWAP instruction.
+     */
+    public void swap() {
+        mv.visitInsn(Opcodes.SWAP);
+    }
+
+    /**
+     * Generates the instructions to swap the top two stack values.
+     * 
+     * @param prev
+     *            type of the top - 1 stack value.
+     * @param type
+     *            type of the top stack value.
+     */
+    public void swap(final Type prev, final Type type) {
+        if (type.getSize() == 1) {
+            if (prev.getSize() == 1) {
+                swap(); // same as dupX1(), pop();
+            } else {
+                dupX2();
+                pop();
+            }
+        } else {
+            if (prev.getSize() == 1) {
+                dup2X1();
+                pop2();
+            } else {
+                dup2X2();
+                pop2();
+            }
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // Instructions to do mathematical and logical operations
+    // ------------------------------------------------------------------------
+
+    /**
+     * Generates the instruction to do the specified mathematical or logical
+     * operation.
+     * 
+     * @param op
+     *            a mathematical or logical operation. Must be one of ADD, SUB,
+     *            MUL, DIV, REM, NEG, SHL, SHR, USHR, AND, OR, XOR.
+     * @param type
+     *            the type of the operand(s) for this operation.
+     */
+    public void math(final int op, final Type type) {
+        mv.visitInsn(type.getOpcode(op));
+    }
+
+    /**
+     * Generates the instructions to compute the bitwise negation of the top
+     * stack value.
+     */
+    public void not() {
+        mv.visitInsn(Opcodes.ICONST_1);
+        mv.visitInsn(Opcodes.IXOR);
+    }
+
+    /**
+     * Generates the instruction to increment the given local variable.
+     * 
+     * @param local
+     *            the local variable to be incremented.
+     * @param amount
+     *            the amount by which the local variable must be incremented.
+     */
+    public void iinc(final int local, final int amount) {
+        mv.visitIincInsn(local, amount);
+    }
+
+    /**
+     * Generates the instructions to cast a numerical value from one type to
+     * another.
+     * 
+     * @param from
+     *            the type of the top stack value
+     * @param to
+     *            the type into which this value must be cast.
+     */
+    public void cast(final Type from, final Type to) {
+        if (from != to) {
+            if (from == Type.DOUBLE_TYPE) {
+                if (to == Type.FLOAT_TYPE) {
+                    mv.visitInsn(Opcodes.D2F);
+                } else if (to == Type.LONG_TYPE) {
+                    mv.visitInsn(Opcodes.D2L);
+                } else {
+                    mv.visitInsn(Opcodes.D2I);
+                    cast(Type.INT_TYPE, to);
+                }
+            } else if (from == Type.FLOAT_TYPE) {
+                if (to == Type.DOUBLE_TYPE) {
+                    mv.visitInsn(Opcodes.F2D);
+                } else if (to == Type.LONG_TYPE) {
+                    mv.visitInsn(Opcodes.F2L);
+                } else {
+                    mv.visitInsn(Opcodes.F2I);
+                    cast(Type.INT_TYPE, to);
+                }
+            } else if (from == Type.LONG_TYPE) {
+                if (to == Type.DOUBLE_TYPE) {
+                    mv.visitInsn(Opcodes.L2D);
+                } else if (to == Type.FLOAT_TYPE) {
+                    mv.visitInsn(Opcodes.L2F);
+                } else {
+                    mv.visitInsn(Opcodes.L2I);
+                    cast(Type.INT_TYPE, to);
+                }
+            } else {
+                if (to == Type.BYTE_TYPE) {
+                    mv.visitInsn(Opcodes.I2B);
+                } else if (to == Type.CHAR_TYPE) {
+                    mv.visitInsn(Opcodes.I2C);
+                } else if (to == Type.DOUBLE_TYPE) {
+                    mv.visitInsn(Opcodes.I2D);
+                } else if (to == Type.FLOAT_TYPE) {
+                    mv.visitInsn(Opcodes.I2F);
+                } else if (to == Type.LONG_TYPE) {
+                    mv.visitInsn(Opcodes.I2L);
+                } else if (to == Type.SHORT_TYPE) {
+                    mv.visitInsn(Opcodes.I2S);
+                }
+            }
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // Instructions to do boxing and unboxing operations
+    // ------------------------------------------------------------------------
+
+    private static Type getBoxedType(final Type type) {
+        switch (type.getSort()) {
+        case Type.BYTE:
+            return BYTE_TYPE;
+        case Type.BOOLEAN:
+            return BOOLEAN_TYPE;
+        case Type.SHORT:
+            return SHORT_TYPE;
+        case Type.CHAR:
+            return CHARACTER_TYPE;
+        case Type.INT:
+            return INTEGER_TYPE;
+        case Type.FLOAT:
+            return FLOAT_TYPE;
+        case Type.LONG:
+            return LONG_TYPE;
+        case Type.DOUBLE:
+            return DOUBLE_TYPE;
+        }
+        return type;
+    }
+
+    /**
+     * Generates the instructions to box the top stack value. This value is
+     * replaced by its boxed equivalent on top of the stack.
+     * 
+     * @param type
+     *            the type of the top stack value.
+     */
+    public void box(final Type type) {
+        if (type.getSort() == Type.OBJECT || type.getSort() == Type.ARRAY) {
+            return;
+        }
+        if (type == Type.VOID_TYPE) {
+            push((String) null);
+        } else {
+            Type boxed = getBoxedType(type);
+            newInstance(boxed);
+            if (type.getSize() == 2) {
+                // Pp -> Ppo -> oPpo -> ooPpo -> ooPp -> o
+                dupX2();
+                dupX2();
+                pop();
+            } else {
+                // p -> po -> opo -> oop -> o
+                dupX1();
+                swap();
+            }
+            invokeConstructor(boxed, new Method("<init>", Type.VOID_TYPE,
+                    new Type[] { type }));
+        }
+    }
+
+    /**
+     * Generates the instructions to box the top stack value using Java 5's
+     * valueOf() method. This value is replaced by its boxed equivalent on top
+     * of the stack.
+     * 
+     * @param type
+     *            the type of the top stack value.
+     */
+    public void valueOf(final Type type) {
+        if (type.getSort() == Type.OBJECT || type.getSort() == Type.ARRAY) {
+            return;
+        }
+        if (type == Type.VOID_TYPE) {
+            push((String) null);
+        } else {
+            Type boxed = getBoxedType(type);
+            invokeStatic(boxed, new Method("valueOf", boxed,
+                    new Type[] { type }));
+        }
+    }
+
+    /**
+     * Generates the instructions to unbox the top stack value. This value is
+     * replaced by its unboxed equivalent on top of the stack.
+     * 
+     * @param type
+     *            the type of the top stack value.
+     */
+    public void unbox(final Type type) {
+        Type t = NUMBER_TYPE;
+        Method sig = null;
+        switch (type.getSort()) {
+        case Type.VOID:
+            return;
+        case Type.CHAR:
+            t = CHARACTER_TYPE;
+            sig = CHAR_VALUE;
+            break;
+        case Type.BOOLEAN:
+            t = BOOLEAN_TYPE;
+            sig = BOOLEAN_VALUE;
+            break;
+        case Type.DOUBLE:
+            sig = DOUBLE_VALUE;
+            break;
+        case Type.FLOAT:
+            sig = FLOAT_VALUE;
+            break;
+        case Type.LONG:
+            sig = LONG_VALUE;
+            break;
+        case Type.INT:
+        case Type.SHORT:
+        case Type.BYTE:
+            sig = INT_VALUE;
+        }
+        if (sig == null) {
+            checkCast(type);
+        } else {
+            checkCast(t);
+            invokeVirtual(t, sig);
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // Instructions to jump to other instructions
+    // ------------------------------------------------------------------------
+
+    /**
+     * Creates a new {@link Label}.
+     * 
+     * @return a new {@link Label}.
+     */
+    public Label newLabel() {
+        return new Label();
+    }
+
+    /**
+     * Marks the current code position with the given label.
+     * 
+     * @param label
+     *            a label.
+     */
+    public void mark(final Label label) {
+        mv.visitLabel(label);
+    }
+
+    /**
+     * Marks the current code position with a new label.
+     * 
+     * @return the label that was created to mark the current code position.
+     */
+    public Label mark() {
+        Label label = new Label();
+        mv.visitLabel(label);
+        return label;
+    }
+
+    /**
+     * Generates the instructions to jump to a label based on the comparison of
+     * the top two stack values.
+     * 
+     * @param type
+     *            the type of the top two stack values.
+     * @param mode
+     *            how these values must be compared. One of EQ, NE, LT, GE, GT,
+     *            LE.
+     * @param label
+     *            where to jump if the comparison result is <tt>true</tt>.
+     */
+    public void ifCmp(final Type type, final int mode, final Label label) {
+        switch (type.getSort()) {
+        case Type.LONG:
+            mv.visitInsn(Opcodes.LCMP);
+            break;
+        case Type.DOUBLE:
+            mv.visitInsn(mode == GE || mode == GT ? Opcodes.DCMPL
+                    : Opcodes.DCMPG);
+            break;
+        case Type.FLOAT:
+            mv.visitInsn(mode == GE || mode == GT ? Opcodes.FCMPL
+                    : Opcodes.FCMPG);
+            break;
+        case Type.ARRAY:
+        case Type.OBJECT:
+            switch (mode) {
+            case EQ:
+                mv.visitJumpInsn(Opcodes.IF_ACMPEQ, label);
+                return;
+            case NE:
+                mv.visitJumpInsn(Opcodes.IF_ACMPNE, label);
+                return;
+            }
+            throw new IllegalArgumentException("Bad comparison for type "
+                    + type);
+        default:
+            int intOp = -1;
+            switch (mode) {
+            case EQ:
+                intOp = Opcodes.IF_ICMPEQ;
+                break;
+            case NE:
+                intOp = Opcodes.IF_ICMPNE;
+                break;
+            case GE:
+                intOp = Opcodes.IF_ICMPGE;
+                break;
+            case LT:
+                intOp = Opcodes.IF_ICMPLT;
+                break;
+            case LE:
+                intOp = Opcodes.IF_ICMPLE;
+                break;
+            case GT:
+                intOp = Opcodes.IF_ICMPGT;
+                break;
+            }
+            mv.visitJumpInsn(intOp, label);
+            return;
+        }
+        mv.visitJumpInsn(mode, label);
+    }
+
+    /**
+     * Generates the instructions to jump to a label based on the comparison of
+     * the top two integer stack values.
+     * 
+     * @param mode
+     *            how these values must be compared. One of EQ, NE, LT, GE, GT,
+     *            LE.
+     * @param label
+     *            where to jump if the comparison result is <tt>true</tt>.
+     */
+    public void ifICmp(final int mode, final Label label) {
+        ifCmp(Type.INT_TYPE, mode, label);
+    }
+
+    /**
+     * Generates the instructions to jump to a label based on the comparison of
+     * the top integer stack value with zero.
+     * 
+     * @param mode
+     *            how these values must be compared. One of EQ, NE, LT, GE, GT,
+     *            LE.
+     * @param label
+     *            where to jump if the comparison result is <tt>true</tt>.
+     */
+    public void ifZCmp(final int mode, final Label label) {
+        mv.visitJumpInsn(mode, label);
+    }
+
+    /**
+     * Generates the instruction to jump to the given label if the top stack
+     * value is null.
+     * 
+     * @param label
+     *            where to jump if the condition is <tt>true</tt>.
+     */
+    public void ifNull(final Label label) {
+        mv.visitJumpInsn(Opcodes.IFNULL, label);
+    }
+
+    /**
+     * Generates the instruction to jump to the given label if the top stack
+     * value is not null.
+     * 
+     * @param label
+     *            where to jump if the condition is <tt>true</tt>.
+     */
+    public void ifNonNull(final Label label) {
+        mv.visitJumpInsn(Opcodes.IFNONNULL, label);
+    }
+
+    /**
+     * Generates the instruction to jump to the given label.
+     * 
+     * @param label
+     *            where to jump if the condition is <tt>true</tt>.
+     */
+    public void goTo(final Label label) {
+        mv.visitJumpInsn(Opcodes.GOTO, label);
+    }
+
+    /**
+     * Generates a RET instruction.
+     * 
+     * @param local
+     *            a local variable identifier, as returned by
+     *            {@link LocalVariablesSorter#newLocal(Type) newLocal()}.
+     */
+    public void ret(final int local) {
+        mv.visitVarInsn(Opcodes.RET, local);
+    }
+
+    /**
+     * Generates the instructions for a switch statement.
+     * 
+     * @param keys
+     *            the switch case keys.
+     * @param generator
+     *            a generator to generate the code for the switch cases.
+     */
+    public void tableSwitch(final int[] keys,
+            final TableSwitchGenerator generator) {
+        float density;
+        if (keys.length == 0) {
+            density = 0;
+        } else {
+            density = (float) keys.length
+                    / (keys[keys.length - 1] - keys[0] + 1);
+        }
+        tableSwitch(keys, generator, density >= 0.5f);
+    }
+
+    /**
+     * Generates the instructions for a switch statement.
+     * 
+     * @param keys
+     *            the switch case keys.
+     * @param generator
+     *            a generator to generate the code for the switch cases.
+     * @param useTable
+     *            <tt>true</tt> to use a TABLESWITCH instruction, or
+     *            <tt>false</tt> to use a LOOKUPSWITCH instruction.
+     */
+    public void tableSwitch(final int[] keys,
+            final TableSwitchGenerator generator, final boolean useTable) {
+        for (int i = 1; i < keys.length; ++i) {
+            if (keys[i] < keys[i - 1]) {
+                throw new IllegalArgumentException(
+                        "keys must be sorted ascending");
+            }
+        }
+        Label def = newLabel();
+        Label end = newLabel();
+        if (keys.length > 0) {
+            int len = keys.length;
+            int min = keys[0];
+            int max = keys[len - 1];
+            int range = max - min + 1;
+            if (useTable) {
+                Label[] labels = new Label[range];
+                Arrays.fill(labels, def);
+                for (int i = 0; i < len; ++i) {
+                    labels[keys[i] - min] = newLabel();
+                }
+                mv.visitTableSwitchInsn(min, max, def, labels);
+                for (int i = 0; i < range; ++i) {
+                    Label label = labels[i];
+                    if (label != def) {
+                        mark(label);
+                        generator.generateCase(i + min, end);
+                    }
+                }
+            } else {
+                Label[] labels = new Label[len];
+                for (int i = 0; i < len; ++i) {
+                    labels[i] = newLabel();
+                }
+                mv.visitLookupSwitchInsn(def, keys, labels);
+                for (int i = 0; i < len; ++i) {
+                    mark(labels[i]);
+                    generator.generateCase(keys[i], end);
+                }
+            }
+        }
+        mark(def);
+        generator.generateDefault();
+        mark(end);
+    }
+
+    /**
+     * Generates the instruction to return the top stack value to the caller.
+     */
+    public void returnValue() {
+        mv.visitInsn(returnType.getOpcode(Opcodes.IRETURN));
+    }
+
+    // ------------------------------------------------------------------------
+    // Instructions to load and store fields
+    // ------------------------------------------------------------------------
+
+    /**
+     * Generates a get field or set field instruction.
+     * 
+     * @param opcode
+     *            the instruction's opcode.
+     * @param ownerType
+     *            the class in which the field is defined.
+     * @param name
+     *            the name of the field.
+     * @param fieldType
+     *            the type of the field.
+     */
+    private void fieldInsn(final int opcode, final Type ownerType,
+            final String name, final Type fieldType) {
+        mv.visitFieldInsn(opcode, ownerType.getInternalName(), name,
+                fieldType.getDescriptor());
+    }
+
+    /**
+     * Generates the instruction to push the value of a static field on the
+     * stack.
+     * 
+     * @param owner
+     *            the class in which the field is defined.
+     * @param name
+     *            the name of the field.
+     * @param type
+     *            the type of the field.
+     */
+    public void getStatic(final Type owner, final String name, final Type type) {
+        fieldInsn(Opcodes.GETSTATIC, owner, name, type);
+    }
+
+    /**
+     * Generates the instruction to store the top stack value in a static field.
+     * 
+     * @param owner
+     *            the class in which the field is defined.
+     * @param name
+     *            the name of the field.
+     * @param type
+     *            the type of the field.
+     */
+    public void putStatic(final Type owner, final String name, final Type type) {
+        fieldInsn(Opcodes.PUTSTATIC, owner, name, type);
+    }
+
+    /**
+     * Generates the instruction to push the value of a non static field on the
+     * stack.
+     * 
+     * @param owner
+     *            the class in which the field is defined.
+     * @param name
+     *            the name of the field.
+     * @param type
+     *            the type of the field.
+     */
+    public void getField(final Type owner, final String name, final Type type) {
+        fieldInsn(Opcodes.GETFIELD, owner, name, type);
+    }
+
+    /**
+     * Generates the instruction to store the top stack value in a non static
+     * field.
+     * 
+     * @param owner
+     *            the class in which the field is defined.
+     * @param name
+     *            the name of the field.
+     * @param type
+     *            the type of the field.
+     */
+    public void putField(final Type owner, final String name, final Type type) {
+        fieldInsn(Opcodes.PUTFIELD, owner, name, type);
+    }
+
+    // ------------------------------------------------------------------------
+    // Instructions to invoke methods
+    // ------------------------------------------------------------------------
+
+    /**
+     * Generates an invoke method instruction.
+     * 
+     * @param opcode
+     *            the instruction's opcode.
+     * @param type
+     *            the class in which the method is defined.
+     * @param method
+     *            the method to be invoked.
+     */
+    private void invokeInsn(final int opcode, final Type type,
+            final Method method) {
+        String owner = type.getSort() == Type.ARRAY ? type.getDescriptor()
+                : type.getInternalName();
+        mv.visitMethodInsn(opcode, owner, method.getName(),
+                method.getDescriptor());
+    }
+
+    /**
+     * Generates the instruction to invoke a normal method.
+     * 
+     * @param owner
+     *            the class in which the method is defined.
+     * @param method
+     *            the method to be invoked.
+     */
+    public void invokeVirtual(final Type owner, final Method method) {
+        invokeInsn(Opcodes.INVOKEVIRTUAL, owner, method);
+    }
+
+    /**
+     * Generates the instruction to invoke a constructor.
+     * 
+     * @param type
+     *            the class in which the constructor is defined.
+     * @param method
+     *            the constructor to be invoked.
+     */
+    public void invokeConstructor(final Type type, final Method method) {
+        invokeInsn(Opcodes.INVOKESPECIAL, type, method);
+    }
+
+    /**
+     * Generates the instruction to invoke a static method.
+     * 
+     * @param owner
+     *            the class in which the method is defined.
+     * @param method
+     *            the method to be invoked.
+     */
+    public void invokeStatic(final Type owner, final Method method) {
+        invokeInsn(Opcodes.INVOKESTATIC, owner, method);
+    }
+
+    /**
+     * Generates the instruction to invoke an interface method.
+     * 
+     * @param owner
+     *            the class in which the method is defined.
+     * @param method
+     *            the method to be invoked.
+     */
+    public void invokeInterface(final Type owner, final Method method) {
+        invokeInsn(Opcodes.INVOKEINTERFACE, owner, method);
+    }
+
+    /**
+     * Generates an invokedynamic instruction.
+     * 
+     * @param name
+     *            the method's name.
+     * @param desc
+     *            the method's descriptor (see {@link Type Type}).
+     * @param bsm
+     *            the bootstrap method.
+     * @param bsmArgs
+     *            the bootstrap method constant arguments. Each argument must be
+     *            an {@link Integer}, {@link Float}, {@link Long},
+     *            {@link Double}, {@link String}, {@link Type} or {@link Handle}
+     *            value. This method is allowed to modify the content of the
+     *            array so a caller should expect that this array may change.
+     */
+    public void invokeDynamic(String name, String desc, Handle bsm,
+            Object... bsmArgs) {
+        mv.visitInvokeDynamicInsn(name, desc, bsm, bsmArgs);
+    }
+
+    // ------------------------------------------------------------------------
+    // Instructions to create objects and arrays
+    // ------------------------------------------------------------------------
+
+    /**
+     * Generates a type dependent instruction.
+     * 
+     * @param opcode
+     *            the instruction's opcode.
+     * @param type
+     *            the instruction's operand.
+     */
+    private void typeInsn(final int opcode, final Type type) {
+        mv.visitTypeInsn(opcode, type.getInternalName());
+    }
+
+    /**
+     * Generates the instruction to create a new object.
+     * 
+     * @param type
+     *            the class of the object to be created.
+     */
+    public void newInstance(final Type type) {
+        typeInsn(Opcodes.NEW, type);
+    }
+
+    /**
+     * Generates the instruction to create a new array.
+     * 
+     * @param type
+     *            the type of the array elements.
+     */
+    public void newArray(final Type type) {
+        int typ;
+        switch (type.getSort()) {
+        case Type.BOOLEAN:
+            typ = Opcodes.T_BOOLEAN;
+            break;
+        case Type.CHAR:
+            typ = Opcodes.T_CHAR;
+            break;
+        case Type.BYTE:
+            typ = Opcodes.T_BYTE;
+            break;
+        case Type.SHORT:
+            typ = Opcodes.T_SHORT;
+            break;
+        case Type.INT:
+            typ = Opcodes.T_INT;
+            break;
+        case Type.FLOAT:
+            typ = Opcodes.T_FLOAT;
+            break;
+        case Type.LONG:
+            typ = Opcodes.T_LONG;
+            break;
+        case Type.DOUBLE:
+            typ = Opcodes.T_DOUBLE;
+            break;
+        default:
+            typeInsn(Opcodes.ANEWARRAY, type);
+            return;
+        }
+        mv.visitIntInsn(Opcodes.NEWARRAY, typ);
+    }
+
+    // ------------------------------------------------------------------------
+    // Miscelaneous instructions
+    // ------------------------------------------------------------------------
+
+    /**
+     * Generates the instruction to compute the length of an array.
+     */
+    public void arrayLength() {
+        mv.visitInsn(Opcodes.ARRAYLENGTH);
+    }
+
+    /**
+     * Generates the instruction to throw an exception.
+     */
+    public void throwException() {
+        mv.visitInsn(Opcodes.ATHROW);
+    }
+
+    /**
+     * Generates the instructions to create and throw an exception. The
+     * exception class must have a constructor with a single String argument.
+     * 
+     * @param type
+     *            the class of the exception to be thrown.
+     * @param msg
+     *            the detailed message of the exception.
+     */
+    public void throwException(final Type type, final String msg) {
+        newInstance(type);
+        dup();
+        push(msg);
+        invokeConstructor(type, Method.getMethod("void <init> (String)"));
+        throwException();
+    }
+
+    /**
+     * Generates the instruction to check that the top stack value is of the
+     * given type.
+     * 
+     * @param type
+     *            a class or interface type.
+     */
+    public void checkCast(final Type type) {
+        if (!type.equals(OBJECT_TYPE)) {
+            typeInsn(Opcodes.CHECKCAST, type);
+        }
+    }
+
+    /**
+     * Generates the instruction to test if the top stack value is of the given
+     * type.
+     * 
+     * @param type
+     *            a class or interface type.
+     */
+    public void instanceOf(final Type type) {
+        typeInsn(Opcodes.INSTANCEOF, type);
+    }
+
+    /**
+     * Generates the instruction to get the monitor of the top stack value.
+     */
+    public void monitorEnter() {
+        mv.visitInsn(Opcodes.MONITORENTER);
+    }
+
+    /**
+     * Generates the instruction to release the monitor of the top stack value.
+     */
+    public void monitorExit() {
+        mv.visitInsn(Opcodes.MONITOREXIT);
+    }
+
+    // ------------------------------------------------------------------------
+    // Non instructions
+    // ------------------------------------------------------------------------
+
+    /**
+     * Marks the end of the visited method.
+     */
+    public void endMethod() {
+        if ((access & Opcodes.ACC_ABSTRACT) == 0) {
+            mv.visitMaxs(0, 0);
+        }
+        mv.visitEnd();
+    }
+
+    /**
+     * Marks the start of an exception handler.
+     * 
+     * @param start
+     *            beginning of the exception handler's scope (inclusive).
+     * @param end
+     *            end of the exception handler's scope (exclusive).
+     * @param exception
+     *            internal name of the type of exceptions handled by the
+     *            handler.
+     */
+    public void catchException(final Label start, final Label end,
+            final Type exception) {
+        if (exception == null) {
+            mv.visitTryCatchBlock(start, end, mark(), null);
+        } else {
+            mv.visitTryCatchBlock(start, end, mark(),
+                    exception.getInternalName());
+        }
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/commons/InstructionAdapter.java b/src/main/asm/org/objectweb/asm/commons/InstructionAdapter.java
new file mode 100644
index 0000000..1f4c5a5
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/commons/InstructionAdapter.java
@@ -0,0 +1,1090 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.objectweb.asm.commons;
+
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+
+/**
+ * A {@link MethodVisitor} providing a more detailed API to generate and
+ * transform instructions.
+ * 
+ * @author Eric Bruneton
+ */
+public class InstructionAdapter extends MethodVisitor {
+
+    public final static Type OBJECT_TYPE = Type.getType("Ljava/lang/Object;");
+
+    /**
+     * Creates a new {@link InstructionAdapter}. <i>Subclasses must not use this
+     * constructor</i>. Instead, they must use the
+     * {@link #InstructionAdapter(int, MethodVisitor)} version.
+     * 
+     * @param mv
+     *            the method visitor to which this adapter delegates calls.
+     */
+    public InstructionAdapter(final MethodVisitor mv) {
+        this(Opcodes.ASM4, mv);
+    }
+
+    /**
+     * Creates a new {@link InstructionAdapter}.
+     * 
+     * @param api
+     *            the ASM API version implemented by this visitor. Must be one
+     *            of {@link Opcodes#ASM4}.
+     * @param mv
+     *            the method visitor to which this adapter delegates calls.
+     */
+    protected InstructionAdapter(final int api, final MethodVisitor mv) {
+        super(api, mv);
+    }
+
+    @Override
+    public void visitInsn(final int opcode) {
+        switch (opcode) {
+        case Opcodes.NOP:
+            nop();
+            break;
+        case Opcodes.ACONST_NULL:
+            aconst(null);
+            break;
+        case Opcodes.ICONST_M1:
+        case Opcodes.ICONST_0:
+        case Opcodes.ICONST_1:
+        case Opcodes.ICONST_2:
+        case Opcodes.ICONST_3:
+        case Opcodes.ICONST_4:
+        case Opcodes.ICONST_5:
+            iconst(opcode - Opcodes.ICONST_0);
+            break;
+        case Opcodes.LCONST_0:
+        case Opcodes.LCONST_1:
+            lconst(opcode - Opcodes.LCONST_0);
+            break;
+        case Opcodes.FCONST_0:
+        case Opcodes.FCONST_1:
+        case Opcodes.FCONST_2:
+            fconst(opcode - Opcodes.FCONST_0);
+            break;
+        case Opcodes.DCONST_0:
+        case Opcodes.DCONST_1:
+            dconst(opcode - Opcodes.DCONST_0);
+            break;
+        case Opcodes.IALOAD:
+            aload(Type.INT_TYPE);
+            break;
+        case Opcodes.LALOAD:
+            aload(Type.LONG_TYPE);
+            break;
+        case Opcodes.FALOAD:
+            aload(Type.FLOAT_TYPE);
+            break;
+        case Opcodes.DALOAD:
+            aload(Type.DOUBLE_TYPE);
+            break;
+        case Opcodes.AALOAD:
+            aload(OBJECT_TYPE);
+            break;
+        case Opcodes.BALOAD:
+            aload(Type.BYTE_TYPE);
+            break;
+        case Opcodes.CALOAD:
+            aload(Type.CHAR_TYPE);
+            break;
+        case Opcodes.SALOAD:
+            aload(Type.SHORT_TYPE);
+            break;
+        case Opcodes.IASTORE:
+            astore(Type.INT_TYPE);
+            break;
+        case Opcodes.LASTORE:
+            astore(Type.LONG_TYPE);
+            break;
+        case Opcodes.FASTORE:
+            astore(Type.FLOAT_TYPE);
+            break;
+        case Opcodes.DASTORE:
+            astore(Type.DOUBLE_TYPE);
+            break;
+        case Opcodes.AASTORE:
+            astore(OBJECT_TYPE);
+            break;
+        case Opcodes.BASTORE:
+            astore(Type.BYTE_TYPE);
+            break;
+        case Opcodes.CASTORE:
+            astore(Type.CHAR_TYPE);
+            break;
+        case Opcodes.SASTORE:
+            astore(Type.SHORT_TYPE);
+            break;
+        case Opcodes.POP:
+            pop();
+            break;
+        case Opcodes.POP2:
+            pop2();
+            break;
+        case Opcodes.DUP:
+            dup();
+            break;
+        case Opcodes.DUP_X1:
+            dupX1();
+            break;
+        case Opcodes.DUP_X2:
+            dupX2();
+            break;
+        case Opcodes.DUP2:
+            dup2();
+            break;
+        case Opcodes.DUP2_X1:
+            dup2X1();
+            break;
+        case Opcodes.DUP2_X2:
+            dup2X2();
+            break;
+        case Opcodes.SWAP:
+            swap();
+            break;
+        case Opcodes.IADD:
+            add(Type.INT_TYPE);
+            break;
+        case Opcodes.LADD:
+            add(Type.LONG_TYPE);
+            break;
+        case Opcodes.FADD:
+            add(Type.FLOAT_TYPE);
+            break;
+        case Opcodes.DADD:
+            add(Type.DOUBLE_TYPE);
+            break;
+        case Opcodes.ISUB:
+            sub(Type.INT_TYPE);
+            break;
+        case Opcodes.LSUB:
+            sub(Type.LONG_TYPE);
+            break;
+        case Opcodes.FSUB:
+            sub(Type.FLOAT_TYPE);
+            break;
+        case Opcodes.DSUB:
+            sub(Type.DOUBLE_TYPE);
+            break;
+        case Opcodes.IMUL:
+            mul(Type.INT_TYPE);
+            break;
+        case Opcodes.LMUL:
+            mul(Type.LONG_TYPE);
+            break;
+        case Opcodes.FMUL:
+            mul(Type.FLOAT_TYPE);
+            break;
+        case Opcodes.DMUL:
+            mul(Type.DOUBLE_TYPE);
+            break;
+        case Opcodes.IDIV:
+            div(Type.INT_TYPE);
+            break;
+        case Opcodes.LDIV:
+            div(Type.LONG_TYPE);
+            break;
+        case Opcodes.FDIV:
+            div(Type.FLOAT_TYPE);
+            break;
+        case Opcodes.DDIV:
+            div(Type.DOUBLE_TYPE);
+            break;
+        case Opcodes.IREM:
+            rem(Type.INT_TYPE);
+            break;
+        case Opcodes.LREM:
+            rem(Type.LONG_TYPE);
+            break;
+        case Opcodes.FREM:
+            rem(Type.FLOAT_TYPE);
+            break;
+        case Opcodes.DREM:
+            rem(Type.DOUBLE_TYPE);
+            break;
+        case Opcodes.INEG:
+            neg(Type.INT_TYPE);
+            break;
+        case Opcodes.LNEG:
+            neg(Type.LONG_TYPE);
+            break;
+        case Opcodes.FNEG:
+            neg(Type.FLOAT_TYPE);
+            break;
+        case Opcodes.DNEG:
+            neg(Type.DOUBLE_TYPE);
+            break;
+        case Opcodes.ISHL:
+            shl(Type.INT_TYPE);
+            break;
+        case Opcodes.LSHL:
+            shl(Type.LONG_TYPE);
+            break;
+        case Opcodes.ISHR:
+            shr(Type.INT_TYPE);
+            break;
+        case Opcodes.LSHR:
+            shr(Type.LONG_TYPE);
+            break;
+        case Opcodes.IUSHR:
+            ushr(Type.INT_TYPE);
+            break;
+        case Opcodes.LUSHR:
+            ushr(Type.LONG_TYPE);
+            break;
+        case Opcodes.IAND:
+            and(Type.INT_TYPE);
+            break;
+        case Opcodes.LAND:
+            and(Type.LONG_TYPE);
+            break;
+        case Opcodes.IOR:
+            or(Type.INT_TYPE);
+            break;
+        case Opcodes.LOR:
+            or(Type.LONG_TYPE);
+            break;
+        case Opcodes.IXOR:
+            xor(Type.INT_TYPE);
+            break;
+        case Opcodes.LXOR:
+            xor(Type.LONG_TYPE);
+            break;
+        case Opcodes.I2L:
+            cast(Type.INT_TYPE, Type.LONG_TYPE);
+            break;
+        case Opcodes.I2F:
+            cast(Type.INT_TYPE, Type.FLOAT_TYPE);
+            break;
+        case Opcodes.I2D:
+            cast(Type.INT_TYPE, Type.DOUBLE_TYPE);
+            break;
+        case Opcodes.L2I:
+            cast(Type.LONG_TYPE, Type.INT_TYPE);
+            break;
+        case Opcodes.L2F:
+            cast(Type.LONG_TYPE, Type.FLOAT_TYPE);
+            break;
+        case Opcodes.L2D:
+            cast(Type.LONG_TYPE, Type.DOUBLE_TYPE);
+            break;
+        case Opcodes.F2I:
+            cast(Type.FLOAT_TYPE, Type.INT_TYPE);
+            break;
+        case Opcodes.F2L:
+            cast(Type.FLOAT_TYPE, Type.LONG_TYPE);
+            break;
+        case Opcodes.F2D:
+            cast(Type.FLOAT_TYPE, Type.DOUBLE_TYPE);
+            break;
+        case Opcodes.D2I:
+            cast(Type.DOUBLE_TYPE, Type.INT_TYPE);
+            break;
+        case Opcodes.D2L:
+            cast(Type.DOUBLE_TYPE, Type.LONG_TYPE);
+            break;
+        case Opcodes.D2F:
+            cast(Type.DOUBLE_TYPE, Type.FLOAT_TYPE);
+            break;
+        case Opcodes.I2B:
+            cast(Type.INT_TYPE, Type.BYTE_TYPE);
+            break;
+        case Opcodes.I2C:
+            cast(Type.INT_TYPE, Type.CHAR_TYPE);
+            break;
+        case Opcodes.I2S:
+            cast(Type.INT_TYPE, Type.SHORT_TYPE);
+            break;
+        case Opcodes.LCMP:
+            lcmp();
+            break;
+        case Opcodes.FCMPL:
+            cmpl(Type.FLOAT_TYPE);
+            break;
+        case Opcodes.FCMPG:
+            cmpg(Type.FLOAT_TYPE);
+            break;
+        case Opcodes.DCMPL:
+            cmpl(Type.DOUBLE_TYPE);
+            break;
+        case Opcodes.DCMPG:
+            cmpg(Type.DOUBLE_TYPE);
+            break;
+        case Opcodes.IRETURN:
+            areturn(Type.INT_TYPE);
+            break;
+        case Opcodes.LRETURN:
+            areturn(Type.LONG_TYPE);
+            break;
+        case Opcodes.FRETURN:
+            areturn(Type.FLOAT_TYPE);
+            break;
+        case Opcodes.DRETURN:
+            areturn(Type.DOUBLE_TYPE);
+            break;
+        case Opcodes.ARETURN:
+            areturn(OBJECT_TYPE);
+            break;
+        case Opcodes.RETURN:
+            areturn(Type.VOID_TYPE);
+            break;
+        case Opcodes.ARRAYLENGTH:
+            arraylength();
+            break;
+        case Opcodes.ATHROW:
+            athrow();
+            break;
+        case Opcodes.MONITORENTER:
+            monitorenter();
+            break;
+        case Opcodes.MONITOREXIT:
+            monitorexit();
+            break;
+        default:
+            throw new IllegalArgumentException();
+        }
+    }
+
+    @Override
+    public void visitIntInsn(final int opcode, final int operand) {
+        switch (opcode) {
+        case Opcodes.BIPUSH:
+            iconst(operand);
+            break;
+        case Opcodes.SIPUSH:
+            iconst(operand);
+            break;
+        case Opcodes.NEWARRAY:
+            switch (operand) {
+            case Opcodes.T_BOOLEAN:
+                newarray(Type.BOOLEAN_TYPE);
+                break;
+            case Opcodes.T_CHAR:
+                newarray(Type.CHAR_TYPE);
+                break;
+            case Opcodes.T_BYTE:
+                newarray(Type.BYTE_TYPE);
+                break;
+            case Opcodes.T_SHORT:
+                newarray(Type.SHORT_TYPE);
+                break;
+            case Opcodes.T_INT:
+                newarray(Type.INT_TYPE);
+                break;
+            case Opcodes.T_FLOAT:
+                newarray(Type.FLOAT_TYPE);
+                break;
+            case Opcodes.T_LONG:
+                newarray(Type.LONG_TYPE);
+                break;
+            case Opcodes.T_DOUBLE:
+                newarray(Type.DOUBLE_TYPE);
+                break;
+            default:
+                throw new IllegalArgumentException();
+            }
+            break;
+        default:
+            throw new IllegalArgumentException();
+        }
+    }
+
+    @Override
+    public void visitVarInsn(final int opcode, final int var) {
+        switch (opcode) {
+        case Opcodes.ILOAD:
+            load(var, Type.INT_TYPE);
+            break;
+        case Opcodes.LLOAD:
+            load(var, Type.LONG_TYPE);
+            break;
+        case Opcodes.FLOAD:
+            load(var, Type.FLOAT_TYPE);
+            break;
+        case Opcodes.DLOAD:
+            load(var, Type.DOUBLE_TYPE);
+            break;
+        case Opcodes.ALOAD:
+            load(var, OBJECT_TYPE);
+            break;
+        case Opcodes.ISTORE:
+            store(var, Type.INT_TYPE);
+            break;
+        case Opcodes.LSTORE:
+            store(var, Type.LONG_TYPE);
+            break;
+        case Opcodes.FSTORE:
+            store(var, Type.FLOAT_TYPE);
+            break;
+        case Opcodes.DSTORE:
+            store(var, Type.DOUBLE_TYPE);
+            break;
+        case Opcodes.ASTORE:
+            store(var, OBJECT_TYPE);
+            break;
+        case Opcodes.RET:
+            ret(var);
+            break;
+        default:
+            throw new IllegalArgumentException();
+        }
+    }
+
+    @Override
+    public void visitTypeInsn(final int opcode, final String type) {
+        Type t = Type.getObjectType(type);
+        switch (opcode) {
+        case Opcodes.NEW:
+            anew(t);
+            break;
+        case Opcodes.ANEWARRAY:
+            newarray(t);
+            break;
+        case Opcodes.CHECKCAST:
+            checkcast(t);
+            break;
+        case Opcodes.INSTANCEOF:
+            instanceOf(t);
+            break;
+        default:
+            throw new IllegalArgumentException();
+        }
+    }
+
+    @Override
+    public void visitFieldInsn(final int opcode, final String owner,
+            final String name, final String desc) {
+        switch (opcode) {
+        case Opcodes.GETSTATIC:
+            getstatic(owner, name, desc);
+            break;
+        case Opcodes.PUTSTATIC:
+            putstatic(owner, name, desc);
+            break;
+        case Opcodes.GETFIELD:
+            getfield(owner, name, desc);
+            break;
+        case Opcodes.PUTFIELD:
+            putfield(owner, name, desc);
+            break;
+        default:
+            throw new IllegalArgumentException();
+        }
+    }
+
+    @Override
+    public void visitMethodInsn(final int opcode, final String owner,
+            final String name, final String desc) {
+        switch (opcode) {
+        case Opcodes.INVOKESPECIAL:
+            invokespecial(owner, name, desc);
+            break;
+        case Opcodes.INVOKEVIRTUAL:
+            invokevirtual(owner, name, desc);
+            break;
+        case Opcodes.INVOKESTATIC:
+            invokestatic(owner, name, desc);
+            break;
+        case Opcodes.INVOKEINTERFACE:
+            invokeinterface(owner, name, desc);
+            break;
+        default:
+            throw new IllegalArgumentException();
+        }
+    }
+
+    @Override
+    public void visitInvokeDynamicInsn(String name, String desc, Handle bsm,
+            Object... bsmArgs) {
+        invokedynamic(name, desc, bsm, bsmArgs);
+    }
+
+    @Override
+    public void visitJumpInsn(final int opcode, final Label label) {
+        switch (opcode) {
+        case Opcodes.IFEQ:
+            ifeq(label);
+            break;
+        case Opcodes.IFNE:
+            ifne(label);
+            break;
+        case Opcodes.IFLT:
+            iflt(label);
+            break;
+        case Opcodes.IFGE:
+            ifge(label);
+            break;
+        case Opcodes.IFGT:
+            ifgt(label);
+            break;
+        case Opcodes.IFLE:
+            ifle(label);
+            break;
+        case Opcodes.IF_ICMPEQ:
+            ificmpeq(label);
+            break;
+        case Opcodes.IF_ICMPNE:
+            ificmpne(label);
+            break;
+        case Opcodes.IF_ICMPLT:
+            ificmplt(label);
+            break;
+        case Opcodes.IF_ICMPGE:
+            ificmpge(label);
+            break;
+        case Opcodes.IF_ICMPGT:
+            ificmpgt(label);
+            break;
+        case Opcodes.IF_ICMPLE:
+            ificmple(label);
+            break;
+        case Opcodes.IF_ACMPEQ:
+            ifacmpeq(label);
+            break;
+        case Opcodes.IF_ACMPNE:
+            ifacmpne(label);
+            break;
+        case Opcodes.GOTO:
+            goTo(label);
+            break;
+        case Opcodes.JSR:
+            jsr(label);
+            break;
+        case Opcodes.IFNULL:
+            ifnull(label);
+            break;
+        case Opcodes.IFNONNULL:
+            ifnonnull(label);
+            break;
+        default:
+            throw new IllegalArgumentException();
+        }
+    }
+
+    @Override
+    public void visitLabel(final Label label) {
+        mark(label);
+    }
+
+    @Override
+    public void visitLdcInsn(final Object cst) {
+        if (cst instanceof Integer) {
+            int val = ((Integer) cst).intValue();
+            iconst(val);
+        } else if (cst instanceof Byte) {
+            int val = ((Byte) cst).intValue();
+            iconst(val);
+        } else if (cst instanceof Character) {
+            int val = ((Character) cst).charValue();
+            iconst(val);
+        } else if (cst instanceof Short) {
+            int val = ((Short) cst).intValue();
+            iconst(val);
+        } else if (cst instanceof Boolean) {
+            int val = ((Boolean) cst).booleanValue() ? 1 : 0;
+            iconst(val);
+        } else if (cst instanceof Float) {
+            float val = ((Float) cst).floatValue();
+            fconst(val);
+        } else if (cst instanceof Long) {
+            long val = ((Long) cst).longValue();
+            lconst(val);
+        } else if (cst instanceof Double) {
+            double val = ((Double) cst).doubleValue();
+            dconst(val);
+        } else if (cst instanceof String) {
+            aconst(cst);
+        } else if (cst instanceof Type) {
+            tconst((Type) cst);
+        } else if (cst instanceof Handle) {
+            hconst((Handle) cst);
+        } else {
+            throw new IllegalArgumentException();
+        }
+    }
+
+    @Override
+    public void visitIincInsn(final int var, final int increment) {
+        iinc(var, increment);
+    }
+
+    @Override
+    public void visitTableSwitchInsn(final int min, final int max,
+            final Label dflt, final Label... labels) {
+        tableswitch(min, max, dflt, labels);
+    }
+
+    @Override
+    public void visitLookupSwitchInsn(final Label dflt, final int[] keys,
+            final Label[] labels) {
+        lookupswitch(dflt, keys, labels);
+    }
+
+    @Override
+    public void visitMultiANewArrayInsn(final String desc, final int dims) {
+        multianewarray(desc, dims);
+    }
+
+    // -----------------------------------------------------------------------
+
+    public void nop() {
+        mv.visitInsn(Opcodes.NOP);
+    }
+
+    public void aconst(final Object cst) {
+        if (cst == null) {
+            mv.visitInsn(Opcodes.ACONST_NULL);
+        } else {
+            mv.visitLdcInsn(cst);
+        }
+    }
+
+    public void iconst(final int cst) {
+        if (cst >= -1 && cst <= 5) {
+            mv.visitInsn(Opcodes.ICONST_0 + cst);
+        } else if (cst >= Byte.MIN_VALUE && cst <= Byte.MAX_VALUE) {
+            mv.visitIntInsn(Opcodes.BIPUSH, cst);
+        } else if (cst >= Short.MIN_VALUE && cst <= Short.MAX_VALUE) {
+            mv.visitIntInsn(Opcodes.SIPUSH, cst);
+        } else {
+            mv.visitLdcInsn(new Integer(cst));
+        }
+    }
+
+    public void lconst(final long cst) {
+        if (cst == 0L || cst == 1L) {
+            mv.visitInsn(Opcodes.LCONST_0 + (int) cst);
+        } else {
+            mv.visitLdcInsn(new Long(cst));
+        }
+    }
+
+    public void fconst(final float cst) {
+        int bits = Float.floatToIntBits(cst);
+        if (bits == 0L || bits == 0x3f800000 || bits == 0x40000000) { // 0..2
+            mv.visitInsn(Opcodes.FCONST_0 + (int) cst);
+        } else {
+            mv.visitLdcInsn(new Float(cst));
+        }
+    }
+
+    public void dconst(final double cst) {
+        long bits = Double.doubleToLongBits(cst);
+        if (bits == 0L || bits == 0x3ff0000000000000L) { // +0.0d and 1.0d
+            mv.visitInsn(Opcodes.DCONST_0 + (int) cst);
+        } else {
+            mv.visitLdcInsn(new Double(cst));
+        }
+    }
+
+    public void tconst(final Type type) {
+        mv.visitLdcInsn(type);
+    }
+
+    public void hconst(final Handle handle) {
+        mv.visitLdcInsn(handle);
+    }
+
+    public void load(final int var, final Type type) {
+        mv.visitVarInsn(type.getOpcode(Opcodes.ILOAD), var);
+    }
+
+    public void aload(final Type type) {
+        mv.visitInsn(type.getOpcode(Opcodes.IALOAD));
+    }
+
+    public void store(final int var, final Type type) {
+        mv.visitVarInsn(type.getOpcode(Opcodes.ISTORE), var);
+    }
+
+    public void astore(final Type type) {
+        mv.visitInsn(type.getOpcode(Opcodes.IASTORE));
+    }
+
+    public void pop() {
+        mv.visitInsn(Opcodes.POP);
+    }
+
+    public void pop2() {
+        mv.visitInsn(Opcodes.POP2);
+    }
+
+    public void dup() {
+        mv.visitInsn(Opcodes.DUP);
+    }
+
+    public void dup2() {
+        mv.visitInsn(Opcodes.DUP2);
+    }
+
+    public void dupX1() {
+        mv.visitInsn(Opcodes.DUP_X1);
+    }
+
+    public void dupX2() {
+        mv.visitInsn(Opcodes.DUP_X2);
+    }
+
+    public void dup2X1() {
+        mv.visitInsn(Opcodes.DUP2_X1);
+    }
+
+    public void dup2X2() {
+        mv.visitInsn(Opcodes.DUP2_X2);
+    }
+
+    public void swap() {
+        mv.visitInsn(Opcodes.SWAP);
+    }
+
+    public void add(final Type type) {
+        mv.visitInsn(type.getOpcode(Opcodes.IADD));
+    }
+
+    public void sub(final Type type) {
+        mv.visitInsn(type.getOpcode(Opcodes.ISUB));
+    }
+
+    public void mul(final Type type) {
+        mv.visitInsn(type.getOpcode(Opcodes.IMUL));
+    }
+
+    public void div(final Type type) {
+        mv.visitInsn(type.getOpcode(Opcodes.IDIV));
+    }
+
+    public void rem(final Type type) {
+        mv.visitInsn(type.getOpcode(Opcodes.IREM));
+    }
+
+    public void neg(final Type type) {
+        mv.visitInsn(type.getOpcode(Opcodes.INEG));
+    }
+
+    public void shl(final Type type) {
+        mv.visitInsn(type.getOpcode(Opcodes.ISHL));
+    }
+
+    public void shr(final Type type) {
+        mv.visitInsn(type.getOpcode(Opcodes.ISHR));
+    }
+
+    public void ushr(final Type type) {
+        mv.visitInsn(type.getOpcode(Opcodes.IUSHR));
+    }
+
+    public void and(final Type type) {
+        mv.visitInsn(type.getOpcode(Opcodes.IAND));
+    }
+
+    public void or(final Type type) {
+        mv.visitInsn(type.getOpcode(Opcodes.IOR));
+    }
+
+    public void xor(final Type type) {
+        mv.visitInsn(type.getOpcode(Opcodes.IXOR));
+    }
+
+    public void iinc(final int var, final int increment) {
+        mv.visitIincInsn(var, increment);
+    }
+
+    public void cast(final Type from, final Type to) {
+        if (from != to) {
+            if (from == Type.DOUBLE_TYPE) {
+                if (to == Type.FLOAT_TYPE) {
+                    mv.visitInsn(Opcodes.D2F);
+                } else if (to == Type.LONG_TYPE) {
+                    mv.visitInsn(Opcodes.D2L);
+                } else {
+                    mv.visitInsn(Opcodes.D2I);
+                    cast(Type.INT_TYPE, to);
+                }
+            } else if (from == Type.FLOAT_TYPE) {
+                if (to == Type.DOUBLE_TYPE) {
+                    mv.visitInsn(Opcodes.F2D);
+                } else if (to == Type.LONG_TYPE) {
+                    mv.visitInsn(Opcodes.F2L);
+                } else {
+                    mv.visitInsn(Opcodes.F2I);
+                    cast(Type.INT_TYPE, to);
+                }
+            } else if (from == Type.LONG_TYPE) {
+                if (to == Type.DOUBLE_TYPE) {
+                    mv.visitInsn(Opcodes.L2D);
+                } else if (to == Type.FLOAT_TYPE) {
+                    mv.visitInsn(Opcodes.L2F);
+                } else {
+                    mv.visitInsn(Opcodes.L2I);
+                    cast(Type.INT_TYPE, to);
+                }
+            } else {
+                if (to == Type.BYTE_TYPE) {
+                    mv.visitInsn(Opcodes.I2B);
+                } else if (to == Type.CHAR_TYPE) {
+                    mv.visitInsn(Opcodes.I2C);
+                } else if (to == Type.DOUBLE_TYPE) {
+                    mv.visitInsn(Opcodes.I2D);
+                } else if (to == Type.FLOAT_TYPE) {
+                    mv.visitInsn(Opcodes.I2F);
+                } else if (to == Type.LONG_TYPE) {
+                    mv.visitInsn(Opcodes.I2L);
+                } else if (to == Type.SHORT_TYPE) {
+                    mv.visitInsn(Opcodes.I2S);
+                }
+            }
+        }
+    }
+
+    public void lcmp() {
+        mv.visitInsn(Opcodes.LCMP);
+    }
+
+    public void cmpl(final Type type) {
+        mv.visitInsn(type == Type.FLOAT_TYPE ? Opcodes.FCMPL : Opcodes.DCMPL);
+    }
+
+    public void cmpg(final Type type) {
+        mv.visitInsn(type == Type.FLOAT_TYPE ? Opcodes.FCMPG : Opcodes.DCMPG);
+    }
+
+    public void ifeq(final Label label) {
+        mv.visitJumpInsn(Opcodes.IFEQ, label);
+    }
+
+    public void ifne(final Label label) {
+        mv.visitJumpInsn(Opcodes.IFNE, label);
+    }
+
+    public void iflt(final Label label) {
+        mv.visitJumpInsn(Opcodes.IFLT, label);
+    }
+
+    public void ifge(final Label label) {
+        mv.visitJumpInsn(Opcodes.IFGE, label);
+    }
+
+    public void ifgt(final Label label) {
+        mv.visitJumpInsn(Opcodes.IFGT, label);
+    }
+
+    public void ifle(final Label label) {
+        mv.visitJumpInsn(Opcodes.IFLE, label);
+    }
+
+    public void ificmpeq(final Label label) {
+        mv.visitJumpInsn(Opcodes.IF_ICMPEQ, label);
+    }
+
+    public void ificmpne(final Label label) {
+        mv.visitJumpInsn(Opcodes.IF_ICMPNE, label);
+    }
+
+    public void ificmplt(final Label label) {
+        mv.visitJumpInsn(Opcodes.IF_ICMPLT, label);
+    }
+
+    public void ificmpge(final Label label) {
+        mv.visitJumpInsn(Opcodes.IF_ICMPGE, label);
+    }
+
+    public void ificmpgt(final Label label) {
+        mv.visitJumpInsn(Opcodes.IF_ICMPGT, label);
+    }
+
+    public void ificmple(final Label label) {
+        mv.visitJumpInsn(Opcodes.IF_ICMPLE, label);
+    }
+
+    public void ifacmpeq(final Label label) {
+        mv.visitJumpInsn(Opcodes.IF_ACMPEQ, label);
+    }
+
+    public void ifacmpne(final Label label) {
+        mv.visitJumpInsn(Opcodes.IF_ACMPNE, label);
+    }
+
+    public void goTo(final Label label) {
+        mv.visitJumpInsn(Opcodes.GOTO, label);
+    }
+
+    public void jsr(final Label label) {
+        mv.visitJumpInsn(Opcodes.JSR, label);
+    }
+
+    public void ret(final int var) {
+        mv.visitVarInsn(Opcodes.RET, var);
+    }
+
+    public void tableswitch(final int min, final int max, final Label dflt,
+            final Label... labels) {
+        mv.visitTableSwitchInsn(min, max, dflt, labels);
+    }
+
+    public void lookupswitch(final Label dflt, final int[] keys,
+            final Label[] labels) {
+        mv.visitLookupSwitchInsn(dflt, keys, labels);
+    }
+
+    public void areturn(final Type t) {
+        mv.visitInsn(t.getOpcode(Opcodes.IRETURN));
+    }
+
+    public void getstatic(final String owner, final String name,
+            final String desc) {
+        mv.visitFieldInsn(Opcodes.GETSTATIC, owner, name, desc);
+    }
+
+    public void putstatic(final String owner, final String name,
+            final String desc) {
+        mv.visitFieldInsn(Opcodes.PUTSTATIC, owner, name, desc);
+    }
+
+    public void getfield(final String owner, final String name,
+            final String desc) {
+        mv.visitFieldInsn(Opcodes.GETFIELD, owner, name, desc);
+    }
+
+    public void putfield(final String owner, final String name,
+            final String desc) {
+        mv.visitFieldInsn(Opcodes.PUTFIELD, owner, name, desc);
+    }
+
+    public void invokevirtual(final String owner, final String name,
+            final String desc) {
+        mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, owner, name, desc);
+    }
+
+    public void invokespecial(final String owner, final String name,
+            final String desc) {
+        mv.visitMethodInsn(Opcodes.INVOKESPECIAL, owner, name, desc);
+    }
+
+    public void invokestatic(final String owner, final String name,
+            final String desc) {
+        mv.visitMethodInsn(Opcodes.INVOKESTATIC, owner, name, desc);
+    }
+
+    public void invokeinterface(final String owner, final String name,
+            final String desc) {
+        mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, owner, name, desc);
+    }
+
+    public void invokedynamic(String name, String desc, Handle bsm,
+            Object[] bsmArgs) {
+        mv.visitInvokeDynamicInsn(name, desc, bsm, bsmArgs);
+    }
+
+    public void anew(final Type type) {
+        mv.visitTypeInsn(Opcodes.NEW, type.getInternalName());
+    }
+
+    public void newarray(final Type type) {
+        int typ;
+        switch (type.getSort()) {
+        case Type.BOOLEAN:
+            typ = Opcodes.T_BOOLEAN;
+            break;
+        case Type.CHAR:
+            typ = Opcodes.T_CHAR;
+            break;
+        case Type.BYTE:
+            typ = Opcodes.T_BYTE;
+            break;
+        case Type.SHORT:
+            typ = Opcodes.T_SHORT;
+            break;
+        case Type.INT:
+            typ = Opcodes.T_INT;
+            break;
+        case Type.FLOAT:
+            typ = Opcodes.T_FLOAT;
+            break;
+        case Type.LONG:
+            typ = Opcodes.T_LONG;
+            break;
+        case Type.DOUBLE:
+            typ = Opcodes.T_DOUBLE;
+            break;
+        default:
+            mv.visitTypeInsn(Opcodes.ANEWARRAY, type.getInternalName());
+            return;
+        }
+        mv.visitIntInsn(Opcodes.NEWARRAY, typ);
+    }
+
+    public void arraylength() {
+        mv.visitInsn(Opcodes.ARRAYLENGTH);
+    }
+
+    public void athrow() {
+        mv.visitInsn(Opcodes.ATHROW);
+    }
+
+    public void checkcast(final Type type) {
+        mv.visitTypeInsn(Opcodes.CHECKCAST, type.getInternalName());
+    }
+
+    public void instanceOf(final Type type) {
+        mv.visitTypeInsn(Opcodes.INSTANCEOF, type.getInternalName());
+    }
+
+    public void monitorenter() {
+        mv.visitInsn(Opcodes.MONITORENTER);
+    }
+
+    public void monitorexit() {
+        mv.visitInsn(Opcodes.MONITOREXIT);
+    }
+
+    public void multianewarray(final String desc, final int dims) {
+        mv.visitMultiANewArrayInsn(desc, dims);
+    }
+
+    public void ifnull(final Label label) {
+        mv.visitJumpInsn(Opcodes.IFNULL, label);
+    }
+
+    public void ifnonnull(final Label label) {
+        mv.visitJumpInsn(Opcodes.IFNONNULL, label);
+    }
+
+    public void mark(final Label label) {
+        mv.visitLabel(label);
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/commons/JSRInlinerAdapter.java b/src/main/asm/org/objectweb/asm/commons/JSRInlinerAdapter.java
new file mode 100644
index 0000000..a8325fd
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/commons/JSRInlinerAdapter.java
@@ -0,0 +1,747 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.commons;
+
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.InsnList;
+import org.objectweb.asm.tree.InsnNode;
+import org.objectweb.asm.tree.JumpInsnNode;
+import org.objectweb.asm.tree.LabelNode;
+import org.objectweb.asm.tree.LocalVariableNode;
+import org.objectweb.asm.tree.LookupSwitchInsnNode;
+import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.tree.TableSwitchInsnNode;
+import org.objectweb.asm.tree.TryCatchBlockNode;
+
+/**
+ * A {@link org.objectweb.asm.MethodVisitor} that removes JSR instructions and
+ * inlines the referenced subroutines.
+ * 
+ * <b>Explanation of how it works</b> TODO
+ * 
+ * @author Niko Matsakis
+ */
+public class JSRInlinerAdapter extends MethodNode implements Opcodes {
+
+    private static final boolean LOGGING = false;
+
+    /**
+     * For each label that is jumped to by a JSR, we create a BitSet instance.
+     */
+    private final Map<LabelNode, BitSet> subroutineHeads = new HashMap<LabelNode, BitSet>();
+
+    /**
+     * This subroutine instance denotes the line of execution that is not
+     * contained within any subroutine; i.e., the "subroutine" that is executing
+     * when a method first begins.
+     */
+    private final BitSet mainSubroutine = new BitSet();
+
+    /**
+     * This BitSet contains the index of every instruction that belongs to more
+     * than one subroutine. This should not happen often.
+     */
+    final BitSet dualCitizens = new BitSet();
+
+    /**
+     * Creates a new JSRInliner. <i>Subclasses must not use this
+     * constructor</i>. Instead, they must use the
+     * {@link #JSRInlinerAdapter(int, MethodVisitor, int, String, String, String, String[])}
+     * version.
+     * 
+     * @param mv
+     *            the <code>MethodVisitor</code> to send the resulting inlined
+     *            method code to (use <code>null</code> for none).
+     * @param access
+     *            the method's access flags (see {@link Opcodes}). This
+     *            parameter also indicates if the method is synthetic and/or
+     *            deprecated.
+     * @param name
+     *            the method's name.
+     * @param desc
+     *            the method's descriptor (see {@link Type}).
+     * @param signature
+     *            the method's signature. May be <tt>null</tt>.
+     * @param exceptions
+     *            the internal names of the method's exception classes (see
+     *            {@link Type#getInternalName() getInternalName}). May be
+     *            <tt>null</tt>.
+     */
+    public JSRInlinerAdapter(final MethodVisitor mv, final int access,
+            final String name, final String desc, final String signature,
+            final String[] exceptions) {
+        this(Opcodes.ASM4, mv, access, name, desc, signature, exceptions);
+    }
+
+    /**
+     * Creates a new JSRInliner.
+     * 
+     * @param api
+     *            the ASM API version implemented by this visitor. Must be one
+     *            of {@link Opcodes#ASM4}.
+     * @param mv
+     *            the <code>MethodVisitor</code> to send the resulting inlined
+     *            method code to (use <code>null</code> for none).
+     * @param access
+     *            the method's access flags (see {@link Opcodes}). This
+     *            parameter also indicates if the method is synthetic and/or
+     *            deprecated.
+     * @param name
+     *            the method's name.
+     * @param desc
+     *            the method's descriptor (see {@link Type}).
+     * @param signature
+     *            the method's signature. May be <tt>null</tt>.
+     * @param exceptions
+     *            the internal names of the method's exception classes (see
+     *            {@link Type#getInternalName() getInternalName}). May be
+     *            <tt>null</tt>.
+     */
+    protected JSRInlinerAdapter(final int api, final MethodVisitor mv,
+            final int access, final String name, final String desc,
+            final String signature, final String[] exceptions) {
+        super(api, access, name, desc, signature, exceptions);
+        this.mv = mv;
+    }
+
+    /**
+     * Detects a JSR instruction and sets a flag to indicate we will need to do
+     * inlining.
+     */
+    @Override
+    public void visitJumpInsn(final int opcode, final Label lbl) {
+        super.visitJumpInsn(opcode, lbl);
+        LabelNode ln = ((JumpInsnNode) instructions.getLast()).label;
+        if (opcode == JSR && !subroutineHeads.containsKey(ln)) {
+            subroutineHeads.put(ln, new BitSet());
+        }
+    }
+
+    /**
+     * If any JSRs were seen, triggers the inlining process. Otherwise, forwards
+     * the byte codes untouched.
+     */
+    @Override
+    public void visitEnd() {
+        if (!subroutineHeads.isEmpty()) {
+            markSubroutines();
+            if (LOGGING) {
+                log(mainSubroutine.toString());
+                Iterator<BitSet> it = subroutineHeads.values().iterator();
+                while (it.hasNext()) {
+                    BitSet sub = it.next();
+                    log(sub.toString());
+                }
+            }
+            emitCode();
+        }
+
+        // Forward the translate opcodes on if appropriate:
+        if (mv != null) {
+            accept(mv);
+        }
+    }
+
+    /**
+     * Walks the method and determines which internal subroutine(s), if any,
+     * each instruction is a method of.
+     */
+    private void markSubroutines() {
+        BitSet anyvisited = new BitSet();
+
+        // First walk the main subroutine and find all those instructions which
+        // can be reached without invoking any JSR at all
+        markSubroutineWalk(mainSubroutine, 0, anyvisited);
+
+        // Go through the head of each subroutine and find any nodes reachable
+        // to that subroutine without following any JSR links.
+        for (Iterator<Map.Entry<LabelNode, BitSet>> it = subroutineHeads
+                .entrySet().iterator(); it.hasNext();) {
+            Map.Entry<LabelNode, BitSet> entry = it.next();
+            LabelNode lab = entry.getKey();
+            BitSet sub = entry.getValue();
+            int index = instructions.indexOf(lab);
+            markSubroutineWalk(sub, index, anyvisited);
+        }
+    }
+
+    /**
+     * Performs a depth first search walking the normal byte code path starting
+     * at <code>index</code>, and adding each instruction encountered into the
+     * subroutine <code>sub</code>. After this walk is complete, iterates over
+     * the exception handlers to ensure that we also include those byte codes
+     * which are reachable through an exception that may be thrown during the
+     * execution of the subroutine. Invoked from <code>markSubroutines()</code>.
+     * 
+     * @param sub
+     *            the subroutine whose instructions must be computed.
+     * @param index
+     *            an instruction of this subroutine.
+     * @param anyvisited
+     *            indexes of the already visited instructions, i.e. marked as
+     *            part of this subroutine or any previously computed subroutine.
+     */
+    private void markSubroutineWalk(final BitSet sub, final int index,
+            final BitSet anyvisited) {
+        if (LOGGING) {
+            log("markSubroutineWalk: sub=" + sub + " index=" + index);
+        }
+
+        // First find those instructions reachable via normal execution
+        markSubroutineWalkDFS(sub, index, anyvisited);
+
+        // Now, make sure we also include any applicable exception handlers
+        boolean loop = true;
+        while (loop) {
+            loop = false;
+            for (Iterator<TryCatchBlockNode> it = tryCatchBlocks.iterator(); it
+                    .hasNext();) {
+                TryCatchBlockNode trycatch = it.next();
+
+                if (LOGGING) {
+                    // TODO use of default toString().
+                    log("Scanning try/catch " + trycatch);
+                }
+
+                // If the handler has already been processed, skip it.
+                int handlerindex = instructions.indexOf(trycatch.handler);
+                if (sub.get(handlerindex)) {
+                    continue;
+                }
+
+                int startindex = instructions.indexOf(trycatch.start);
+                int endindex = instructions.indexOf(trycatch.end);
+                int nextbit = sub.nextSetBit(startindex);
+                if (nextbit != -1 && nextbit < endindex) {
+                    if (LOGGING) {
+                        log("Adding exception handler: " + startindex + '-'
+                                + endindex + " due to " + nextbit + " handler "
+                                + handlerindex);
+                    }
+                    markSubroutineWalkDFS(sub, handlerindex, anyvisited);
+                    loop = true;
+                }
+            }
+        }
+    }
+
+    /**
+     * Performs a simple DFS of the instructions, assigning each to the
+     * subroutine <code>sub</code>. Starts from <code>index</code>. Invoked only
+     * by <code>markSubroutineWalk()</code>.
+     * 
+     * @param sub
+     *            the subroutine whose instructions must be computed.
+     * @param index
+     *            an instruction of this subroutine.
+     * @param anyvisited
+     *            indexes of the already visited instructions, i.e. marked as
+     *            part of this subroutine or any previously computed subroutine.
+     */
+    private void markSubroutineWalkDFS(final BitSet sub, int index,
+            final BitSet anyvisited) {
+        while (true) {
+            AbstractInsnNode node = instructions.get(index);
+
+            // don't visit a node twice
+            if (sub.get(index)) {
+                return;
+            }
+            sub.set(index);
+
+            // check for those nodes already visited by another subroutine
+            if (anyvisited.get(index)) {
+                dualCitizens.set(index);
+                if (LOGGING) {
+                    log("Instruction #" + index + " is dual citizen.");
+                }
+            }
+            anyvisited.set(index);
+
+            if (node.getType() == AbstractInsnNode.JUMP_INSN
+                    && node.getOpcode() != JSR) {
+                // we do not follow recursively called subroutines here; but any
+                // other sort of branch we do follow
+                JumpInsnNode jnode = (JumpInsnNode) node;
+                int destidx = instructions.indexOf(jnode.label);
+                markSubroutineWalkDFS(sub, destidx, anyvisited);
+            }
+            if (node.getType() == AbstractInsnNode.TABLESWITCH_INSN) {
+                TableSwitchInsnNode tsnode = (TableSwitchInsnNode) node;
+                int destidx = instructions.indexOf(tsnode.dflt);
+                markSubroutineWalkDFS(sub, destidx, anyvisited);
+                for (int i = tsnode.labels.size() - 1; i >= 0; --i) {
+                    LabelNode l = tsnode.labels.get(i);
+                    destidx = instructions.indexOf(l);
+                    markSubroutineWalkDFS(sub, destidx, anyvisited);
+                }
+            }
+            if (node.getType() == AbstractInsnNode.LOOKUPSWITCH_INSN) {
+                LookupSwitchInsnNode lsnode = (LookupSwitchInsnNode) node;
+                int destidx = instructions.indexOf(lsnode.dflt);
+                markSubroutineWalkDFS(sub, destidx, anyvisited);
+                for (int i = lsnode.labels.size() - 1; i >= 0; --i) {
+                    LabelNode l = lsnode.labels.get(i);
+                    destidx = instructions.indexOf(l);
+                    markSubroutineWalkDFS(sub, destidx, anyvisited);
+                }
+            }
+
+            // check to see if this opcode falls through to the next instruction
+            // or not; if not, return.
+            switch (instructions.get(index).getOpcode()) {
+            case GOTO:
+            case RET:
+            case TABLESWITCH:
+            case LOOKUPSWITCH:
+            case IRETURN:
+            case LRETURN:
+            case FRETURN:
+            case DRETURN:
+            case ARETURN:
+            case RETURN:
+            case ATHROW:
+                /*
+                 * note: this either returns from this subroutine, or a parent
+                 * subroutine which invoked it
+                 */
+                return;
+            }
+
+            // Use tail recursion here in the form of an outer while loop to
+            // avoid our stack growing needlessly:
+            index++;
+
+            // We implicitly assumed above that execution can always fall
+            // through to the next instruction after a JSR. But a subroutine may
+            // never return, in which case the code after the JSR is unreachable
+            // and can be anything. In particular, it can seem to fall off the
+            // end of the method, so we must handle this case here (we could
+            // instead detect whether execution can return or not from a JSR,
+            // but this is more complicated).
+            if (index >= instructions.size()) {
+                return;
+            }
+        }
+    }
+
+    /**
+     * Creates the new instructions, inlining each instantiation of each
+     * subroutine until the code is fully elaborated.
+     */
+    private void emitCode() {
+        LinkedList<Instantiation> worklist = new LinkedList<Instantiation>();
+        // Create an instantiation of the "root" subroutine, which is just the
+        // main routine
+        worklist.add(new Instantiation(null, mainSubroutine));
+
+        // Emit instantiations of each subroutine we encounter, including the
+        // main subroutine
+        InsnList newInstructions = new InsnList();
+        List<TryCatchBlockNode> newTryCatchBlocks = new ArrayList<TryCatchBlockNode>();
+        List<LocalVariableNode> newLocalVariables = new ArrayList<LocalVariableNode>();
+        while (!worklist.isEmpty()) {
+            Instantiation inst = worklist.removeFirst();
+            emitSubroutine(inst, worklist, newInstructions, newTryCatchBlocks,
+                    newLocalVariables);
+        }
+        instructions = newInstructions;
+        tryCatchBlocks = newTryCatchBlocks;
+        localVariables = newLocalVariables;
+    }
+
+    /**
+     * Emits one instantiation of one subroutine, specified by
+     * <code>instant</code>. May add new instantiations that are invoked by this
+     * one to the <code>worklist</code> parameter, and new try/catch blocks to
+     * <code>newTryCatchBlocks</code>.
+     * 
+     * @param instant
+     *            the instantiation that must be performed.
+     * @param worklist
+     *            list of the instantiations that remain to be done.
+     * @param newInstructions
+     *            the instruction list to which the instantiated code must be
+     *            appended.
+     * @param newTryCatchBlocks
+     *            the exception handler list to which the instantiated handlers
+     *            must be appended.
+     */
+    private void emitSubroutine(final Instantiation instant,
+            final List<Instantiation> worklist, final InsnList newInstructions,
+            final List<TryCatchBlockNode> newTryCatchBlocks,
+            final List<LocalVariableNode> newLocalVariables) {
+        LabelNode duplbl = null;
+
+        if (LOGGING) {
+            log("--------------------------------------------------------");
+            log("Emitting instantiation of subroutine " + instant.subroutine);
+        }
+
+        // Emit the relevant instructions for this instantiation, translating
+        // labels and jump targets as we go:
+        for (int i = 0, c = instructions.size(); i < c; i++) {
+            AbstractInsnNode insn = instructions.get(i);
+            Instantiation owner = instant.findOwner(i);
+
+            // Always remap labels:
+            if (insn.getType() == AbstractInsnNode.LABEL) {
+                // Translate labels into their renamed equivalents.
+                // Avoid adding the same label more than once. Note
+                // that because we own this instruction the gotoTable
+                // and the rangeTable will always agree.
+                LabelNode ilbl = (LabelNode) insn;
+                LabelNode remap = instant.rangeLabel(ilbl);
+                if (LOGGING) {
+                    // TODO use of default toString().
+                    log("Translating lbl #" + i + ':' + ilbl + " to " + remap);
+                }
+                if (remap != duplbl) {
+                    newInstructions.add(remap);
+                    duplbl = remap;
+                }
+                continue;
+            }
+
+            // We don't want to emit instructions that were already
+            // emitted by a subroutine higher on the stack. Note that
+            // it is still possible for a given instruction to be
+            // emitted twice because it may belong to two subroutines
+            // that do not invoke each other.
+            if (owner != instant) {
+                continue;
+            }
+
+            if (LOGGING) {
+                log("Emitting inst #" + i);
+            }
+
+            if (insn.getOpcode() == RET) {
+                // Translate RET instruction(s) to a jump to the return label
+                // for the appropriate instantiation. The problem is that the
+                // subroutine may "fall through" to the ret of a parent
+                // subroutine; therefore, to find the appropriate ret label we
+                // find the lowest subroutine on the stack that claims to own
+                // this instruction. See the class javadoc comment for an
+                // explanation on why this technique is safe (note: it is only
+                // safe if the input is verifiable).
+                LabelNode retlabel = null;
+                for (Instantiation p = instant; p != null; p = p.previous) {
+                    if (p.subroutine.get(i)) {
+                        retlabel = p.returnLabel;
+                    }
+                }
+                if (retlabel == null) {
+                    // This is only possible if the mainSubroutine owns a RET
+                    // instruction, which should never happen for verifiable
+                    // code.
+                    throw new RuntimeException("Instruction #" + i
+                            + " is a RET not owned by any subroutine");
+                }
+                newInstructions.add(new JumpInsnNode(GOTO, retlabel));
+            } else if (insn.getOpcode() == JSR) {
+                LabelNode lbl = ((JumpInsnNode) insn).label;
+                BitSet sub = subroutineHeads.get(lbl);
+                Instantiation newinst = new Instantiation(instant, sub);
+                LabelNode startlbl = newinst.gotoLabel(lbl);
+
+                if (LOGGING) {
+                    log(" Creating instantiation of subr " + sub);
+                }
+
+                // Rather than JSRing, we will jump to the inline version and
+                // push NULL for what was once the return value. This hack
+                // allows us to avoid doing any sort of data flow analysis to
+                // figure out which instructions manipulate the old return value
+                // pointer which is now known to be unneeded.
+                newInstructions.add(new InsnNode(ACONST_NULL));
+                newInstructions.add(new JumpInsnNode(GOTO, startlbl));
+                newInstructions.add(newinst.returnLabel);
+
+                // Insert this new instantiation into the queue to be emitted
+                // later.
+                worklist.add(newinst);
+            } else {
+                newInstructions.add(insn.clone(instant));
+            }
+        }
+
+        // Emit try/catch blocks that are relevant to this method.
+        for (Iterator<TryCatchBlockNode> it = tryCatchBlocks.iterator(); it
+                .hasNext();) {
+            TryCatchBlockNode trycatch = it.next();
+
+            if (LOGGING) {
+                // TODO use of default toString().
+                log("try catch block original labels=" + trycatch.start + '-'
+                        + trycatch.end + "->" + trycatch.handler);
+            }
+
+            final LabelNode start = instant.rangeLabel(trycatch.start);
+            final LabelNode end = instant.rangeLabel(trycatch.end);
+
+            // Ignore empty try/catch regions
+            if (start == end) {
+                if (LOGGING) {
+                    log(" try catch block empty in this subroutine");
+                }
+                continue;
+            }
+
+            final LabelNode handler = instant.gotoLabel(trycatch.handler);
+
+            if (LOGGING) {
+                // TODO use of default toString().
+                log(" try catch block new labels=" + start + '-' + end + "->"
+                        + handler);
+            }
+
+            if (start == null || end == null || handler == null) {
+                throw new RuntimeException("Internal error!");
+            }
+
+            newTryCatchBlocks.add(new TryCatchBlockNode(start, end, handler,
+                    trycatch.type));
+        }
+
+        for (Iterator<LocalVariableNode> it = localVariables.iterator(); it
+                .hasNext();) {
+            LocalVariableNode lvnode = it.next();
+            if (LOGGING) {
+                log("local var " + lvnode.name);
+            }
+            final LabelNode start = instant.rangeLabel(lvnode.start);
+            final LabelNode end = instant.rangeLabel(lvnode.end);
+            if (start == end) {
+                if (LOGGING) {
+                    log("  local variable empty in this sub");
+                }
+                continue;
+            }
+            newLocalVariables.add(new LocalVariableNode(lvnode.name,
+                    lvnode.desc, lvnode.signature, start, end, lvnode.index));
+        }
+    }
+
+    private static void log(final String str) {
+        System.err.println(str);
+    }
+
+    /**
+     * A class that represents an instantiation of a subroutine. Each
+     * instantiation has an associate "stack" --- which is a listing of those
+     * instantiations that were active when this particular instance of this
+     * subroutine was invoked. Each instantiation also has a map from the
+     * original labels of the program to the labels appropriate for this
+     * instantiation, and finally a label to return to.
+     */
+    private class Instantiation extends AbstractMap<LabelNode, LabelNode> {
+
+        /**
+         * Previous instantiations; the stack must be statically predictable to
+         * be inlinable.
+         */
+        final Instantiation previous;
+
+        /**
+         * The subroutine this is an instantiation of.
+         */
+        public final BitSet subroutine;
+
+        /**
+         * This table maps Labels from the original source to Labels pointing at
+         * code specific to this instantiation, for use in remapping try/catch
+         * blocks,as well as gotos.
+         * 
+         * Note that in the presence of dual citizens instructions, that is,
+         * instructions which belong to more than one subroutine due to the
+         * merging of control flow without a RET instruction, we will map the
+         * target label of a GOTO to the label used by the instantiation lowest
+         * on the stack. This avoids code duplication during inlining in most
+         * cases.
+         * 
+         * @see #findOwner(int)
+         */
+        public final Map<LabelNode, LabelNode> rangeTable = new HashMap<LabelNode, LabelNode>();
+
+        /**
+         * All returns for this instantiation will be mapped to this label
+         */
+        public final LabelNode returnLabel;
+
+        Instantiation(final Instantiation prev, final BitSet sub) {
+            previous = prev;
+            subroutine = sub;
+            for (Instantiation p = prev; p != null; p = p.previous) {
+                if (p.subroutine == sub) {
+                    throw new RuntimeException("Recursive invocation of " + sub);
+                }
+            }
+
+            // Determine the label to return to when this subroutine terminates
+            // via RET: note that the main subroutine never terminates via RET.
+            if (prev != null) {
+                returnLabel = new LabelNode();
+            } else {
+                returnLabel = null;
+            }
+
+            // Each instantiation will remap the labels from the code above to
+            // refer to its particular copy of its own instructions. Note that
+            // we collapse labels which point at the same instruction into one:
+            // this is fairly common as we are often ignoring large chunks of
+            // instructions, so what were previously distinct labels become
+            // duplicates.
+            LabelNode duplbl = null;
+            for (int i = 0, c = instructions.size(); i < c; i++) {
+                AbstractInsnNode insn = instructions.get(i);
+
+                if (insn.getType() == AbstractInsnNode.LABEL) {
+                    LabelNode ilbl = (LabelNode) insn;
+
+                    if (duplbl == null) {
+                        // if we already have a label pointing at this spot,
+                        // don't recreate it.
+                        duplbl = new LabelNode();
+                    }
+
+                    // Add an entry in the rangeTable for every label
+                    // in the original code which points at the next
+                    // instruction of our own to be emitted.
+                    rangeTable.put(ilbl, duplbl);
+                } else if (findOwner(i) == this) {
+                    // We will emit this instruction, so clear the 'duplbl' flag
+                    // since the next Label will refer to a distinct
+                    // instruction.
+                    duplbl = null;
+                }
+            }
+        }
+
+        /**
+         * Returns the "owner" of a particular instruction relative to this
+         * instantiation: the owner referes to the Instantiation which will emit
+         * the version of this instruction that we will execute.
+         * 
+         * Typically, the return value is either <code>this</code> or
+         * <code>null</code>. <code>this</code> indicates that this
+         * instantiation will generate the version of this instruction that we
+         * will execute, and <code>null</code> indicates that this instantiation
+         * never executes the given instruction.
+         * 
+         * Sometimes, however, an instruction can belong to multiple
+         * subroutines; this is called a "dual citizen" instruction (though it
+         * may belong to more than 2 subroutines), and occurs when multiple
+         * subroutines branch to common points of control. In this case, the
+         * owner is the subroutine that appears lowest on the stack, and which
+         * also owns the instruction in question.
+         * 
+         * @param i
+         *            the index of the instruction in the original code
+         * @return the "owner" of a particular instruction relative to this
+         *         instantiation.
+         */
+        public Instantiation findOwner(final int i) {
+            if (!subroutine.get(i)) {
+                return null;
+            }
+            if (!dualCitizens.get(i)) {
+                return this;
+            }
+            Instantiation own = this;
+            for (Instantiation p = previous; p != null; p = p.previous) {
+                if (p.subroutine.get(i)) {
+                    own = p;
+                }
+            }
+            return own;
+        }
+
+        /**
+         * Looks up the label <code>l</code> in the <code>gotoTable</code>, thus
+         * translating it from a Label in the original code, to a Label in the
+         * inlined code that is appropriate for use by an instruction that
+         * branched to the original label.
+         * 
+         * @param l
+         *            The label we will be translating
+         * @return a label for use by a branch instruction in the inlined code
+         * @see #rangeLabel
+         */
+        public LabelNode gotoLabel(final LabelNode l) {
+            // owner should never be null, because owner is only null
+            // if an instruction cannot be reached from this subroutine
+            Instantiation owner = findOwner(instructions.indexOf(l));
+            return owner.rangeTable.get(l);
+        }
+
+        /**
+         * Looks up the label <code>l</code> in the <code>rangeTable</code>,
+         * thus translating it from a Label in the original code, to a Label in
+         * the inlined code that is appropriate for use by an try/catch or
+         * variable use annotation.
+         * 
+         * @param l
+         *            The label we will be translating
+         * @return a label for use by a try/catch or variable annotation in the
+         *         original code
+         * @see #rangeTable
+         */
+        public LabelNode rangeLabel(final LabelNode l) {
+            return rangeTable.get(l);
+        }
+
+        // AbstractMap implementation
+
+        @Override
+        public Set<Map.Entry<LabelNode, LabelNode>> entrySet() {
+            return null;
+        }
+
+        @Override
+        public LabelNode get(final Object o) {
+            return gotoLabel((LabelNode) o);
+        }
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/commons/LocalVariablesSorter.java b/src/main/asm/org/objectweb/asm/commons/LocalVariablesSorter.java
new file mode 100644
index 0000000..09eef09
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/commons/LocalVariablesSorter.java
@@ -0,0 +1,361 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.commons;
+
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+
+/**
+ * A {@link MethodVisitor} that renumbers local variables in their order of
+ * appearance. This adapter allows one to easily add new local variables to a
+ * method. It may be used by inheriting from this class, but the preferred way
+ * of using it is via delegation: the next visitor in the chain can indeed add
+ * new locals when needed by calling {@link #newLocal} on this adapter (this
+ * requires a reference back to this {@link LocalVariablesSorter}).
+ * 
+ * @author Chris Nokleberg
+ * @author Eugene Kuleshov
+ * @author Eric Bruneton
+ */
+public class LocalVariablesSorter extends MethodVisitor {
+
+    private static final Type OBJECT_TYPE = Type
+            .getObjectType("java/lang/Object");
+
+    /**
+     * Mapping from old to new local variable indexes. A local variable at index
+     * i of size 1 is remapped to 'mapping[2*i]', while a local variable at
+     * index i of size 2 is remapped to 'mapping[2*i+1]'.
+     */
+    private int[] mapping = new int[40];
+
+    /**
+     * Array used to store stack map local variable types after remapping.
+     */
+    private Object[] newLocals = new Object[20];
+
+    /**
+     * Index of the first local variable, after formal parameters.
+     */
+    protected final int firstLocal;
+
+    /**
+     * Index of the next local variable to be created by {@link #newLocal}.
+     */
+    protected int nextLocal;
+
+    /**
+     * Indicates if at least one local variable has moved due to remapping.
+     */
+    private boolean changed;
+
+    /**
+     * Creates a new {@link LocalVariablesSorter}. <i>Subclasses must not use
+     * this constructor</i>. Instead, they must use the
+     * {@link #LocalVariablesSorter(int, int, String, MethodVisitor)} version.
+     * 
+     * @param access
+     *            access flags of the adapted method.
+     * @param desc
+     *            the method's descriptor (see {@link Type Type}).
+     * @param mv
+     *            the method visitor to which this adapter delegates calls.
+     */
+    public LocalVariablesSorter(final int access, final String desc,
+            final MethodVisitor mv) {
+        this(Opcodes.ASM4, access, desc, mv);
+    }
+
+    /**
+     * Creates a new {@link LocalVariablesSorter}.
+     * 
+     * @param api
+     *            the ASM API version implemented by this visitor. Must be one
+     *            of {@link Opcodes#ASM4}.
+     * @param access
+     *            access flags of the adapted method.
+     * @param desc
+     *            the method's descriptor (see {@link Type Type}).
+     * @param mv
+     *            the method visitor to which this adapter delegates calls.
+     */
+    protected LocalVariablesSorter(final int api, final int access,
+            final String desc, final MethodVisitor mv) {
+        super(api, mv);
+        Type[] args = Type.getArgumentTypes(desc);
+        nextLocal = (Opcodes.ACC_STATIC & access) == 0 ? 1 : 0;
+        for (int i = 0; i < args.length; i++) {
+            nextLocal += args[i].getSize();
+        }
+        firstLocal = nextLocal;
+    }
+
+    @Override
+    public void visitVarInsn(final int opcode, final int var) {
+        Type type;
+        switch (opcode) {
+        case Opcodes.LLOAD:
+        case Opcodes.LSTORE:
+            type = Type.LONG_TYPE;
+            break;
+
+        case Opcodes.DLOAD:
+        case Opcodes.DSTORE:
+            type = Type.DOUBLE_TYPE;
+            break;
+
+        case Opcodes.FLOAD:
+        case Opcodes.FSTORE:
+            type = Type.FLOAT_TYPE;
+            break;
+
+        case Opcodes.ILOAD:
+        case Opcodes.ISTORE:
+            type = Type.INT_TYPE;
+            break;
+
+        default:
+            // case Opcodes.ALOAD:
+            // case Opcodes.ASTORE:
+            // case RET:
+            type = OBJECT_TYPE;
+            break;
+        }
+        mv.visitVarInsn(opcode, remap(var, type));
+    }
+
+    @Override
+    public void visitIincInsn(final int var, final int increment) {
+        mv.visitIincInsn(remap(var, Type.INT_TYPE), increment);
+    }
+
+    @Override
+    public void visitMaxs(final int maxStack, final int maxLocals) {
+        mv.visitMaxs(maxStack, nextLocal);
+    }
+
+    @Override
+    public void visitLocalVariable(final String name, final String desc,
+            final String signature, final Label start, final Label end,
+            final int index) {
+        int newIndex = remap(index, Type.getType(desc));
+        mv.visitLocalVariable(name, desc, signature, start, end, newIndex);
+    }
+
+    @Override
+    public void visitFrame(final int type, final int nLocal,
+            final Object[] local, final int nStack, final Object[] stack) {
+        if (type != Opcodes.F_NEW) { // uncompressed frame
+            throw new IllegalStateException(
+                    "ClassReader.accept() should be called with EXPAND_FRAMES flag");
+        }
+
+        if (!changed) { // optimization for the case where mapping = identity
+            mv.visitFrame(type, nLocal, local, nStack, stack);
+            return;
+        }
+
+        // creates a copy of newLocals
+        Object[] oldLocals = new Object[newLocals.length];
+        System.arraycopy(newLocals, 0, oldLocals, 0, oldLocals.length);
+
+        updateNewLocals(newLocals);
+
+        // copies types from 'local' to 'newLocals'
+        // 'newLocals' already contains the variables added with 'newLocal'
+
+        int index = 0; // old local variable index
+        int number = 0; // old local variable number
+        for (; number < nLocal; ++number) {
+            Object t = local[number];
+            int size = t == Opcodes.LONG || t == Opcodes.DOUBLE ? 2 : 1;
+            if (t != Opcodes.TOP) {
+                Type typ = OBJECT_TYPE;
+                if (t == Opcodes.INTEGER) {
+                    typ = Type.INT_TYPE;
+                } else if (t == Opcodes.FLOAT) {
+                    typ = Type.FLOAT_TYPE;
+                } else if (t == Opcodes.LONG) {
+                    typ = Type.LONG_TYPE;
+                } else if (t == Opcodes.DOUBLE) {
+                    typ = Type.DOUBLE_TYPE;
+                } else if (t instanceof String) {
+                    typ = Type.getObjectType((String) t);
+                }
+                setFrameLocal(remap(index, typ), t);
+            }
+            index += size;
+        }
+
+        // removes TOP after long and double types as well as trailing TOPs
+
+        index = 0;
+        number = 0;
+        for (int i = 0; index < newLocals.length; ++i) {
+            Object t = newLocals[index++];
+            if (t != null && t != Opcodes.TOP) {
+                newLocals[i] = t;
+                number = i + 1;
+                if (t == Opcodes.LONG || t == Opcodes.DOUBLE) {
+                    index += 1;
+                }
+            } else {
+                newLocals[i] = Opcodes.TOP;
+            }
+        }
+
+        // visits remapped frame
+        mv.visitFrame(type, number, newLocals, nStack, stack);
+
+        // restores original value of 'newLocals'
+        newLocals = oldLocals;
+    }
+
+    // -------------
+
+    /**
+     * Creates a new local variable of the given type.
+     * 
+     * @param type
+     *            the type of the local variable to be created.
+     * @return the identifier of the newly created local variable.
+     */
+    public int newLocal(final Type type) {
+        Object t;
+        switch (type.getSort()) {
+        case Type.BOOLEAN:
+        case Type.CHAR:
+        case Type.BYTE:
+        case Type.SHORT:
+        case Type.INT:
+            t = Opcodes.INTEGER;
+            break;
+        case Type.FLOAT:
+            t = Opcodes.FLOAT;
+            break;
+        case Type.LONG:
+            t = Opcodes.LONG;
+            break;
+        case Type.DOUBLE:
+            t = Opcodes.DOUBLE;
+            break;
+        case Type.ARRAY:
+            t = type.getDescriptor();
+            break;
+        // case Type.OBJECT:
+        default:
+            t = type.getInternalName();
+            break;
+        }
+        int local = newLocalMapping(type);
+        setLocalType(local, type);
+        setFrameLocal(local, t);
+        changed = true;
+        return local;
+    }
+
+    /**
+     * Notifies subclasses that a new stack map frame is being visited. The
+     * array argument contains the stack map frame types corresponding to the
+     * local variables added with {@link #newLocal}. This method can update
+     * these types in place for the stack map frame being visited. The default
+     * implementation of this method does nothing, i.e. a local variable added
+     * with {@link #newLocal} will have the same type in all stack map frames.
+     * But this behavior is not always the desired one, for instance if a local
+     * variable is added in the middle of a try/catch block: the frame for the
+     * exception handler should have a TOP type for this new local.
+     * 
+     * @param newLocals
+     *            the stack map frame types corresponding to the local variables
+     *            added with {@link #newLocal} (and null for the others). The
+     *            format of this array is the same as in
+     *            {@link MethodVisitor#visitFrame}, except that long and double
+     *            types use two slots. The types for the current stack map frame
+     *            must be updated in place in this array.
+     */
+    protected void updateNewLocals(Object[] newLocals) {
+    }
+
+    /**
+     * Notifies subclasses that a local variable has been added or remapped. The
+     * default implementation of this method does nothing.
+     * 
+     * @param local
+     *            a local variable identifier, as returned by {@link #newLocal
+     *            newLocal()}.
+     * @param type
+     *            the type of the value being stored in the local variable.
+     */
+    protected void setLocalType(final int local, final Type type) {
+    }
+
+    private void setFrameLocal(final int local, final Object type) {
+        int l = newLocals.length;
+        if (local >= l) {
+            Object[] a = new Object[Math.max(2 * l, local + 1)];
+            System.arraycopy(newLocals, 0, a, 0, l);
+            newLocals = a;
+        }
+        newLocals[local] = type;
+    }
+
+    private int remap(final int var, final Type type) {
+        if (var + type.getSize() <= firstLocal) {
+            return var;
+        }
+        int key = 2 * var + type.getSize() - 1;
+        int size = mapping.length;
+        if (key >= size) {
+            int[] newMapping = new int[Math.max(2 * size, key + 1)];
+            System.arraycopy(mapping, 0, newMapping, 0, size);
+            mapping = newMapping;
+        }
+        int value = mapping[key];
+        if (value == 0) {
+            value = newLocalMapping(type);
+            setLocalType(value, type);
+            mapping[key] = value + 1;
+        } else {
+            value--;
+        }
+        if (value != var) {
+            changed = true;
+        }
+        return value;
+    }
+
+    protected int newLocalMapping(final Type type) {
+        int local = nextLocal;
+        nextLocal += type.getSize();
+        return local;
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/commons/Method.java b/src/main/asm/org/objectweb/asm/commons/Method.java
new file mode 100644
index 0000000..25c3660
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/commons/Method.java
@@ -0,0 +1,282 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.commons;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.objectweb.asm.Type;
+
+/**
+ * A named method descriptor.
+ * 
+ * @author Juozas Baliuka
+ * @author Chris Nokleberg
+ * @author Eric Bruneton
+ */
+public class Method {
+
+    /**
+     * The method name.
+     */
+    private final String name;
+
+    /**
+     * The method descriptor.
+     */
+    private final String desc;
+
+    /**
+     * Maps primitive Java type names to their descriptors.
+     */
+    private static final Map<String, String> DESCRIPTORS;
+
+    static {
+        DESCRIPTORS = new HashMap<String, String>();
+        DESCRIPTORS.put("void", "V");
+        DESCRIPTORS.put("byte", "B");
+        DESCRIPTORS.put("char", "C");
+        DESCRIPTORS.put("double", "D");
+        DESCRIPTORS.put("float", "F");
+        DESCRIPTORS.put("int", "I");
+        DESCRIPTORS.put("long", "J");
+        DESCRIPTORS.put("short", "S");
+        DESCRIPTORS.put("boolean", "Z");
+    }
+
+    /**
+     * Creates a new {@link Method}.
+     * 
+     * @param name
+     *            the method's name.
+     * @param desc
+     *            the method's descriptor.
+     */
+    public Method(final String name, final String desc) {
+        this.name = name;
+        this.desc = desc;
+    }
+
+    /**
+     * Creates a new {@link Method}.
+     * 
+     * @param name
+     *            the method's name.
+     * @param returnType
+     *            the method's return type.
+     * @param argumentTypes
+     *            the method's argument types.
+     */
+    public Method(final String name, final Type returnType,
+            final Type[] argumentTypes) {
+        this(name, Type.getMethodDescriptor(returnType, argumentTypes));
+    }
+
+    /**
+     * Creates a new {@link Method}.
+     * 
+     * @param m
+     *            a java.lang.reflect method descriptor
+     * @return a {@link Method} corresponding to the given Java method
+     *         declaration.
+     */
+    public static Method getMethod(java.lang.reflect.Method m) {
+        return new Method(m.getName(), Type.getMethodDescriptor(m));
+    }
+
+    /**
+     * Creates a new {@link Method}.
+     * 
+     * @param c
+     *            a java.lang.reflect constructor descriptor
+     * @return a {@link Method} corresponding to the given Java constructor
+     *         declaration.
+     */
+    public static Method getMethod(java.lang.reflect.Constructor<?> c) {
+        return new Method("<init>", Type.getConstructorDescriptor(c));
+    }
+
+    /**
+     * Returns a {@link Method} corresponding to the given Java method
+     * declaration.
+     * 
+     * @param method
+     *            a Java method declaration, without argument names, of the form
+     *            "returnType name (argumentType1, ... argumentTypeN)", where
+     *            the types are in plain Java (e.g. "int", "float",
+     *            "java.util.List", ...). Classes of the java.lang package can
+     *            be specified by their unqualified name; all other classes
+     *            names must be fully qualified.
+     * @return a {@link Method} corresponding to the given Java method
+     *         declaration.
+     * @throws IllegalArgumentException
+     *             if <code>method</code> could not get parsed.
+     */
+    public static Method getMethod(final String method)
+            throws IllegalArgumentException {
+        return getMethod(method, false);
+    }
+
+    /**
+     * Returns a {@link Method} corresponding to the given Java method
+     * declaration.
+     * 
+     * @param method
+     *            a Java method declaration, without argument names, of the form
+     *            "returnType name (argumentType1, ... argumentTypeN)", where
+     *            the types are in plain Java (e.g. "int", "float",
+     *            "java.util.List", ...). Classes of the java.lang package may
+     *            be specified by their unqualified name, depending on the
+     *            defaultPackage argument; all other classes names must be fully
+     *            qualified.
+     * @param defaultPackage
+     *            true if unqualified class names belong to the default package,
+     *            or false if they correspond to java.lang classes. For instance
+     *            "Object" means "Object" if this option is true, or
+     *            "java.lang.Object" otherwise.
+     * @return a {@link Method} corresponding to the given Java method
+     *         declaration.
+     * @throws IllegalArgumentException
+     *             if <code>method</code> could not get parsed.
+     */
+    public static Method getMethod(final String method,
+            final boolean defaultPackage) throws IllegalArgumentException {
+        int space = method.indexOf(' ');
+        int start = method.indexOf('(', space) + 1;
+        int end = method.indexOf(')', start);
+        if (space == -1 || start == -1 || end == -1) {
+            throw new IllegalArgumentException();
+        }
+        String returnType = method.substring(0, space);
+        String methodName = method.substring(space + 1, start - 1).trim();
+        StringBuffer sb = new StringBuffer();
+        sb.append('(');
+        int p;
+        do {
+            String s;
+            p = method.indexOf(',', start);
+            if (p == -1) {
+                s = map(method.substring(start, end).trim(), defaultPackage);
+            } else {
+                s = map(method.substring(start, p).trim(), defaultPackage);
+                start = p + 1;
+            }
+            sb.append(s);
+        } while (p != -1);
+        sb.append(')');
+        sb.append(map(returnType, defaultPackage));
+        return new Method(methodName, sb.toString());
+    }
+
+    private static String map(final String type, final boolean defaultPackage) {
+        if ("".equals(type)) {
+            return type;
+        }
+
+        StringBuffer sb = new StringBuffer();
+        int index = 0;
+        while ((index = type.indexOf("[]", index) + 1) > 0) {
+            sb.append('[');
+        }
+
+        String t = type.substring(0, type.length() - sb.length() * 2);
+        String desc = DESCRIPTORS.get(t);
+        if (desc != null) {
+            sb.append(desc);
+        } else {
+            sb.append('L');
+            if (t.indexOf('.') < 0) {
+                if (!defaultPackage) {
+                    sb.append("java/lang/");
+                }
+                sb.append(t);
+            } else {
+                sb.append(t.replace('.', '/'));
+            }
+            sb.append(';');
+        }
+        return sb.toString();
+    }
+
+    /**
+     * Returns the name of the method described by this object.
+     * 
+     * @return the name of the method described by this object.
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Returns the descriptor of the method described by this object.
+     * 
+     * @return the descriptor of the method described by this object.
+     */
+    public String getDescriptor() {
+        return desc;
+    }
+
+    /**
+     * Returns the return type of the method described by this object.
+     * 
+     * @return the return type of the method described by this object.
+     */
+    public Type getReturnType() {
+        return Type.getReturnType(desc);
+    }
+
+    /**
+     * Returns the argument types of the method described by this object.
+     * 
+     * @return the argument types of the method described by this object.
+     */
+    public Type[] getArgumentTypes() {
+        return Type.getArgumentTypes(desc);
+    }
+
+    @Override
+    public String toString() {
+        return name + desc;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (!(o instanceof Method)) {
+            return false;
+        }
+        Method other = (Method) o;
+        return name.equals(other.name) && desc.equals(other.desc);
+    }
+
+    @Override
+    public int hashCode() {
+        return name.hashCode() ^ desc.hashCode();
+    }
+}
\ No newline at end of file
diff --git a/src/main/asm/org/objectweb/asm/commons/Remapper.java b/src/main/asm/org/objectweb/asm/commons/Remapper.java
new file mode 100644
index 0000000..9c359fb
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/commons/Remapper.java
@@ -0,0 +1,223 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.objectweb.asm.commons;
+
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.signature.SignatureReader;
+import org.objectweb.asm.signature.SignatureVisitor;
+import org.objectweb.asm.signature.SignatureWriter;
+
+/**
+ * A class responsible for remapping types and names. Subclasses can override
+ * the following methods:
+ * 
+ * <ul>
+ * <li>{@link #map(String)} - map type</li>
+ * <li>{@link #mapFieldName(String, String, String)} - map field name</li>
+ * <li>{@link #mapMethodName(String, String, String)} - map method name</li>
+ * </ul>
+ * 
+ * @author Eugene Kuleshov
+ */
+public abstract class Remapper {
+
+    public String mapDesc(String desc) {
+        Type t = Type.getType(desc);
+        switch (t.getSort()) {
+        case Type.ARRAY:
+            String s = mapDesc(t.getElementType().getDescriptor());
+            for (int i = 0; i < t.getDimensions(); ++i) {
+                s = '[' + s;
+            }
+            return s;
+        case Type.OBJECT:
+            String newType = map(t.getInternalName());
+            if (newType != null) {
+                return 'L' + newType + ';';
+            }
+        }
+        return desc;
+    }
+
+    private Type mapType(Type t) {
+        switch (t.getSort()) {
+        case Type.ARRAY:
+            String s = mapDesc(t.getElementType().getDescriptor());
+            for (int i = 0; i < t.getDimensions(); ++i) {
+                s = '[' + s;
+            }
+            return Type.getType(s);
+        case Type.OBJECT:
+            s = map(t.getInternalName());
+            return s != null ? Type.getObjectType(s) : t;
+        case Type.METHOD:
+            return Type.getMethodType(mapMethodDesc(t.getDescriptor()));
+        }
+        return t;
+    }
+
+    public String mapType(String type) {
+        if (type == null) {
+            return null;
+        }
+        return mapType(Type.getObjectType(type)).getInternalName();
+    }
+
+    public String[] mapTypes(String[] types) {
+        String[] newTypes = null;
+        boolean needMapping = false;
+        for (int i = 0; i < types.length; i++) {
+            String type = types[i];
+            String newType = map(type);
+            if (newType != null && newTypes == null) {
+                newTypes = new String[types.length];
+                if (i > 0) {
+                    System.arraycopy(types, 0, newTypes, 0, i);
+                }
+                needMapping = true;
+            }
+            if (needMapping) {
+                newTypes[i] = newType == null ? type : newType;
+            }
+        }
+        return needMapping ? newTypes : types;
+    }
+
+    public String mapMethodDesc(String desc) {
+        if ("()V".equals(desc)) {
+            return desc;
+        }
+
+        Type[] args = Type.getArgumentTypes(desc);
+        StringBuffer s = new StringBuffer("(");
+        for (int i = 0; i < args.length; i++) {
+            s.append(mapDesc(args[i].getDescriptor()));
+        }
+        Type returnType = Type.getReturnType(desc);
+        if (returnType == Type.VOID_TYPE) {
+            s.append(")V");
+            return s.toString();
+        }
+        s.append(')').append(mapDesc(returnType.getDescriptor()));
+        return s.toString();
+    }
+
+    public Object mapValue(Object value) {
+        if (value instanceof Type) {
+            return mapType((Type) value);
+        }
+        if (value instanceof Handle) {
+            Handle h = (Handle) value;
+            return new Handle(h.getTag(), mapType(h.getOwner()), mapMethodName(
+                    h.getOwner(), h.getName(), h.getDesc()),
+                    mapMethodDesc(h.getDesc()));
+        }
+        return value;
+    }
+
+    /**
+     * 
+     * @param typeSignature
+     *            true if signature is a FieldTypeSignature, such as the
+     *            signature parameter of the ClassVisitor.visitField or
+     *            MethodVisitor.visitLocalVariable methods
+     */
+    public String mapSignature(String signature, boolean typeSignature) {
+        if (signature == null) {
+            return null;
+        }
+        SignatureReader r = new SignatureReader(signature);
+        SignatureWriter w = new SignatureWriter();
+        SignatureVisitor a = createRemappingSignatureAdapter(w);
+        if (typeSignature) {
+            r.acceptType(a);
+        } else {
+            r.accept(a);
+        }
+        return w.toString();
+    }
+
+    protected SignatureVisitor createRemappingSignatureAdapter(
+            SignatureVisitor v) {
+        return new RemappingSignatureAdapter(v, this);
+    }
+
+    /**
+     * Map method name to the new name. Subclasses can override.
+     * 
+     * @param owner
+     *            owner of the method.
+     * @param name
+     *            name of the method.
+     * @param desc
+     *            descriptor of the method.
+     * @return new name of the method
+     */
+    public String mapMethodName(String owner, String name, String desc) {
+        return name;
+    }
+
+    /**
+     * Map invokedynamic method name to the new name. Subclasses can override.
+     * 
+     * @param name
+     *            name of the invokedynamic.
+     * @param desc
+     *            descriptor of the invokedynamic.
+     * @return new invokdynamic name.
+     */
+    public String mapInvokeDynamicMethodName(String name, String desc) {
+        return name;
+    }
+
+    /**
+     * Map field name to the new name. Subclasses can override.
+     * 
+     * @param owner
+     *            owner of the field.
+     * @param name
+     *            name of the field
+     * @param desc
+     *            descriptor of the field
+     * @return new name of the field.
+     */
+    public String mapFieldName(String owner, String name, String desc) {
+        return name;
+    }
+
+    /**
+     * Map type name to the new name. Subclasses can override.
+     */
+    public String map(String typeName) {
+        return typeName;
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/commons/RemappingAnnotationAdapter.java b/src/main/asm/org/objectweb/asm/commons/RemappingAnnotationAdapter.java
new file mode 100644
index 0000000..8fff2d1
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/commons/RemappingAnnotationAdapter.java
@@ -0,0 +1,79 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.objectweb.asm.commons;
+
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Opcodes;
+
+/**
+ * An {@link AnnotationVisitor} adapter for type remapping.
+ * 
+ * @author Eugene Kuleshov
+ */
+public class RemappingAnnotationAdapter extends AnnotationVisitor {
+
+    protected final Remapper remapper;
+
+    public RemappingAnnotationAdapter(final AnnotationVisitor av,
+            final Remapper remapper) {
+        this(Opcodes.ASM4, av, remapper);
+    }
+
+    protected RemappingAnnotationAdapter(final int api,
+            final AnnotationVisitor av, final Remapper remapper) {
+        super(api, av);
+        this.remapper = remapper;
+    }
+
+    @Override
+    public void visit(String name, Object value) {
+        av.visit(name, remapper.mapValue(value));
+    }
+
+    @Override
+    public void visitEnum(String name, String desc, String value) {
+        av.visitEnum(name, remapper.mapDesc(desc), value);
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotation(String name, String desc) {
+        AnnotationVisitor v = av.visitAnnotation(name, remapper.mapDesc(desc));
+        return v == null ? null : (v == av ? this
+                : new RemappingAnnotationAdapter(v, remapper));
+    }
+
+    @Override
+    public AnnotationVisitor visitArray(String name) {
+        AnnotationVisitor v = av.visitArray(name);
+        return v == null ? null : (v == av ? this
+                : new RemappingAnnotationAdapter(v, remapper));
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/commons/RemappingClassAdapter.java b/src/main/asm/org/objectweb/asm/commons/RemappingClassAdapter.java
new file mode 100644
index 0000000..f9e577d
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/commons/RemappingClassAdapter.java
@@ -0,0 +1,126 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.objectweb.asm.commons;
+
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+/**
+ * A {@link ClassVisitor} for type remapping.
+ * 
+ * @author Eugene Kuleshov
+ */
+public class RemappingClassAdapter extends ClassVisitor {
+
+    protected final Remapper remapper;
+
+    protected String className;
+
+    public RemappingClassAdapter(final ClassVisitor cv, final Remapper remapper) {
+        this(Opcodes.ASM4, cv, remapper);
+    }
+
+    protected RemappingClassAdapter(final int api, final ClassVisitor cv,
+            final Remapper remapper) {
+        super(api, cv);
+        this.remapper = remapper;
+    }
+
+    @Override
+    public void visit(int version, int access, String name, String signature,
+            String superName, String[] interfaces) {
+        this.className = name;
+        super.visit(version, access, remapper.mapType(name), remapper
+                .mapSignature(signature, false), remapper.mapType(superName),
+                interfaces == null ? null : remapper.mapTypes(interfaces));
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+        AnnotationVisitor av;
+        av = super.visitAnnotation(remapper.mapDesc(desc), visible);
+        return av == null ? null : createRemappingAnnotationAdapter(av);
+    }
+
+    @Override
+    public FieldVisitor visitField(int access, String name, String desc,
+            String signature, Object value) {
+        FieldVisitor fv = super.visitField(access,
+                remapper.mapFieldName(className, name, desc),
+                remapper.mapDesc(desc), remapper.mapSignature(signature, true),
+                remapper.mapValue(value));
+        return fv == null ? null : createRemappingFieldAdapter(fv);
+    }
+
+    @Override
+    public MethodVisitor visitMethod(int access, String name, String desc,
+            String signature, String[] exceptions) {
+        String newDesc = remapper.mapMethodDesc(desc);
+        MethodVisitor mv = super.visitMethod(access, remapper.mapMethodName(
+                className, name, desc), newDesc, remapper.mapSignature(
+                signature, false),
+                exceptions == null ? null : remapper.mapTypes(exceptions));
+        return mv == null ? null : createRemappingMethodAdapter(access,
+                newDesc, mv);
+    }
+
+    @Override
+    public void visitInnerClass(String name, String outerName,
+            String innerName, int access) {
+        // TODO should innerName be changed?
+        super.visitInnerClass(remapper.mapType(name), outerName == null ? null
+                : remapper.mapType(outerName), innerName, access);
+    }
+
+    @Override
+    public void visitOuterClass(String owner, String name, String desc) {
+        super.visitOuterClass(remapper.mapType(owner), name == null ? null
+                : remapper.mapMethodName(owner, name, desc),
+                desc == null ? null : remapper.mapMethodDesc(desc));
+    }
+
+    protected FieldVisitor createRemappingFieldAdapter(FieldVisitor fv) {
+        return new RemappingFieldAdapter(fv, remapper);
+    }
+
+    protected MethodVisitor createRemappingMethodAdapter(int access,
+            String newDesc, MethodVisitor mv) {
+        return new RemappingMethodAdapter(access, newDesc, mv, remapper);
+    }
+
+    protected AnnotationVisitor createRemappingAnnotationAdapter(
+            AnnotationVisitor av) {
+        return new RemappingAnnotationAdapter(av, remapper);
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/commons/RemappingFieldAdapter.java b/src/main/asm/org/objectweb/asm/commons/RemappingFieldAdapter.java
new file mode 100644
index 0000000..1dbee7e
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/commons/RemappingFieldAdapter.java
@@ -0,0 +1,62 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.objectweb.asm.commons;
+
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.Opcodes;
+
+/**
+ * A {@link FieldVisitor} adapter for type remapping.
+ * 
+ * @author Eugene Kuleshov
+ */
+public class RemappingFieldAdapter extends FieldVisitor {
+
+    private final Remapper remapper;
+
+    public RemappingFieldAdapter(final FieldVisitor fv, final Remapper remapper) {
+        this(Opcodes.ASM4, fv, remapper);
+    }
+
+    protected RemappingFieldAdapter(final int api, final FieldVisitor fv,
+            final Remapper remapper) {
+        super(api, fv);
+        this.remapper = remapper;
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+        AnnotationVisitor av = fv.visitAnnotation(remapper.mapDesc(desc),
+                visible);
+        return av == null ? null : new RemappingAnnotationAdapter(av, remapper);
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/commons/RemappingMethodAdapter.java b/src/main/asm/org/objectweb/asm/commons/RemappingMethodAdapter.java
new file mode 100644
index 0000000..e1c3b9c
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/commons/RemappingMethodAdapter.java
@@ -0,0 +1,161 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.objectweb.asm.commons;
+
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+/**
+ * A {@link LocalVariablesSorter} for type mapping.
+ * 
+ * @author Eugene Kuleshov
+ */
+public class RemappingMethodAdapter extends LocalVariablesSorter {
+
+    protected final Remapper remapper;
+
+    public RemappingMethodAdapter(final int access, final String desc,
+            final MethodVisitor mv, final Remapper remapper) {
+        this(Opcodes.ASM4, access, desc, mv, remapper);
+    }
+
+    protected RemappingMethodAdapter(final int api, final int access,
+            final String desc, final MethodVisitor mv, final Remapper remapper) {
+        super(api, access, desc, mv);
+        this.remapper = remapper;
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotationDefault() {
+        AnnotationVisitor av = mv.visitAnnotationDefault();
+        return av == null ? av : new RemappingAnnotationAdapter(av, remapper);
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+        AnnotationVisitor av = mv.visitAnnotation(remapper.mapDesc(desc),
+                visible);
+        return av == null ? av : new RemappingAnnotationAdapter(av, remapper);
+    }
+
+    @Override
+    public AnnotationVisitor visitParameterAnnotation(int parameter,
+            String desc, boolean visible) {
+        AnnotationVisitor av = mv.visitParameterAnnotation(parameter,
+                remapper.mapDesc(desc), visible);
+        return av == null ? av : new RemappingAnnotationAdapter(av, remapper);
+    }
+
+    @Override
+    public void visitFrame(int type, int nLocal, Object[] local, int nStack,
+            Object[] stack) {
+        super.visitFrame(type, nLocal, remapEntries(nLocal, local), nStack,
+                remapEntries(nStack, stack));
+    }
+
+    private Object[] remapEntries(int n, Object[] entries) {
+        for (int i = 0; i < n; i++) {
+            if (entries[i] instanceof String) {
+                Object[] newEntries = new Object[n];
+                if (i > 0) {
+                    System.arraycopy(entries, 0, newEntries, 0, i);
+                }
+                do {
+                    Object t = entries[i];
+                    newEntries[i++] = t instanceof String ? remapper
+                            .mapType((String) t) : t;
+                } while (i < n);
+                return newEntries;
+            }
+        }
+        return entries;
+    }
+
+    @Override
+    public void visitFieldInsn(int opcode, String owner, String name,
+            String desc) {
+        super.visitFieldInsn(opcode, remapper.mapType(owner),
+                remapper.mapFieldName(owner, name, desc),
+                remapper.mapDesc(desc));
+    }
+
+    @Override
+    public void visitMethodInsn(int opcode, String owner, String name,
+            String desc) {
+        super.visitMethodInsn(opcode, remapper.mapType(owner),
+                remapper.mapMethodName(owner, name, desc),
+                remapper.mapMethodDesc(desc));
+    }
+
+    @Override
+    public void visitInvokeDynamicInsn(String name, String desc, Handle bsm,
+            Object... bsmArgs) {
+        for (int i = 0; i < bsmArgs.length; i++) {
+            bsmArgs[i] = remapper.mapValue(bsmArgs[i]);
+        }
+        super.visitInvokeDynamicInsn(
+                remapper.mapInvokeDynamicMethodName(name, desc),
+                remapper.mapMethodDesc(desc), (Handle) remapper.mapValue(bsm),
+                bsmArgs);
+    }
+
+    @Override
+    public void visitTypeInsn(int opcode, String type) {
+        super.visitTypeInsn(opcode, remapper.mapType(type));
+    }
+
+    @Override
+    public void visitLdcInsn(Object cst) {
+        super.visitLdcInsn(remapper.mapValue(cst));
+    }
+
+    @Override
+    public void visitMultiANewArrayInsn(String desc, int dims) {
+        super.visitMultiANewArrayInsn(remapper.mapDesc(desc), dims);
+    }
+
+    @Override
+    public void visitTryCatchBlock(Label start, Label end, Label handler,
+            String type) {
+        super.visitTryCatchBlock(start, end, handler, type == null ? null
+                : remapper.mapType(type));
+    }
+
+    @Override
+    public void visitLocalVariable(String name, String desc, String signature,
+            Label start, Label end, int index) {
+        super.visitLocalVariable(name, remapper.mapDesc(desc),
+                remapper.mapSignature(signature, true), start, end, index);
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/commons/RemappingSignatureAdapter.java b/src/main/asm/org/objectweb/asm/commons/RemappingSignatureAdapter.java
new file mode 100644
index 0000000..8550bb8
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/commons/RemappingSignatureAdapter.java
@@ -0,0 +1,155 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.objectweb.asm.commons;
+
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.signature.SignatureVisitor;
+
+/**
+ * A {@link SignatureVisitor} adapter for type mapping.
+ * 
+ * @author Eugene Kuleshov
+ */
+public class RemappingSignatureAdapter extends SignatureVisitor {
+
+    private final SignatureVisitor v;
+
+    private final Remapper remapper;
+
+    private String className;
+
+    public RemappingSignatureAdapter(final SignatureVisitor v,
+            final Remapper remapper) {
+        this(Opcodes.ASM4, v, remapper);
+    }
+
+    protected RemappingSignatureAdapter(final int api,
+            final SignatureVisitor v, final Remapper remapper) {
+        super(api);
+        this.v = v;
+        this.remapper = remapper;
+    }
+
+    @Override
+    public void visitClassType(String name) {
+        className = name;
+        v.visitClassType(remapper.mapType(name));
+    }
+
+    @Override
+    public void visitInnerClassType(String name) {
+        String remappedOuter = remapper.mapType(className) + '$';
+        className = className + '$' + name;
+        String remappedName = remapper.mapType(className);
+        int index = remappedName.startsWith(remappedOuter) ? remappedOuter
+                .length() : remappedName.lastIndexOf('$') + 1;
+        v.visitInnerClassType(remappedName.substring(index));
+    }
+
+    @Override
+    public void visitFormalTypeParameter(String name) {
+        v.visitFormalTypeParameter(name);
+    }
+
+    @Override
+    public void visitTypeVariable(String name) {
+        v.visitTypeVariable(name);
+    }
+
+    @Override
+    public SignatureVisitor visitArrayType() {
+        v.visitArrayType();
+        return this;
+    }
+
+    @Override
+    public void visitBaseType(char descriptor) {
+        v.visitBaseType(descriptor);
+    }
+
+    @Override
+    public SignatureVisitor visitClassBound() {
+        v.visitClassBound();
+        return this;
+    }
+
+    @Override
+    public SignatureVisitor visitExceptionType() {
+        v.visitExceptionType();
+        return this;
+    }
+
+    @Override
+    public SignatureVisitor visitInterface() {
+        v.visitInterface();
+        return this;
+    }
+
+    @Override
+    public SignatureVisitor visitInterfaceBound() {
+        v.visitInterfaceBound();
+        return this;
+    }
+
+    @Override
+    public SignatureVisitor visitParameterType() {
+        v.visitParameterType();
+        return this;
+    }
+
+    @Override
+    public SignatureVisitor visitReturnType() {
+        v.visitReturnType();
+        return this;
+    }
+
+    @Override
+    public SignatureVisitor visitSuperclass() {
+        v.visitSuperclass();
+        return this;
+    }
+
+    @Override
+    public void visitTypeArgument() {
+        v.visitTypeArgument();
+    }
+
+    @Override
+    public SignatureVisitor visitTypeArgument(char wildcard) {
+        v.visitTypeArgument(wildcard);
+        return this;
+    }
+
+    @Override
+    public void visitEnd() {
+        v.visitEnd();
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/commons/SerialVersionUIDAdder.java b/src/main/asm/org/objectweb/asm/commons/SerialVersionUIDAdder.java
new file mode 100644
index 0000000..c7caf88
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/commons/SerialVersionUIDAdder.java
@@ -0,0 +1,515 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.commons;
+
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutput;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.security.MessageDigest;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+
+/**
+ * A {@link ClassVisitor} that adds a serial version unique identifier to a
+ * class if missing. Here is typical usage of this class:
+ *
+ * <pre>
+ *   ClassWriter cw = new ClassWriter(...);
+ *   ClassVisitor sv = new SerialVersionUIDAdder(cw);
+ *   ClassVisitor ca = new MyClassAdapter(sv);
+ *   new ClassReader(orginalClass).accept(ca, false);
+ * </pre>
+ * <p>
+ * The SVUID algorithm can be found <a href=
+ * "http://java.sun.com/j2se/1.4.2/docs/guide/serialization/spec/class.html"
+ * >http://java.sun.com/j2se/1.4.2/docs/guide/serialization/spec/class.html</a>:
+ *
+ * <pre>
+ * The serialVersionUID is computed using the signature of a stream of bytes
+ * that reflect the class definition. The National Institute of Standards and
+ * Technology (NIST) Secure Hash Algorithm (SHA-1) is used to compute a
+ * signature for the stream. The first two 32-bit quantities are used to form a
+ * 64-bit hash. A java.lang.DataOutputStream is used to convert primitive data
+ * types to a sequence of bytes. The values input to the stream are defined by
+ * the Java Virtual Machine (VM) specification for classes.
+ *
+ * The sequence of items in the stream is as follows:
+ *
+ * 1. The class name written using UTF encoding.
+ * 2. The class modifiers written as a 32-bit integer.
+ * 3. The name of each interface sorted by name written using UTF encoding.
+ * 4. For each field of the class sorted by field name (except private static
+ * and private transient fields):
+ * 1. The name of the field in UTF encoding.
+ * 2. The modifiers of the field written as a 32-bit integer.
+ * 3. The descriptor of the field in UTF encoding
+ * 5. If a class initializer exists, write out the following:
+ * 1. The name of the method, &lt;clinit&gt;, in UTF encoding.
+ * 2. The modifier of the method, java.lang.reflect.Modifier.STATIC,
+ * written as a 32-bit integer.
+ * 3. The descriptor of the method, ()V, in UTF encoding.
+ * 6. For each non-private constructor sorted by method name and signature:
+ * 1. The name of the method, &lt;init&gt;, in UTF encoding.
+ * 2. The modifiers of the method written as a 32-bit integer.
+ * 3. The descriptor of the method in UTF encoding.
+ * 7. For each non-private method sorted by method name and signature:
+ * 1. The name of the method in UTF encoding.
+ * 2. The modifiers of the method written as a 32-bit integer.
+ * 3. The descriptor of the method in UTF encoding.
+ * 8. The SHA-1 algorithm is executed on the stream of bytes produced by
+ * DataOutputStream and produces five 32-bit values sha[0..4].
+ *
+ * 9. The hash value is assembled from the first and second 32-bit values of
+ * the SHA-1 message digest. If the result of the message digest, the five
+ * 32-bit words H0 H1 H2 H3 H4, is in an array of five int values named
+ * sha, the hash value would be computed as follows:
+ *
+ * long hash = ((sha[0] &gt;&gt;&gt; 24) &amp; 0xFF) |
+ * ((sha[0] &gt;&gt;&gt; 16) &amp; 0xFF) &lt;&lt; 8 |
+ * ((sha[0] &gt;&gt;&gt; 8) &amp; 0xFF) &lt;&lt; 16 |
+ * ((sha[0] &gt;&gt;&gt; 0) &amp; 0xFF) &lt;&lt; 24 |
+ * ((sha[1] &gt;&gt;&gt; 24) &amp; 0xFF) &lt;&lt; 32 |
+ * ((sha[1] &gt;&gt;&gt; 16) &amp; 0xFF) &lt;&lt; 40 |
+ * ((sha[1] &gt;&gt;&gt; 8) &amp; 0xFF) &lt;&lt; 48 |
+ * ((sha[1] &gt;&gt;&gt; 0) &amp; 0xFF) &lt;&lt; 56;
+ * </pre>
+ *
+ * @author Rajendra Inamdar, Vishal Vishnoi
+ */
+public class SerialVersionUIDAdder extends ClassVisitor {
+
+    /**
+     * Collection of fields. (except private static and private transient
+     * fields)
+     */
+    private final Collection<Item> svuidFields;
+    /**
+     * Collection of non-private constructors.
+     */
+    private final Collection<Item> svuidConstructors;
+    /**
+     * Collection of non-private methods.
+     */
+    private final Collection<Item> svuidMethods;
+    /**
+     * Flag that indicates if we need to compute SVUID.
+     */
+    private boolean computeSVUID;
+    /**
+     * Set to true if the class already has SVUID.
+     */
+    private boolean hasSVUID;
+    /**
+     * Classes access flags.
+     */
+    private int access;
+    /**
+     * Internal name of the class
+     */
+    private String name;
+    /**
+     * Interfaces implemented by the class.
+     */
+    private String[] interfaces;
+    /**
+     * Set to true if the class has static initializer.
+     */
+    private boolean hasStaticInitializer;
+
+    /**
+     * Creates a new {@link SerialVersionUIDAdder}. <i>Subclasses must not use
+     * this constructor</i>. Instead, they must use the
+     * {@link #SerialVersionUIDAdder(int, ClassVisitor)} version.
+     *
+     * @param cv a {@link ClassVisitor} to which this visitor will delegate
+     *           calls.
+     */
+    public SerialVersionUIDAdder(final ClassVisitor cv) {
+        this(Opcodes.ASM4, cv);
+    }
+
+    /**
+     * Creates a new {@link SerialVersionUIDAdder}.
+     *
+     * @param api the ASM API version implemented by this visitor. Must be one
+     *            of {@link Opcodes#ASM4}.
+     * @param cv  a {@link ClassVisitor} to which this visitor will delegate
+     *            calls.
+     */
+    protected SerialVersionUIDAdder(final int api, final ClassVisitor cv) {
+        super(api, cv);
+        svuidFields = new ArrayList<>();
+        svuidConstructors = new ArrayList<>();
+        svuidMethods = new ArrayList<>();
+    }
+
+    // ------------------------------------------------------------------------
+    // Overriden methods
+    // ------------------------------------------------------------------------
+
+    /**
+     * Sorts the items in the collection and writes it to the data output stream
+     *
+     * @param itemCollection collection of items
+     * @param dos            a <code>DataOutputStream</code> value
+     * @param dotted         a <code>boolean</code> value
+     * @throws IOException if an error occurs
+     */
+    private static void writeItems(final Collection<Item> itemCollection,
+                                   final DataOutput dos, final boolean dotted) throws IOException {
+        int size = itemCollection.size();
+        Item[] items = itemCollection.toArray(new Item[size]);
+        Arrays.sort(items);
+        for (int i = 0; i < size; i++) {
+            dos.writeUTF(items[i].name);
+            dos.writeInt(items[i].access);
+            dos.writeUTF(dotted ? items[i].desc.replace('/', '.')
+                    : items[i].desc);
+        }
+    }
+
+    /*
+     * Visit class header and get class name, access , and interfaces
+     * information (step 1,2, and 3) for SVUID computation.
+     */
+    @Override
+    public void visit(final int version, final int access, final String name,
+                      final String signature, final String superName,
+                      final String[] interfaces) {
+        computeSVUID = (access & Opcodes.ACC_INTERFACE) == 0;
+
+        if (computeSVUID) {
+            this.name = name;
+            this.access = access;
+            this.interfaces = interfaces;
+        }
+
+        super.visit(version, access, name, signature, superName, interfaces);
+    }
+
+    /*
+     * Visit the methods and get constructor and method information (step 5 and
+     * 7). Also determine if there is a class initializer (step 6).
+     */
+    @Override
+    public MethodVisitor visitMethod(final int access, final String name,
+                                     final String desc, final String signature, final String[] exceptions) {
+        if (computeSVUID) {
+            if ("<clinit>".equals(name)) {
+                hasStaticInitializer = true;
+            }
+            /*
+             * Remembers non private constructors and methods for SVUID
+             * computation For constructor and method modifiers, only the
+             * ACC_PUBLIC, ACC_PRIVATE, ACC_PROTECTED, ACC_STATIC, ACC_FINAL,
+             * ACC_SYNCHRONIZED, ACC_NATIVE, ACC_ABSTRACT and ACC_STRICT flags
+             * are used.
+             */
+            int mods = access
+                    & (Opcodes.ACC_PUBLIC | Opcodes.ACC_PRIVATE
+                    | Opcodes.ACC_PROTECTED | Opcodes.ACC_STATIC
+                    | Opcodes.ACC_FINAL | Opcodes.ACC_SYNCHRONIZED
+                    | Opcodes.ACC_NATIVE | Opcodes.ACC_ABSTRACT | Opcodes.ACC_STRICT);
+
+            // all non private methods
+            if ((access & Opcodes.ACC_PRIVATE) == 0) {
+                if ("<init>".equals(name)) {
+                    svuidConstructors.add(new Item(name, mods, desc));
+                } else if (!"<clinit>".equals(name)) {
+                    svuidMethods.add(new Item(name, mods, desc));
+                }
+            }
+        }
+
+        return super.visitMethod(access, name, desc, signature, exceptions);
+    }
+
+    /*
+     * Gets class field information for step 4 of the algorithm. Also determines
+     * if the class already has a SVUID.
+     */
+    @Override
+    public FieldVisitor visitField(final int access, final String name,
+                                   final String desc, final String signature, final Object value) {
+        if (computeSVUID) {
+            if ("serialVersionUID".equals(name)) {
+                // since the class already has SVUID, we won't be computing it.
+                computeSVUID = false;
+                hasSVUID = true;
+            }
+            /*
+             * Remember field for SVUID computation For field modifiers, only
+             * the ACC_PUBLIC, ACC_PRIVATE, ACC_PROTECTED, ACC_STATIC,
+             * ACC_FINAL, ACC_VOLATILE, and ACC_TRANSIENT flags are used when
+             * computing serialVersionUID values.
+             */
+            if ((access & Opcodes.ACC_PRIVATE) == 0
+                    || (access & (Opcodes.ACC_STATIC | Opcodes.ACC_TRANSIENT)) == 0) {
+                int mods = access
+                        & (Opcodes.ACC_PUBLIC | Opcodes.ACC_PRIVATE
+                        | Opcodes.ACC_PROTECTED | Opcodes.ACC_STATIC
+                        | Opcodes.ACC_FINAL | Opcodes.ACC_VOLATILE | Opcodes.ACC_TRANSIENT);
+                svuidFields.add(new Item(name, mods, desc));
+            }
+        }
+
+        return super.visitField(access, name, desc, signature, value);
+    }
+
+    /**
+     * Handle a bizarre special case. Nested classes (static classes declared
+     * inside another class) that are protected have their access bit set to
+     * public in their class files to deal with some odd reflection situation.
+     * Our SVUID computation must do as the JVM does and ignore access bits in
+     * the class file in favor of the access bits InnerClass attribute.
+     */
+    @Override
+    public void visitInnerClass(final String aname, final String outerName,
+                                final String innerName, final int attr_access) {
+        if ((name != null) && name.equals(aname)) {
+            this.access = attr_access;
+        }
+        super.visitInnerClass(aname, outerName, innerName, attr_access);
+    }
+
+    // ------------------------------------------------------------------------
+    // Utility methods
+    // ------------------------------------------------------------------------
+
+    /*
+     * Add the SVUID if class doesn't have one
+     */
+    @Override
+    public void visitEnd() {
+        // compute SVUID and add it to the class
+        if (computeSVUID && !hasSVUID) {
+            try {
+                addSVUID(computeSVUID());
+            } catch (Throwable e) {
+                throw new RuntimeException("Error while computing SVUID for "
+                        + name, e);
+            }
+        }
+
+        super.visitEnd();
+    }
+
+    /**
+     * Returns true if the class already has a SVUID field. The result of this
+     * method is only valid when visitEnd is or has been called.
+     *
+     * @return true if the class already has a SVUID field.
+     */
+    public boolean hasSVUID() {
+        return hasSVUID;
+    }
+
+    protected void addSVUID(long svuid) {
+        FieldVisitor fv = super.visitField(Opcodes.ACC_FINAL
+                + Opcodes.ACC_STATIC, "serialVersionUID", "J", null, svuid);
+        if (null != fv) {
+            fv.visitEnd();
+        }
+    }
+
+    /**
+     * Computes and returns the value of SVUID.
+     *
+     * @return Returns the serial version UID
+     * @throws IOException if an I/O error occurs
+     */
+    protected long computeSVUID() throws IOException {
+        ByteArrayOutputStream bos;
+        DataOutputStream dos = null;
+        long svuid = 0;
+
+        try {
+            bos = new ByteArrayOutputStream();
+            dos = new DataOutputStream(bos);
+
+            /*
+             * 1. The class name written using UTF encoding.
+             */
+            dos.writeUTF(name.replace('/', '.'));
+
+            /*
+             * 2. The class modifiers written as a 32-bit integer.
+             */
+            dos.writeInt(access
+                    & (Opcodes.ACC_PUBLIC | Opcodes.ACC_FINAL
+                    | Opcodes.ACC_INTERFACE | Opcodes.ACC_ABSTRACT));
+
+            /*
+             * 3. The name of each interface sorted by name written using UTF
+             * encoding.
+             */
+            Arrays.sort(interfaces);
+            for (String anInterface : interfaces) {
+                dos.writeUTF(anInterface.replace('/', '.'));
+            }
+
+            /*
+             * 4. For each field of the class sorted by field name (except
+             * private static and private transient fields):
+             *
+             * 1. The name of the field in UTF encoding. 2. The modifiers of the
+             * field written as a 32-bit integer. 3. The descriptor of the field
+             * in UTF encoding
+             *
+             * Note that field signatures are not dot separated. Method and
+             * constructor signatures are dot separated. Go figure...
+             */
+            writeItems(svuidFields, dos, false);
+
+            /*
+             * 5. If a class initializer exists, write out the following: 1. The
+             * name of the method, <clinit>, in UTF encoding. 2. The modifier of
+             * the method, java.lang.reflect.Modifier.STATIC, written as a
+             * 32-bit integer. 3. The descriptor of the method, ()V, in UTF
+             * encoding.
+             */
+            if (hasStaticInitializer) {
+                dos.writeUTF("<clinit>");
+                dos.writeInt(Opcodes.ACC_STATIC);
+                dos.writeUTF("()V");
+            } // if..
+
+            /*
+             * 6. For each non-private constructor sorted by method name and
+             * signature: 1. The name of the method, <init>, in UTF encoding. 2.
+             * The modifiers of the method written as a 32-bit integer. 3. The
+             * descriptor of the method in UTF encoding.
+             */
+            writeItems(svuidConstructors, dos, true);
+
+            /*
+             * 7. For each non-private method sorted by method name and
+             * signature: 1. The name of the method in UTF encoding. 2. The
+             * modifiers of the method written as a 32-bit integer. 3. The
+             * descriptor of the method in UTF encoding.
+             */
+            writeItems(svuidMethods, dos, true);
+
+            dos.flush();
+
+            /*
+             * 8. The SHA-1 algorithm is executed on the stream of bytes
+             * produced by DataOutputStream and produces five 32-bit values
+             * sha[0..4].
+             */
+            byte[] hashBytes = computeSHAdigest(bos.toByteArray());
+
+            /*
+             * 9. The hash value is assembled from the first and second 32-bit
+             * values of the SHA-1 message digest. If the result of the message
+             * digest, the five 32-bit words H0 H1 H2 H3 H4, is in an array of
+             * five int values named sha, the hash value would be computed as
+             * follows:
+             *
+             * long hash = ((sha[0] >>> 24) & 0xFF) | ((sha[0] >>> 16) & 0xFF)
+             * << 8 | ((sha[0] >>> 8) & 0xFF) << 16 | ((sha[0] >>> 0) & 0xFF) <<
+             * 24 | ((sha[1] >>> 24) & 0xFF) << 32 | ((sha[1] >>> 16) & 0xFF) <<
+             * 40 | ((sha[1] >>> 8) & 0xFF) << 48 | ((sha[1] >>> 0) & 0xFF) <<
+             * 56;
+             */
+            for (int i = Math.min(hashBytes.length, 8) - 1; i >= 0; i--) {
+                svuid = (svuid << 8) | (hashBytes[i] & 0xFF);
+            }
+        } finally {
+            // close the stream (if open)
+            if (dos != null) {
+                dos.close();
+            }
+        }
+
+        return svuid;
+    }
+
+    /**
+     * Returns the SHA-1 message digest of the given value.
+     *
+     * @param value the value whose SHA message digest must be computed.
+     * @return the SHA-1 message digest of the given value.
+     */
+    protected byte[] computeSHAdigest(final byte[] value) {
+        try {
+            return MessageDigest.getInstance("SHA").digest(value);
+        } catch (Exception e) {
+            throw new UnsupportedOperationException(e.toString());
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // Inner classes
+    // ------------------------------------------------------------------------
+
+    private static class Item implements Comparable<Item> {
+
+        final String name;
+
+        final int access;
+
+        final String desc;
+
+        Item(final String name, final int access, final String desc) {
+            this.name = name;
+            this.access = access;
+            this.desc = desc;
+        }
+
+        public int compareTo(final Item other) {
+            int retVal = name.compareTo(other.name);
+            if (retVal == 0) {
+                retVal = desc.compareTo(other.desc);
+            }
+            return retVal;
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            if (o instanceof Item) {
+                return compareTo((Item) o) == 0;
+            }
+            return false;
+        }
+
+        @Override
+        public int hashCode() {
+            return (name + desc).hashCode();
+        }
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/commons/SimpleRemapper.java b/src/main/asm/org/objectweb/asm/commons/SimpleRemapper.java
new file mode 100644
index 0000000..95b43e5
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/commons/SimpleRemapper.java
@@ -0,0 +1,69 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.objectweb.asm.commons;
+
+import java.util.Collections;
+import java.util.Map;
+
+/**
+ * A {@link Remapper} using a {@link Map} to define its mapping.
+ * 
+ * @author Eugene Kuleshov
+ */
+public class SimpleRemapper extends Remapper {
+
+    private final Map<String, String> mapping;
+
+    public SimpleRemapper(Map<String, String> mapping) {
+        this.mapping = mapping;
+    }
+
+    public SimpleRemapper(String oldName, String newName) {
+        this.mapping = Collections.singletonMap(oldName, newName);
+    }
+
+    @Override
+    public String mapMethodName(String owner, String name, String desc) {
+        String s = map(owner + '.' + name + desc);
+        return s == null ? name : s;
+    }
+
+    @Override
+    public String mapFieldName(String owner, String name, String desc) {
+        String s = map(owner + '.' + name);
+        return s == null ? name : s;
+    }
+
+    @Override
+    public String map(String key) {
+        return mapping.get(key);
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/commons/StaticInitMerger.java b/src/main/asm/org/objectweb/asm/commons/StaticInitMerger.java
new file mode 100644
index 0000000..86c5ae3
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/commons/StaticInitMerger.java
@@ -0,0 +1,96 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.commons;
+
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+/**
+ * A {@link ClassVisitor} that merges clinit methods into a single one.
+ * 
+ * @author Eric Bruneton
+ */
+public class StaticInitMerger extends ClassVisitor {
+
+    private String name;
+
+    private MethodVisitor clinit;
+
+    private final String prefix;
+
+    private int counter;
+
+    public StaticInitMerger(final String prefix, final ClassVisitor cv) {
+        this(Opcodes.ASM4, prefix, cv);
+    }
+
+    protected StaticInitMerger(final int api, final String prefix,
+            final ClassVisitor cv) {
+        super(api, cv);
+        this.prefix = prefix;
+    }
+
+    @Override
+    public void visit(final int version, final int access, final String name,
+            final String signature, final String superName,
+            final String[] interfaces) {
+        cv.visit(version, access, name, signature, superName, interfaces);
+        this.name = name;
+    }
+
+    @Override
+    public MethodVisitor visitMethod(final int access, final String name,
+            final String desc, final String signature, final String[] exceptions) {
+        MethodVisitor mv;
+        if ("<clinit>".equals(name)) {
+            int a = Opcodes.ACC_PRIVATE + Opcodes.ACC_STATIC;
+            String n = prefix + counter++;
+            mv = cv.visitMethod(a, n, desc, signature, exceptions);
+
+            if (clinit == null) {
+                clinit = cv.visitMethod(a, name, desc, null, null);
+            }
+            clinit.visitMethodInsn(Opcodes.INVOKESTATIC, this.name, n, desc);
+        } else {
+            mv = cv.visitMethod(access, name, desc, signature, exceptions);
+        }
+        return mv;
+    }
+
+    @Override
+    public void visitEnd() {
+        if (clinit != null) {
+            clinit.visitInsn(Opcodes.RETURN);
+            clinit.visitMaxs(0, 0);
+        }
+        cv.visitEnd();
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/commons/TableSwitchGenerator.java b/src/main/asm/org/objectweb/asm/commons/TableSwitchGenerator.java
new file mode 100644
index 0000000..52bd316
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/commons/TableSwitchGenerator.java
@@ -0,0 +1,57 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.commons;
+
+import org.objectweb.asm.Label;
+
+/**
+ * A code generator for switch statements.
+ * 
+ * @author Juozas Baliuka
+ * @author Chris Nokleberg
+ * @author Eric Bruneton
+ */
+public interface TableSwitchGenerator {
+
+    /**
+     * Generates the code for a switch case.
+     * 
+     * @param key
+     *            the switch case key.
+     * @param end
+     *            a label that corresponds to the end of the switch statement.
+     */
+    void generateCase(int key, Label end);
+
+    /**
+     * Generates the code for the default switch case.
+     */
+    void generateDefault();
+}
diff --git a/src/main/asm/org/objectweb/asm/commons/TryCatchBlockSorter.java b/src/main/asm/org/objectweb/asm/commons/TryCatchBlockSorter.java
new file mode 100644
index 0000000..079c0cf
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/commons/TryCatchBlockSorter.java
@@ -0,0 +1,92 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.objectweb.asm.commons;
+
+import java.util.Collections;
+import java.util.Comparator;
+
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.tree.TryCatchBlockNode;
+
+/**
+ * A {@link MethodVisitor} adapter to sort the exception handlers. The handlers
+ * are sorted in a method innermost-to-outermost. This allows the programmer to
+ * add handlers without worrying about ordering them correctly with respect to
+ * existing, in-code handlers.
+ * 
+ * Behavior is only defined for properly-nested handlers. If any "try" blocks
+ * overlap (something that isn't possible in Java code) then this may not do
+ * what you want. In fact, this adapter just sorts by the length of the "try"
+ * block, taking advantage of the fact that a given try block must be larger
+ * than any block it contains).
+ * 
+ * @author Adrian Sampson
+ */
+public class TryCatchBlockSorter extends MethodNode {
+
+    public TryCatchBlockSorter(final MethodVisitor mv, final int access,
+            final String name, final String desc, final String signature,
+            final String[] exceptions) {
+        this(Opcodes.ASM4, mv, access, name, desc, signature, exceptions);
+    }
+
+    protected TryCatchBlockSorter(final int api, final MethodVisitor mv,
+            final int access, final String name, final String desc,
+            final String signature, final String[] exceptions) {
+        super(api, access, name, desc, signature, exceptions);
+        this.mv = mv;
+    }
+
+    @Override
+    public void visitEnd() {
+        // Compares TryCatchBlockNodes by the length of their "try" block.
+        Comparator<TryCatchBlockNode> comp = new Comparator<TryCatchBlockNode>() {
+
+            public int compare(TryCatchBlockNode t1, TryCatchBlockNode t2) {
+                int len1 = blockLength(t1);
+                int len2 = blockLength(t2);
+                return len1 - len2;
+            }
+
+            private int blockLength(TryCatchBlockNode block) {
+                int startidx = instructions.indexOf(block.start);
+                int endidx = instructions.indexOf(block.end);
+                return endidx - startidx;
+            }
+        };
+        Collections.sort(tryCatchBlocks, comp);
+        if (mv != null) {
+            accept(mv);
+        }
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/commons/package.html b/src/main/asm/org/objectweb/asm/commons/package.html
new file mode 100644
index 0000000..4ce0db8
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/commons/package.html
@@ -0,0 +1,48 @@
+<html>
+<!--
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<body>
+Provides some useful class and method adapters. <i>The preferred way of using
+these adapters is by chaining them together and to custom adapters (instead of
+inheriting from them)</i>. Indeed this approach provides more combination
+possibilities than inheritance. For instance, suppose you want to implement an
+adapter MyAdapter than needs sorted local variables and intermediate stack map
+frame values taking into account the local variables sort. By using inheritance,
+this would require MyAdapter to extend AnalyzerAdapter, itself extending
+LocalVariablesSorter. But AnalyzerAdapter is not a subclass of
+LocalVariablesSorter, so this is not possible. On the contrary, by using
+delegation, you can make LocalVariablesSorter delegate to AnalyzerAdapter,
+itself delegating to MyAdapter. In this case AnalyzerAdapter computes
+intermediate frames based on the output of LocalVariablesSorter, and MyAdapter
+can add new locals by calling the newLocal method on LocalVariablesSorter, and
+can get the stack map frame state before each instruction by reading the locals
+and stack fields in AnalyzerAdapter (this requires references from MyAdapter
+back to LocalVariablesSorter and AnalyzerAdapter).
+</body>
\ No newline at end of file
diff --git a/src/main/asm/org/objectweb/asm/package.html b/src/main/asm/org/objectweb/asm/package.html
new file mode 100644
index 0000000..2d4a765
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/package.html
@@ -0,0 +1,87 @@
+<html>
+<!--
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<body>
+Provides a small and fast bytecode manipulation framework.
+
+<p>
+The <a href="http://www.objectweb.org/asm">ASM</a> framework is organized
+around the {@link org.objectweb.asm.ClassVisitor ClassVisitor},
+{@link org.objectweb.asm.FieldVisitor FieldVisitor},
+{@link org.objectweb.asm.MethodVisitor MethodVisitor} and
+{@link org.objectweb.asm.AnnotationVisitor AnnotationVisitor} abstract classes,
+which allow one to visit the fields, methods and annotations of a class,
+including the bytecode instructions of each method.
+
+<p>
+In addition to these main abstract classes, ASM provides a {@link
+org.objectweb.asm.ClassReader ClassReader} class, that can parse an
+existing class and make a given visitor visit it. ASM also provides
+a {@link org.objectweb.asm.ClassWriter ClassWriter} class, which is
+a visitor that generates Java class files.
+
+<p>
+In order to generate a class from scratch, only the {@link
+org.objectweb.asm.ClassWriter ClassWriter} class is necessary. Indeed,
+in order to generate a class, one must just call its visit<i>Xxx</i>
+methods with the appropriate arguments to generate the desired fields
+and methods. See the "helloworld" example in the ASM distribution for
+more details about class generation.
+
+<p>
+In order to modify existing classes, one must use a {@link
+org.objectweb.asm.ClassReader ClassReader} class to analyze
+the original class, a class modifier, and a {@link org.objectweb.asm.ClassWriter
+ClassWriter} to construct the modified class. The class modifier
+is just a {@link org.objectweb.asm.ClassVisitor ClassVisitor}
+that delegates most of the work to another {@link org.objectweb.asm.ClassVisitor
+ClassVisitor}, but that sometimes changes some parameter values,
+or call additional methods, in order to implement the desired
+modification process. In order to make it easier to implement such
+class modifiers, the {@link org.objectweb.asm.ClassVisitor
+ClassVisitor} and {@link org.objectweb.asm.MethodVisitor MethodVisitor}
+classes delegate by default all the method calls they receive to an
+optional visitor. See the "adapt" example in the ASM
+distribution for more details about class modification.
+
+<p>
+The size of the core ASM library, <tt>asm.jar</tt>, is only 45KB, which is much
+smaller than the size of the
+<a href="http://jakarta.apache.org/bcel">BCEL</a> library (504KB), and than the
+size of the
+<a href="http://serp.sourceforge.net">SERP</a> library (150KB). ASM is also
+much faster than these tools. Indeed the overhead of a load time class
+transformation process is of the order of 60% with ASM, 700% or more with BCEL,
+and 1100% or more with SERP (see the <tt>test/perf</tt> directory in the ASM
+distribution)!
+
+@since ASM 1.3
+</body>
+</html>
diff --git a/src/main/asm/org/objectweb/asm/signature/SignatureReader.java b/src/main/asm/org/objectweb/asm/signature/SignatureReader.java
new file mode 100644
index 0000000..1083b3d
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/signature/SignatureReader.java
@@ -0,0 +1,228 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.signature;
+
+/**
+ * A type signature parser to make a signature visitor visit an existing
+ * signature.
+ * 
+ * @author Thomas Hallgren
+ * @author Eric Bruneton
+ */
+public class SignatureReader {
+
+    /**
+     * The signature to be read.
+     */
+    private final String signature;
+
+    /**
+     * Constructs a {@link SignatureReader} for the given signature.
+     * 
+     * @param signature
+     *            A <i>ClassSignature</i>, <i>MethodTypeSignature</i>, or
+     *            <i>FieldTypeSignature</i>.
+     */
+    public SignatureReader(final String signature) {
+        this.signature = signature;
+    }
+
+    /**
+     * Makes the given visitor visit the signature of this
+     * {@link SignatureReader}. This signature is the one specified in the
+     * constructor (see {@link #SignatureReader(String) SignatureReader}). This
+     * method is intended to be called on a {@link SignatureReader} that was
+     * created using a <i>ClassSignature</i> (such as the <code>signature</code>
+     * parameter of the {@link org.objectweb.asm.ClassVisitor#visit
+     * ClassVisitor.visit} method) or a <i>MethodTypeSignature</i> (such as the
+     * <code>signature</code> parameter of the
+     * {@link org.objectweb.asm.ClassVisitor#visitMethod
+     * ClassVisitor.visitMethod} method).
+     * 
+     * @param v
+     *            the visitor that must visit this signature.
+     */
+    public void accept(final SignatureVisitor v) {
+        String signature = this.signature;
+        int len = signature.length();
+        int pos;
+        char c;
+
+        if (signature.charAt(0) == '<') {
+            pos = 2;
+            do {
+                int end = signature.indexOf(':', pos);
+                v.visitFormalTypeParameter(signature.substring(pos - 1, end));
+                pos = end + 1;
+
+                c = signature.charAt(pos);
+                if (c == 'L' || c == '[' || c == 'T') {
+                    pos = parseType(signature, pos, v.visitClassBound());
+                }
+
+                while ((c = signature.charAt(pos++)) == ':') {
+                    pos = parseType(signature, pos, v.visitInterfaceBound());
+                }
+            } while (c != '>');
+        } else {
+            pos = 0;
+        }
+
+        if (signature.charAt(pos) == '(') {
+            pos++;
+            while (signature.charAt(pos) != ')') {
+                pos = parseType(signature, pos, v.visitParameterType());
+            }
+            pos = parseType(signature, pos + 1, v.visitReturnType());
+            while (pos < len) {
+                pos = parseType(signature, pos + 1, v.visitExceptionType());
+            }
+        } else {
+            pos = parseType(signature, pos, v.visitSuperclass());
+            while (pos < len) {
+                pos = parseType(signature, pos, v.visitInterface());
+            }
+        }
+    }
+
+    /**
+     * Makes the given visitor visit the signature of this
+     * {@link SignatureReader}. This signature is the one specified in the
+     * constructor (see {@link #SignatureReader(String) SignatureReader}). This
+     * method is intended to be called on a {@link SignatureReader} that was
+     * created using a <i>FieldTypeSignature</i>, such as the
+     * <code>signature</code> parameter of the
+     * {@link org.objectweb.asm.ClassVisitor#visitField ClassVisitor.visitField}
+     * or {@link org.objectweb.asm.MethodVisitor#visitLocalVariable
+     * MethodVisitor.visitLocalVariable} methods.
+     * 
+     * @param v
+     *            the visitor that must visit this signature.
+     */
+    public void acceptType(final SignatureVisitor v) {
+        parseType(this.signature, 0, v);
+    }
+
+    /**
+     * Parses a field type signature and makes the given visitor visit it.
+     * 
+     * @param signature
+     *            a string containing the signature that must be parsed.
+     * @param pos
+     *            index of the first character of the signature to parsed.
+     * @param v
+     *            the visitor that must visit this signature.
+     * @return the index of the first character after the parsed signature.
+     */
+    private static int parseType(final String signature, int pos,
+            final SignatureVisitor v) {
+        char c;
+        int start, end;
+        boolean visited, inner;
+        String name;
+
+        switch (c = signature.charAt(pos++)) {
+        case 'Z':
+        case 'C':
+        case 'B':
+        case 'S':
+        case 'I':
+        case 'F':
+        case 'J':
+        case 'D':
+        case 'V':
+            v.visitBaseType(c);
+            return pos;
+
+        case '[':
+            return parseType(signature, pos, v.visitArrayType());
+
+        case 'T':
+            end = signature.indexOf(';', pos);
+            v.visitTypeVariable(signature.substring(pos, end));
+            return end + 1;
+
+        default: // case 'L':
+            start = pos;
+            visited = false;
+            inner = false;
+            for (;;) {
+                switch (c = signature.charAt(pos++)) {
+                case '.':
+                case ';':
+                    if (!visited) {
+                        name = signature.substring(start, pos - 1);
+                        if (inner) {
+                            v.visitInnerClassType(name);
+                        } else {
+                            v.visitClassType(name);
+                        }
+                    }
+                    if (c == ';') {
+                        v.visitEnd();
+                        return pos;
+                    }
+                    start = pos;
+                    visited = false;
+                    inner = true;
+                    break;
+
+                case '<':
+                    name = signature.substring(start, pos - 1);
+                    if (inner) {
+                        v.visitInnerClassType(name);
+                    } else {
+                        v.visitClassType(name);
+                    }
+                    visited = true;
+                    top: for (;;) {
+                        switch (c = signature.charAt(pos)) {
+                        case '>':
+                            break top;
+                        case '*':
+                            ++pos;
+                            v.visitTypeArgument();
+                            break;
+                        case '+':
+                        case '-':
+                            pos = parseType(signature, pos + 1,
+                                    v.visitTypeArgument(c));
+                            break;
+                        default:
+                            pos = parseType(signature, pos,
+                                    v.visitTypeArgument('='));
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/signature/SignatureVisitor.java b/src/main/asm/org/objectweb/asm/signature/SignatureVisitor.java
new file mode 100644
index 0000000..c0819ed
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/signature/SignatureVisitor.java
@@ -0,0 +1,235 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.signature;
+
+import org.objectweb.asm.Opcodes;
+
+/**
+ * A visitor to visit a generic signature. The methods of this interface must be
+ * called in one of the three following orders (the last one is the only valid
+ * order for a {@link SignatureVisitor} that is returned by a method of this
+ * interface):
+ * <ul>
+ * <li><i>ClassSignature</i> = ( <tt>visitFormalTypeParameter</tt>
+ * <tt>visitClassBound</tt>? <tt>visitInterfaceBound</tt>* )* (
+ * <tt>visitSuperClass</tt> <tt>visitInterface</tt>* )</li>
+ * <li><i>MethodSignature</i> = ( <tt>visitFormalTypeParameter</tt>
+ * <tt>visitClassBound</tt>? <tt>visitInterfaceBound</tt>* )* (
+ * <tt>visitParameterType</tt>* <tt>visitReturnType</tt>
+ * <tt>visitExceptionType</tt>* )</li>
+ * <li><i>TypeSignature</i> = <tt>visitBaseType</tt> |
+ * <tt>visitTypeVariable</tt> | <tt>visitArrayType</tt> | (
+ * <tt>visitClassType</tt> <tt>visitTypeArgument</tt>* (
+ * <tt>visitInnerClassType</tt> <tt>visitTypeArgument</tt>* )* <tt>visitEnd</tt>
+ * ) )</li>
+ * </ul>
+ * 
+ * @author Thomas Hallgren
+ * @author Eric Bruneton
+ */
+public abstract class SignatureVisitor {
+
+    /**
+     * Wildcard for an "extends" type argument.
+     */
+    public final static char EXTENDS = '+';
+
+    /**
+     * Wildcard for a "super" type argument.
+     */
+    public final static char SUPER = '-';
+
+    /**
+     * Wildcard for a normal type argument.
+     */
+    public final static char INSTANCEOF = '=';
+
+    /**
+     * The ASM API version implemented by this visitor. The value of this field
+     * must be one of {@link Opcodes#ASM4}.
+     */
+    protected final int api;
+
+    /**
+     * Constructs a new {@link SignatureVisitor}.
+     * 
+     * @param api
+     *            the ASM API version implemented by this visitor. Must be one
+     *            of {@link Opcodes#ASM4}.
+     */
+    public SignatureVisitor(final int api) {
+        this.api = api;
+    }
+
+    /**
+     * Visits a formal type parameter.
+     * 
+     * @param name
+     *            the name of the formal parameter.
+     */
+    public void visitFormalTypeParameter(String name) {
+    }
+
+    /**
+     * Visits the class bound of the last visited formal type parameter.
+     * 
+     * @return a non null visitor to visit the signature of the class bound.
+     */
+    public SignatureVisitor visitClassBound() {
+        return this;
+    }
+
+    /**
+     * Visits an interface bound of the last visited formal type parameter.
+     * 
+     * @return a non null visitor to visit the signature of the interface bound.
+     */
+    public SignatureVisitor visitInterfaceBound() {
+        return this;
+    }
+
+    /**
+     * Visits the type of the super class.
+     * 
+     * @return a non null visitor to visit the signature of the super class
+     *         type.
+     */
+    public SignatureVisitor visitSuperclass() {
+        return this;
+    }
+
+    /**
+     * Visits the type of an interface implemented by the class.
+     * 
+     * @return a non null visitor to visit the signature of the interface type.
+     */
+    public SignatureVisitor visitInterface() {
+        return this;
+    }
+
+    /**
+     * Visits the type of a method parameter.
+     * 
+     * @return a non null visitor to visit the signature of the parameter type.
+     */
+    public SignatureVisitor visitParameterType() {
+        return this;
+    }
+
+    /**
+     * Visits the return type of the method.
+     * 
+     * @return a non null visitor to visit the signature of the return type.
+     */
+    public SignatureVisitor visitReturnType() {
+        return this;
+    }
+
+    /**
+     * Visits the type of a method exception.
+     * 
+     * @return a non null visitor to visit the signature of the exception type.
+     */
+    public SignatureVisitor visitExceptionType() {
+        return this;
+    }
+
+    /**
+     * Visits a signature corresponding to a primitive type.
+     * 
+     * @param descriptor
+     *            the descriptor of the primitive type, or 'V' for <tt>void</tt>
+     *            .
+     */
+    public void visitBaseType(char descriptor) {
+    }
+
+    /**
+     * Visits a signature corresponding to a type variable.
+     * 
+     * @param name
+     *            the name of the type variable.
+     */
+    public void visitTypeVariable(String name) {
+    }
+
+    /**
+     * Visits a signature corresponding to an array type.
+     * 
+     * @return a non null visitor to visit the signature of the array element
+     *         type.
+     */
+    public SignatureVisitor visitArrayType() {
+        return this;
+    }
+
+    /**
+     * Starts the visit of a signature corresponding to a class or interface
+     * type.
+     * 
+     * @param name
+     *            the internal name of the class or interface.
+     */
+    public void visitClassType(String name) {
+    }
+
+    /**
+     * Visits an inner class.
+     * 
+     * @param name
+     *            the local name of the inner class in its enclosing class.
+     */
+    public void visitInnerClassType(String name) {
+    }
+
+    /**
+     * Visits an unbounded type argument of the last visited class or inner
+     * class type.
+     */
+    public void visitTypeArgument() {
+    }
+
+    /**
+     * Visits a type argument of the last visited class or inner class type.
+     * 
+     * @param wildcard
+     *            '+', '-' or '='.
+     * @return a non null visitor to visit the signature of the type argument.
+     */
+    public SignatureVisitor visitTypeArgument(char wildcard) {
+        return this;
+    }
+
+    /**
+     * Ends the visit of a signature corresponding to a class or interface type.
+     */
+    public void visitEnd() {
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/signature/SignatureWriter.java b/src/main/asm/org/objectweb/asm/signature/SignatureWriter.java
new file mode 100644
index 0000000..361b213
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/signature/SignatureWriter.java
@@ -0,0 +1,227 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.signature;
+
+import org.objectweb.asm.Opcodes;
+
+/**
+ * A signature visitor that generates signatures in string format.
+ * 
+ * @author Thomas Hallgren
+ * @author Eric Bruneton
+ */
+public class SignatureWriter extends SignatureVisitor {
+
+    /**
+     * Buffer used to construct the signature.
+     */
+    private final StringBuffer buf = new StringBuffer();
+
+    /**
+     * Indicates if the signature contains formal type parameters.
+     */
+    private boolean hasFormals;
+
+    /**
+     * Indicates if the signature contains method parameter types.
+     */
+    private boolean hasParameters;
+
+    /**
+     * Stack used to keep track of class types that have arguments. Each element
+     * of this stack is a boolean encoded in one bit. The top of the stack is
+     * the lowest order bit. Pushing false = *2, pushing true = *2+1, popping =
+     * /2.
+     */
+    private int argumentStack;
+
+    /**
+     * Constructs a new {@link SignatureWriter} object.
+     */
+    public SignatureWriter() {
+        super(Opcodes.ASM4);
+    }
+
+    // ------------------------------------------------------------------------
+    // Implementation of the SignatureVisitor interface
+    // ------------------------------------------------------------------------
+
+    @Override
+    public void visitFormalTypeParameter(final String name) {
+        if (!hasFormals) {
+            hasFormals = true;
+            buf.append('<');
+        }
+        buf.append(name);
+        buf.append(':');
+    }
+
+    @Override
+    public SignatureVisitor visitClassBound() {
+        return this;
+    }
+
+    @Override
+    public SignatureVisitor visitInterfaceBound() {
+        buf.append(':');
+        return this;
+    }
+
+    @Override
+    public SignatureVisitor visitSuperclass() {
+        endFormals();
+        return this;
+    }
+
+    @Override
+    public SignatureVisitor visitInterface() {
+        return this;
+    }
+
+    @Override
+    public SignatureVisitor visitParameterType() {
+        endFormals();
+        if (!hasParameters) {
+            hasParameters = true;
+            buf.append('(');
+        }
+        return this;
+    }
+
+    @Override
+    public SignatureVisitor visitReturnType() {
+        endFormals();
+        if (!hasParameters) {
+            buf.append('(');
+        }
+        buf.append(')');
+        return this;
+    }
+
+    @Override
+    public SignatureVisitor visitExceptionType() {
+        buf.append('^');
+        return this;
+    }
+
+    @Override
+    public void visitBaseType(final char descriptor) {
+        buf.append(descriptor);
+    }
+
+    @Override
+    public void visitTypeVariable(final String name) {
+        buf.append('T');
+        buf.append(name);
+        buf.append(';');
+    }
+
+    @Override
+    public SignatureVisitor visitArrayType() {
+        buf.append('[');
+        return this;
+    }
+
+    @Override
+    public void visitClassType(final String name) {
+        buf.append('L');
+        buf.append(name);
+        argumentStack *= 2;
+    }
+
+    @Override
+    public void visitInnerClassType(final String name) {
+        endArguments();
+        buf.append('.');
+        buf.append(name);
+        argumentStack *= 2;
+    }
+
+    @Override
+    public void visitTypeArgument() {
+        if (argumentStack % 2 == 0) {
+            ++argumentStack;
+            buf.append('<');
+        }
+        buf.append('*');
+    }
+
+    @Override
+    public SignatureVisitor visitTypeArgument(final char wildcard) {
+        if (argumentStack % 2 == 0) {
+            ++argumentStack;
+            buf.append('<');
+        }
+        if (wildcard != '=') {
+            buf.append(wildcard);
+        }
+        return this;
+    }
+
+    @Override
+    public void visitEnd() {
+        endArguments();
+        buf.append(';');
+    }
+
+    /**
+     * Returns the signature that was built by this signature writer.
+     * 
+     * @return the signature that was built by this signature writer.
+     */
+    @Override
+    public String toString() {
+        return buf.toString();
+    }
+
+    // ------------------------------------------------------------------------
+    // Utility methods
+    // ------------------------------------------------------------------------
+
+    /**
+     * Ends the formal type parameters section of the signature.
+     */
+    private void endFormals() {
+        if (hasFormals) {
+            hasFormals = false;
+            buf.append('>');
+        }
+    }
+
+    /**
+     * Ends the type arguments of a class or inner class type.
+     */
+    private void endArguments() {
+        if (argumentStack % 2 != 0) {
+            buf.append('>');
+        }
+        argumentStack /= 2;
+    }
+}
\ No newline at end of file
diff --git a/src/main/asm/org/objectweb/asm/signature/package.html b/src/main/asm/org/objectweb/asm/signature/package.html
new file mode 100644
index 0000000..0c07d12
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/signature/package.html
@@ -0,0 +1,36 @@
+<html>
+<!--
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<body>
+Provides support for type signatures.
+
+@since ASM 2.0
+</body>
+</html>
diff --git a/src/main/asm/org/objectweb/asm/tree/AbstractInsnNode.java b/src/main/asm/org/objectweb/asm/tree/AbstractInsnNode.java
new file mode 100644
index 0000000..1637210
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/AbstractInsnNode.java
@@ -0,0 +1,248 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree;
+
+import java.util.List;
+import java.util.Map;
+
+import org.objectweb.asm.MethodVisitor;
+
+/**
+ * A node that represents a bytecode instruction. <i>An instruction can appear
+ * at most once in at most one {@link InsnList} at a time</i>.
+ * 
+ * @author Eric Bruneton
+ */
+public abstract class AbstractInsnNode {
+
+    /**
+     * The type of {@link InsnNode} instructions.
+     */
+    public static final int INSN = 0;
+
+    /**
+     * The type of {@link IntInsnNode} instructions.
+     */
+    public static final int INT_INSN = 1;
+
+    /**
+     * The type of {@link VarInsnNode} instructions.
+     */
+    public static final int VAR_INSN = 2;
+
+    /**
+     * The type of {@link TypeInsnNode} instructions.
+     */
+    public static final int TYPE_INSN = 3;
+
+    /**
+     * The type of {@link FieldInsnNode} instructions.
+     */
+    public static final int FIELD_INSN = 4;
+
+    /**
+     * The type of {@link MethodInsnNode} instructions.
+     */
+    public static final int METHOD_INSN = 5;
+
+    /**
+     * The type of {@link InvokeDynamicInsnNode} instructions.
+     */
+    public static final int INVOKE_DYNAMIC_INSN = 6;
+
+    /**
+     * The type of {@link JumpInsnNode} instructions.
+     */
+    public static final int JUMP_INSN = 7;
+
+    /**
+     * The type of {@link LabelNode} "instructions".
+     */
+    public static final int LABEL = 8;
+
+    /**
+     * The type of {@link LdcInsnNode} instructions.
+     */
+    public static final int LDC_INSN = 9;
+
+    /**
+     * The type of {@link IincInsnNode} instructions.
+     */
+    public static final int IINC_INSN = 10;
+
+    /**
+     * The type of {@link TableSwitchInsnNode} instructions.
+     */
+    public static final int TABLESWITCH_INSN = 11;
+
+    /**
+     * The type of {@link LookupSwitchInsnNode} instructions.
+     */
+    public static final int LOOKUPSWITCH_INSN = 12;
+
+    /**
+     * The type of {@link MultiANewArrayInsnNode} instructions.
+     */
+    public static final int MULTIANEWARRAY_INSN = 13;
+
+    /**
+     * The type of {@link FrameNode} "instructions".
+     */
+    public static final int FRAME = 14;
+
+    /**
+     * The type of {@link LineNumberNode} "instructions".
+     */
+    public static final int LINE = 15;
+
+    /**
+     * The opcode of this instruction.
+     */
+    protected int opcode;
+
+    /**
+     * Previous instruction in the list to which this instruction belongs.
+     */
+    AbstractInsnNode prev;
+
+    /**
+     * Next instruction in the list to which this instruction belongs.
+     */
+    AbstractInsnNode next;
+
+    /**
+     * Index of this instruction in the list to which it belongs. The value of
+     * this field is correct only when {@link InsnList#cache} is not null. A
+     * value of -1 indicates that this instruction does not belong to any
+     * {@link InsnList}.
+     */
+    int index;
+
+    /**
+     * Constructs a new {@link AbstractInsnNode}.
+     * 
+     * @param opcode
+     *            the opcode of the instruction to be constructed.
+     */
+    protected AbstractInsnNode(final int opcode) {
+        this.opcode = opcode;
+        this.index = -1;
+    }
+
+    /**
+     * Returns the opcode of this instruction.
+     * 
+     * @return the opcode of this instruction.
+     */
+    public int getOpcode() {
+        return opcode;
+    }
+
+    /**
+     * Returns the type of this instruction.
+     * 
+     * @return the type of this instruction, i.e. one the constants defined in
+     *         this class.
+     */
+    public abstract int getType();
+
+    /**
+     * Returns the previous instruction in the list to which this instruction
+     * belongs, if any.
+     * 
+     * @return the previous instruction in the list to which this instruction
+     *         belongs, if any. May be <tt>null</tt>.
+     */
+    public AbstractInsnNode getPrevious() {
+        return prev;
+    }
+
+    /**
+     * Returns the next instruction in the list to which this instruction
+     * belongs, if any.
+     * 
+     * @return the next instruction in the list to which this instruction
+     *         belongs, if any. May be <tt>null</tt>.
+     */
+    public AbstractInsnNode getNext() {
+        return next;
+    }
+
+    /**
+     * Makes the given code visitor visit this instruction.
+     * 
+     * @param cv
+     *            a code visitor.
+     */
+    public abstract void accept(final MethodVisitor cv);
+
+    /**
+     * Returns a copy of this instruction.
+     * 
+     * @param labels
+     *            a map from LabelNodes to cloned LabelNodes.
+     * @return a copy of this instruction. The returned instruction does not
+     *         belong to any {@link InsnList}.
+     */
+    public abstract AbstractInsnNode clone(
+            final Map<LabelNode, LabelNode> labels);
+
+    /**
+     * Returns the clone of the given label.
+     * 
+     * @param label
+     *            a label.
+     * @param map
+     *            a map from LabelNodes to cloned LabelNodes.
+     * @return the clone of the given label.
+     */
+    static LabelNode clone(final LabelNode label,
+            final Map<LabelNode, LabelNode> map) {
+        return map.get(label);
+    }
+
+    /**
+     * Returns the clones of the given labels.
+     * 
+     * @param labels
+     *            a list of labels.
+     * @param map
+     *            a map from LabelNodes to cloned LabelNodes.
+     * @return the clones of the given labels.
+     */
+    static LabelNode[] clone(final List<LabelNode> labels,
+            final Map<LabelNode, LabelNode> map) {
+        LabelNode[] clones = new LabelNode[labels.size()];
+        for (int i = 0; i < clones.length; ++i) {
+            clones[i] = map.get(labels.get(i));
+        }
+        return clones;
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/AnnotationNode.java b/src/main/asm/org/objectweb/asm/tree/AnnotationNode.java
new file mode 100644
index 0000000..b37023b
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/AnnotationNode.java
@@ -0,0 +1,281 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Opcodes;
+
+//import cn.edu.pku.dpartner.comm.api.context.DelayLogger;
+
+/**
+ * A node that represents an annotationn.
+ * 
+ * @author Eric Bruneton
+ */
+public class AnnotationNode extends AnnotationVisitor
+{
+
+	/**
+	 * The class descriptor of the annotation class.
+	 */
+	public String desc;
+
+	/**
+	 * The name value pairs of this annotation. Each name value pair is stored
+	 * as two consecutive elements in the list. The name is a {@link String},
+	 * and the value may be a {@link Byte}, {@link Boolean}, {@link Character},
+	 * {@link Short}, {@link Integer}, {@link Long}, {@link Float},
+	 * {@link Double}, {@link String} or {@link org.objectweb.asm.Type}, or an
+	 * two elements String array (for enumeration values), a
+	 * {@link AnnotationNode}, or a {@link List} of values of one of the
+	 * preceding types. The list may be <tt>null</tt> if there is no name value
+	 * pair.
+	 */
+	public List<Object> values;
+
+	/**
+	 * Constructs a new {@link AnnotationNode}. <i>Subclasses must not use this
+	 * constructor</i>. Instead, they must use the
+	 * {@link #AnnotationNode(int, String)} version.
+	 * 
+	 * @param desc
+	 *            the class descriptor of the annotation class.
+	 */
+	public AnnotationNode(final String desc)
+	{
+		this(Opcodes.ASM4, desc);
+	}
+
+	/**
+	 * Constructs a new {@link AnnotationNode}.
+	 * 
+	 * @param api
+	 *            the ASM API version implemented by this visitor. Must be one
+	 *            of {@link Opcodes#ASM4}.
+	 * @param desc
+	 *            the class descriptor of the annotation class.
+	 */
+	public AnnotationNode(final int api, final String desc)
+	{
+		super(api);
+		this.desc = desc;
+	}
+
+	/**
+	 * Constructs a new {@link AnnotationNode} to visit an array value.
+	 * 
+	 * @param values
+	 *            where the visited values must be stored.
+	 */
+	AnnotationNode(final List<Object> values)
+	{
+		super(Opcodes.ASM4);
+		this.values = values;
+	}
+
+	// ------------------------------------------------------------------------
+	// Implementation of the AnnotationVisitor abstract class
+	// ------------------------------------------------------------------------
+
+	@Override
+	public void visit(final String name, final Object value)
+	{
+		if (values == null)
+		{
+			values = new ArrayList<Object>(this.desc != null ? 2 : 1);
+		}
+		if (this.desc != null)
+		{
+			values.add(name);
+		}
+		// else
+		// {
+		// System.out.println("[AnnotationNode] desc is null!");
+		// values.add("");
+		// }
+		values.add(value);
+	}
+
+	@Override
+	public void visitEnum(final String name, final String desc,
+			final String value)
+	{
+		if (values == null)
+		{
+			values = new ArrayList<Object>(this.desc != null ? 2 : 1);
+		}
+		if (this.desc != null)
+		{
+			values.add(name);
+		}
+		values.add(new String[]
+		{ desc, value });
+	}
+
+	@Override
+	public AnnotationVisitor visitAnnotation(final String name,
+			final String desc)
+	{
+		if (values == null)
+		{
+			values = new ArrayList<Object>(this.desc != null ? 2 : 1);
+		}
+		if (this.desc != null)
+		{
+			values.add(name);
+		}
+		AnnotationNode annotation = new AnnotationNode(desc);
+		values.add(annotation);
+		return annotation;
+	}
+
+	@Override
+	public AnnotationVisitor visitArray(final String name)
+	{
+		if (values == null)
+		{
+			values = new ArrayList<Object>(this.desc != null ? 2 : 1);
+		}
+		if (this.desc != null)
+		{
+			values.add(name);
+		}
+		List<Object> array = new ArrayList<Object>();
+		values.add(array);
+		return new AnnotationNode(array);
+	}
+
+	@Override
+	public void visitEnd()
+	{
+	}
+
+	// ------------------------------------------------------------------------
+	// Accept methods
+	// ------------------------------------------------------------------------
+
+	/**
+	 * Checks that this annotation node is compatible with the given ASM API
+	 * version. This methods checks that this node, and all its nodes
+	 * recursively, do not contain elements that were introduced in more recent
+	 * versions of the ASM API than the given version.
+	 * 
+	 * @param api
+	 *            an ASM API version. Must be one of {@link Opcodes#ASM4}.
+	 */
+	public void check(final int api)
+	{
+		// nothing to do
+	}
+
+	/**
+	 * Makes the given visitor visit this annotation.
+	 * 
+	 * @param av
+	 *            an annotation visitor. Maybe <tt>null</tt>.
+	 */
+	public void accept(final AnnotationVisitor av)
+	{
+		if (av != null)
+		{
+			if (values != null)
+			{
+				for (int i = 0; i < values.size(); i += 2)
+				{
+					if (values.get(i) == null)
+					{
+						System.out
+								.println("[AnnotationNode] name is null!!!!!");
+					//	DelayLogger.logValue(values);
+						System.out.flush();
+						try
+						{
+							Thread.sleep(2000);
+						}
+						catch (InterruptedException e)
+						{
+							// TODO Auto-generated catch block
+							e.printStackTrace();
+						}
+					}
+					String name = (String) values.get(i);
+					Object value = values.get(i + 1);
+					accept(av, name, value);
+				}
+			}
+			av.visitEnd();
+		}
+	}
+
+	/**
+	 * Makes the given visitor visit a given annotation value.
+	 * 
+	 * @param av
+	 *            an annotation visitor. Maybe <tt>null</tt>.
+	 * @param name
+	 *            the value name.
+	 * @param value
+	 *            the actual value.
+	 */
+	static void accept(final AnnotationVisitor av, final String name,
+			final Object value)
+	{
+		if (av != null)
+		{
+			if (value instanceof String[])
+			{
+				String[] typeconst = (String[]) value;
+				av.visitEnum(name, typeconst[0], typeconst[1]);
+			}
+			else if (value instanceof AnnotationNode)
+			{
+				AnnotationNode an = (AnnotationNode) value;
+				an.accept(av.visitAnnotation(name, an.desc));
+			}
+			else if (value instanceof List)
+			{
+				AnnotationVisitor v = av.visitArray(name);
+				List<?> array = (List<?>) value;
+				for (int j = 0; j < array.size(); ++j)
+				{
+					accept(v, null, array.get(j));
+				}
+				v.visitEnd();
+			}
+			else
+			{
+				av.visit(name, value);
+			}
+		}
+	}
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/ClassNode.java b/src/main/asm/org/objectweb/asm/tree/ClassNode.java
new file mode 100644
index 0000000..11fd3bf
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/ClassNode.java
@@ -0,0 +1,345 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Attribute;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+/**
+ * A node that represents a class.
+ * 
+ * @author Eric Bruneton
+ */
+public class ClassNode extends ClassVisitor {
+
+    /**
+     * The class version.
+     */
+    public int version;
+
+    /**
+     * The class's access flags (see {@link org.objectweb.asm.Opcodes}). This
+     * field also indicates if the class is deprecated.
+     */
+    public int access;
+
+    /**
+     * The internal name of the class (see
+     * {@link org.objectweb.asm.Type#getInternalName() getInternalName}).
+     */
+    public String name;
+
+    /**
+     * The signature of the class. May be <tt>null</tt>.
+     */
+    public String signature;
+
+    /**
+     * The internal of name of the super class (see
+     * {@link org.objectweb.asm.Type#getInternalName() getInternalName}). For
+     * interfaces, the super class is {@link Object}. May be <tt>null</tt>, but
+     * only for the {@link Object} class.
+     */
+    public String superName;
+
+    /**
+     * The internal names of the class's interfaces (see
+     * {@link org.objectweb.asm.Type#getInternalName() getInternalName}). This
+     * list is a list of {@link String} objects.
+     */
+    public List<String> interfaces;
+
+    /**
+     * The name of the source file from which this class was compiled. May be
+     * <tt>null</tt>.
+     */
+    public String sourceFile;
+
+    /**
+     * Debug information to compute the correspondence between source and
+     * compiled elements of the class. May be <tt>null</tt>.
+     */
+    public String sourceDebug;
+
+    /**
+     * The internal name of the enclosing class of the class. May be
+     * <tt>null</tt>.
+     */
+    public String outerClass;
+
+    /**
+     * The name of the method that contains the class, or <tt>null</tt> if the
+     * class is not enclosed in a method.
+     */
+    public String outerMethod;
+
+    /**
+     * The descriptor of the method that contains the class, or <tt>null</tt> if
+     * the class is not enclosed in a method.
+     */
+    public String outerMethodDesc;
+
+    /**
+     * The runtime visible annotations of this class. This list is a list of
+     * {@link AnnotationNode} objects. May be <tt>null</tt>.
+     * 
+     * @associates org.objectweb.asm.tree.AnnotationNode
+     * @label visible
+     */
+    public List<AnnotationNode> visibleAnnotations;
+
+    /**
+     * The runtime invisible annotations of this class. This list is a list of
+     * {@link AnnotationNode} objects. May be <tt>null</tt>.
+     * 
+     * @associates org.objectweb.asm.tree.AnnotationNode
+     * @label invisible
+     */
+    public List<AnnotationNode> invisibleAnnotations;
+
+    /**
+     * The non standard attributes of this class. This list is a list of
+     * {@link Attribute} objects. May be <tt>null</tt>.
+     * 
+     * @associates org.objectweb.asm.Attribute
+     */
+    public List<Attribute> attrs;
+
+    /**
+     * Informations about the inner classes of this class. This list is a list
+     * of {@link InnerClassNode} objects.
+     * 
+     * @associates org.objectweb.asm.tree.InnerClassNode
+     */
+    public List<InnerClassNode> innerClasses;
+
+    /**
+     * The fields of this class. This list is a list of {@link FieldNode}
+     * objects.
+     * 
+     * @associates org.objectweb.asm.tree.FieldNode
+     */
+    public List<FieldNode> fields;
+
+    /**
+     * The methods of this class. This list is a list of {@link MethodNode}
+     * objects.
+     * 
+     * @associates org.objectweb.asm.tree.MethodNode
+     */
+    public List<MethodNode> methods;
+
+    /**
+     * Constructs a new {@link ClassNode}. <i>Subclasses must not use this
+     * constructor</i>. Instead, they must use the {@link #ClassNode(int)}
+     * version.
+     */
+    public ClassNode() {
+        this(Opcodes.ASM4);
+    }
+
+    /**
+     * Constructs a new {@link ClassNode}.
+     * 
+     * @param api
+     *            the ASM API version implemented by this visitor. Must be one
+     *            of {@link Opcodes#ASM4}.
+     */
+    public ClassNode(final int api) {
+        super(api);
+        this.interfaces = new ArrayList<String>();
+        this.innerClasses = new ArrayList<InnerClassNode>();
+        this.fields = new ArrayList<FieldNode>();
+        this.methods = new ArrayList<MethodNode>();
+    }
+
+    // ------------------------------------------------------------------------
+    // Implementation of the ClassVisitor abstract class
+    // ------------------------------------------------------------------------
+
+    @Override
+    public void visit(final int version, final int access, final String name,
+            final String signature, final String superName,
+            final String[] interfaces) {
+        this.version = version;
+        this.access = access;
+        this.name = name;
+        this.signature = signature;
+        this.superName = superName;
+        if (interfaces != null) {
+            this.interfaces.addAll(Arrays.asList(interfaces));
+        }
+    }
+
+    @Override
+    public void visitSource(final String file, final String debug) {
+        sourceFile = file;
+        sourceDebug = debug;
+    }
+
+    @Override
+    public void visitOuterClass(final String owner, final String name,
+            final String desc) {
+        outerClass = owner;
+        outerMethod = name;
+        outerMethodDesc = desc;
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotation(final String desc,
+            final boolean visible) {
+        AnnotationNode an = new AnnotationNode(desc);
+        if (visible) {
+            if (visibleAnnotations == null) {
+                visibleAnnotations = new ArrayList<AnnotationNode>(1);
+            }
+            visibleAnnotations.add(an);
+        } else {
+            if (invisibleAnnotations == null) {
+                invisibleAnnotations = new ArrayList<AnnotationNode>(1);
+            }
+            invisibleAnnotations.add(an);
+        }
+        return an;
+    }
+
+    @Override
+    public void visitAttribute(final Attribute attr) {
+        if (attrs == null) {
+            attrs = new ArrayList<Attribute>(1);
+        }
+        attrs.add(attr);
+    }
+
+    @Override
+    public void visitInnerClass(final String name, final String outerName,
+            final String innerName, final int access) {
+        InnerClassNode icn = new InnerClassNode(name, outerName, innerName,
+                access);
+        innerClasses.add(icn);
+    }
+
+    @Override
+    public FieldVisitor visitField(final int access, final String name,
+            final String desc, final String signature, final Object value) {
+        FieldNode fn = new FieldNode(access, name, desc, signature, value);
+        fields.add(fn);
+        return fn;
+    }
+
+    @Override
+    public MethodVisitor visitMethod(final int access, final String name,
+            final String desc, final String signature, final String[] exceptions) {
+        MethodNode mn = new MethodNode(access, name, desc, signature,
+                exceptions);
+        methods.add(mn);
+        return mn;
+    }
+
+    @Override
+    public void visitEnd() {
+    }
+
+    // ------------------------------------------------------------------------
+    // Accept method
+    // ------------------------------------------------------------------------
+
+    /**
+     * Checks that this class node is compatible with the given ASM API version.
+     * This methods checks that this node, and all its nodes recursively, do not
+     * contain elements that were introduced in more recent versions of the ASM
+     * API than the given version.
+     * 
+     * @param api
+     *            an ASM API version. Must be one of {@link Opcodes#ASM4}.
+     */
+    public void check(final int api) {
+        // nothing to do
+    }
+
+    /**
+     * Makes the given class visitor visit this class.
+     * 
+     * @param cv
+     *            a class visitor.
+     */
+    public void accept(final ClassVisitor cv) {
+        // visits header
+        String[] interfaces = new String[this.interfaces.size()];
+        this.interfaces.toArray(interfaces);
+        cv.visit(version, access, name, signature, superName, interfaces);
+        // visits source
+        if (sourceFile != null || sourceDebug != null) {
+            cv.visitSource(sourceFile, sourceDebug);
+        }
+        // visits outer class
+        if (outerClass != null) {
+            cv.visitOuterClass(outerClass, outerMethod, outerMethodDesc);
+        }
+        // visits attributes
+        int i, n;
+        n = visibleAnnotations == null ? 0 : visibleAnnotations.size();
+        for (i = 0; i < n; ++i) {
+            AnnotationNode an = visibleAnnotations.get(i);
+            an.accept(cv.visitAnnotation(an.desc, true));
+        }
+        n = invisibleAnnotations == null ? 0 : invisibleAnnotations.size();
+        for (i = 0; i < n; ++i) {
+            AnnotationNode an = invisibleAnnotations.get(i);
+            an.accept(cv.visitAnnotation(an.desc, false));
+        }
+        n = attrs == null ? 0 : attrs.size();
+        for (i = 0; i < n; ++i) {
+            cv.visitAttribute(attrs.get(i));
+        }
+        // visits inner classes
+        for (i = 0; i < innerClasses.size(); ++i) {
+            innerClasses.get(i).accept(cv);
+        }
+        // visits fields
+        for (i = 0; i < fields.size(); ++i) {
+            fields.get(i).accept(cv);
+        }
+        // visits methods
+        for (i = 0; i < methods.size(); ++i) {
+            methods.get(i).accept(cv);
+        }
+        // visits end
+        cv.visitEnd();
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/FieldInsnNode.java b/src/main/asm/org/objectweb/asm/tree/FieldInsnNode.java
new file mode 100644
index 0000000..a827e17
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/FieldInsnNode.java
@@ -0,0 +1,108 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree;
+
+import java.util.Map;
+
+import org.objectweb.asm.MethodVisitor;
+
+/**
+ * A node that represents a field instruction. A field instruction is an
+ * instruction that loads or stores the value of a field of an object.
+ * 
+ * @author Eric Bruneton
+ */
+public class FieldInsnNode extends AbstractInsnNode {
+
+    /**
+     * The internal name of the field's owner class (see
+     * {@link org.objectweb.asm.Type#getInternalName() getInternalName}).
+     */
+    public String owner;
+
+    /**
+     * The field's name.
+     */
+    public String name;
+
+    /**
+     * The field's descriptor (see {@link org.objectweb.asm.Type}).
+     */
+    public String desc;
+
+    /**
+     * Constructs a new {@link FieldInsnNode}.
+     * 
+     * @param opcode
+     *            the opcode of the type instruction to be constructed. This
+     *            opcode must be GETSTATIC, PUTSTATIC, GETFIELD or PUTFIELD.
+     * @param owner
+     *            the internal name of the field's owner class (see
+     *            {@link org.objectweb.asm.Type#getInternalName()
+     *            getInternalName}).
+     * @param name
+     *            the field's name.
+     * @param desc
+     *            the field's descriptor (see {@link org.objectweb.asm.Type}).
+     */
+    public FieldInsnNode(final int opcode, final String owner,
+            final String name, final String desc) {
+        super(opcode);
+        this.owner = owner;
+        this.name = name;
+        this.desc = desc;
+    }
+
+    /**
+     * Sets the opcode of this instruction.
+     * 
+     * @param opcode
+     *            the new instruction opcode. This opcode must be GETSTATIC,
+     *            PUTSTATIC, GETFIELD or PUTFIELD.
+     */
+    public void setOpcode(final int opcode) {
+        this.opcode = opcode;
+    }
+
+    @Override
+    public int getType() {
+        return FIELD_INSN;
+    }
+
+    @Override
+    public void accept(final MethodVisitor cv) {
+        cv.visitFieldInsn(opcode, owner, name, desc);
+    }
+
+    @Override
+    public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+        return new FieldInsnNode(opcode, owner, name, desc);
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/FieldNode.java b/src/main/asm/org/objectweb/asm/tree/FieldNode.java
new file mode 100644
index 0000000..8f9a2cd
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/FieldNode.java
@@ -0,0 +1,243 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Attribute;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.Opcodes;
+
+/**
+ * A node that represents a field.
+ * 
+ * @author Eric Bruneton
+ */
+public class FieldNode extends FieldVisitor {
+
+    /**
+     * The field's access flags (see {@link org.objectweb.asm.Opcodes}). This
+     * field also indicates if the field is synthetic and/or deprecated.
+     */
+    public int access;
+
+    /**
+     * The field's name.
+     */
+    public String name;
+
+    /**
+     * The field's descriptor (see {@link org.objectweb.asm.Type}).
+     */
+    public String desc;
+
+    /**
+     * The field's signature. May be <tt>null</tt>.
+     */
+    public String signature;
+
+    /**
+     * The field's initial value. This field, which may be <tt>null</tt> if the
+     * field does not have an initial value, must be an {@link Integer}, a
+     * {@link Float}, a {@link Long}, a {@link Double} or a {@link String}.
+     */
+    public Object value;
+
+    /**
+     * The runtime visible annotations of this field. This list is a list of
+     * {@link AnnotationNode} objects. May be <tt>null</tt>.
+     * 
+     * @associates org.objectweb.asm.tree.AnnotationNode
+     * @label visible
+     */
+    public List<AnnotationNode> visibleAnnotations;
+
+    /**
+     * The runtime invisible annotations of this field. This list is a list of
+     * {@link AnnotationNode} objects. May be <tt>null</tt>.
+     * 
+     * @associates org.objectweb.asm.tree.AnnotationNode
+     * @label invisible
+     */
+    public List<AnnotationNode> invisibleAnnotations;
+
+    /**
+     * The non standard attributes of this field. This list is a list of
+     * {@link Attribute} objects. May be <tt>null</tt>.
+     * 
+     * @associates org.objectweb.asm.Attribute
+     */
+    public List<Attribute> attrs;
+
+    /**
+     * Constructs a new {@link FieldNode}. <i>Subclasses must not use this
+     * constructor</i>. Instead, they must use the
+     * {@link #FieldNode(int, int, String, String, String, Object)} version.
+     * 
+     * @param access
+     *            the field's access flags (see
+     *            {@link org.objectweb.asm.Opcodes}). This parameter also
+     *            indicates if the field is synthetic and/or deprecated.
+     * @param name
+     *            the field's name.
+     * @param desc
+     *            the field's descriptor (see {@link org.objectweb.asm.Type
+     *            Type}).
+     * @param signature
+     *            the field's signature.
+     * @param value
+     *            the field's initial value. This parameter, which may be
+     *            <tt>null</tt> if the field does not have an initial value,
+     *            must be an {@link Integer}, a {@link Float}, a {@link Long}, a
+     *            {@link Double} or a {@link String}.
+     */
+    public FieldNode(final int access, final String name, final String desc,
+            final String signature, final Object value) {
+        this(Opcodes.ASM4, access, name, desc, signature, value);
+    }
+
+    /**
+     * Constructs a new {@link FieldNode}. <i>Subclasses must not use this
+     * constructor</i>. Instead, they must use the
+     * {@link #FieldNode(int, int, String, String, String, Object)} version.
+     * 
+     * @param api
+     *            the ASM API version implemented by this visitor. Must be one
+     *            of {@link Opcodes#ASM4}.
+     * @param access
+     *            the field's access flags (see
+     *            {@link org.objectweb.asm.Opcodes}). This parameter also
+     *            indicates if the field is synthetic and/or deprecated.
+     * @param name
+     *            the field's name.
+     * @param desc
+     *            the field's descriptor (see {@link org.objectweb.asm.Type
+     *            Type}).
+     * @param signature
+     *            the field's signature.
+     * @param value
+     *            the field's initial value. This parameter, which may be
+     *            <tt>null</tt> if the field does not have an initial value,
+     *            must be an {@link Integer}, a {@link Float}, a {@link Long}, a
+     *            {@link Double} or a {@link String}.
+     */
+    public FieldNode(final int api, final int access, final String name,
+            final String desc, final String signature, final Object value) {
+        super(api);
+        this.access = access;
+        this.name = name;
+        this.desc = desc;
+        this.signature = signature;
+        this.value = value;
+    }
+
+    // ------------------------------------------------------------------------
+    // Implementation of the FieldVisitor abstract class
+    // ------------------------------------------------------------------------
+
+    @Override
+    public AnnotationVisitor visitAnnotation(final String desc,
+            final boolean visible) {
+        AnnotationNode an = new AnnotationNode(desc);
+        if (visible) {
+            if (visibleAnnotations == null) {
+                visibleAnnotations = new ArrayList<AnnotationNode>(1);
+            }
+            visibleAnnotations.add(an);
+        } else {
+            if (invisibleAnnotations == null) {
+                invisibleAnnotations = new ArrayList<AnnotationNode>(1);
+            }
+            invisibleAnnotations.add(an);
+        }
+        return an;
+    }
+
+    @Override
+    public void visitAttribute(final Attribute attr) {
+        if (attrs == null) {
+            attrs = new ArrayList<Attribute>(1);
+        }
+        attrs.add(attr);
+    }
+
+    @Override
+    public void visitEnd() {
+    }
+
+    // ------------------------------------------------------------------------
+    // Accept methods
+    // ------------------------------------------------------------------------
+
+    /**
+     * Checks that this field node is compatible with the given ASM API version.
+     * This methods checks that this node, and all its nodes recursively, do not
+     * contain elements that were introduced in more recent versions of the ASM
+     * API than the given version.
+     * 
+     * @param api
+     *            an ASM API version. Must be one of {@link Opcodes#ASM4}.
+     */
+    public void check(final int api) {
+        // nothing to do
+    }
+
+    /**
+     * Makes the given class visitor visit this field.
+     * 
+     * @param cv
+     *            a class visitor.
+     */
+    public void accept(final ClassVisitor cv) {
+        FieldVisitor fv = cv.visitField(access, name, desc, signature, value);
+        if (fv == null) {
+            return;
+        }
+        int i, n;
+        n = visibleAnnotations == null ? 0 : visibleAnnotations.size();
+        for (i = 0; i < n; ++i) {
+            AnnotationNode an = visibleAnnotations.get(i);
+            an.accept(fv.visitAnnotation(an.desc, true));
+        }
+        n = invisibleAnnotations == null ? 0 : invisibleAnnotations.size();
+        for (i = 0; i < n; ++i) {
+            AnnotationNode an = invisibleAnnotations.get(i);
+            an.accept(fv.visitAnnotation(an.desc, false));
+        }
+        n = attrs == null ? 0 : attrs.size();
+        for (i = 0; i < n; ++i) {
+            fv.visitAttribute(attrs.get(i));
+        }
+        fv.visitEnd();
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/FrameNode.java b/src/main/asm/org/objectweb/asm/tree/FrameNode.java
new file mode 100644
index 0000000..bd1ea70
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/FrameNode.java
@@ -0,0 +1,210 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+/**
+ * A node that represents a stack map frame. These nodes are pseudo instruction
+ * nodes in order to be inserted in an instruction list. In fact these nodes
+ * must(*) be inserted <i>just before</i> any instruction node <b>i</b> that
+ * follows an unconditionnal branch instruction such as GOTO or THROW, that is
+ * the target of a jump instruction, or that starts an exception handler block.
+ * The stack map frame types must describe the values of the local variables and
+ * of the operand stack elements <i>just before</i> <b>i</b> is executed. <br>
+ * <br>
+ * (*) this is mandatory only for classes whose version is greater than or equal
+ * to {@link Opcodes#V1_6 V1_6}.
+ * 
+ * @author Eric Bruneton
+ */
+public class FrameNode extends AbstractInsnNode {
+
+    /**
+     * The type of this frame. Must be {@link Opcodes#F_NEW} for expanded
+     * frames, or {@link Opcodes#F_FULL}, {@link Opcodes#F_APPEND},
+     * {@link Opcodes#F_CHOP}, {@link Opcodes#F_SAME} or
+     * {@link Opcodes#F_APPEND}, {@link Opcodes#F_SAME1} for compressed frames.
+     */
+    public int type;
+
+    /**
+     * The types of the local variables of this stack map frame. Elements of
+     * this list can be Integer, String or LabelNode objects (for primitive,
+     * reference and uninitialized types respectively - see
+     * {@link MethodVisitor}).
+     */
+    public List<Object> local;
+
+    /**
+     * The types of the operand stack elements of this stack map frame. Elements
+     * of this list can be Integer, String or LabelNode objects (for primitive,
+     * reference and uninitialized types respectively - see
+     * {@link MethodVisitor}).
+     */
+    public List<Object> stack;
+
+    private FrameNode() {
+        super(-1);
+    }
+
+    /**
+     * Constructs a new {@link FrameNode}.
+     * 
+     * @param type
+     *            the type of this frame. Must be {@link Opcodes#F_NEW} for
+     *            expanded frames, or {@link Opcodes#F_FULL},
+     *            {@link Opcodes#F_APPEND}, {@link Opcodes#F_CHOP},
+     *            {@link Opcodes#F_SAME} or {@link Opcodes#F_APPEND},
+     *            {@link Opcodes#F_SAME1} for compressed frames.
+     * @param nLocal
+     *            number of local variables of this stack map frame.
+     * @param local
+     *            the types of the local variables of this stack map frame.
+     *            Elements of this list can be Integer, String or LabelNode
+     *            objects (for primitive, reference and uninitialized types
+     *            respectively - see {@link MethodVisitor}).
+     * @param nStack
+     *            number of operand stack elements of this stack map frame.
+     * @param stack
+     *            the types of the operand stack elements of this stack map
+     *            frame. Elements of this list can be Integer, String or
+     *            LabelNode objects (for primitive, reference and uninitialized
+     *            types respectively - see {@link MethodVisitor}).
+     */
+    public FrameNode(final int type, final int nLocal, final Object[] local,
+            final int nStack, final Object[] stack) {
+        super(-1);
+        this.type = type;
+        switch (type) {
+        case Opcodes.F_NEW:
+        case Opcodes.F_FULL:
+            this.local = asList(nLocal, local);
+            this.stack = asList(nStack, stack);
+            break;
+        case Opcodes.F_APPEND:
+            this.local = asList(nLocal, local);
+            break;
+        case Opcodes.F_CHOP:
+            this.local = Arrays.asList(new Object[nLocal]);
+            break;
+        case Opcodes.F_SAME:
+            break;
+        case Opcodes.F_SAME1:
+            this.stack = asList(1, stack);
+            break;
+        }
+    }
+
+    @Override
+    public int getType() {
+        return FRAME;
+    }
+
+    /**
+     * Makes the given visitor visit this stack map frame.
+     * 
+     * @param mv
+     *            a method visitor.
+     */
+    @Override
+    public void accept(final MethodVisitor mv) {
+        switch (type) {
+        case Opcodes.F_NEW:
+        case Opcodes.F_FULL:
+            mv.visitFrame(type, local.size(), asArray(local), stack.size(),
+                    asArray(stack));
+            break;
+        case Opcodes.F_APPEND:
+            mv.visitFrame(type, local.size(), asArray(local), 0, null);
+            break;
+        case Opcodes.F_CHOP:
+            mv.visitFrame(type, local.size(), null, 0, null);
+            break;
+        case Opcodes.F_SAME:
+            mv.visitFrame(type, 0, null, 0, null);
+            break;
+        case Opcodes.F_SAME1:
+            mv.visitFrame(type, 0, null, 1, asArray(stack));
+            break;
+        }
+    }
+
+    @Override
+    public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+        FrameNode clone = new FrameNode();
+        clone.type = type;
+        if (local != null) {
+            clone.local = new ArrayList<Object>();
+            for (int i = 0; i < local.size(); ++i) {
+                Object l = local.get(i);
+                if (l instanceof LabelNode) {
+                    l = labels.get(l);
+                }
+                clone.local.add(l);
+            }
+        }
+        if (stack != null) {
+            clone.stack = new ArrayList<Object>();
+            for (int i = 0; i < stack.size(); ++i) {
+                Object s = stack.get(i);
+                if (s instanceof LabelNode) {
+                    s = labels.get(s);
+                }
+                clone.stack.add(s);
+            }
+        }
+        return clone;
+    }
+
+    // ------------------------------------------------------------------------
+
+    private static List<Object> asList(final int n, final Object[] o) {
+        return Arrays.asList(o).subList(0, n);
+    }
+
+    private static Object[] asArray(final List<Object> l) {
+        Object[] objs = new Object[l.size()];
+        for (int i = 0; i < objs.length; ++i) {
+            Object o = l.get(i);
+            if (o instanceof LabelNode) {
+                o = ((LabelNode) o).getLabel();
+            }
+            objs[i] = o;
+        }
+        return objs;
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/IincInsnNode.java b/src/main/asm/org/objectweb/asm/tree/IincInsnNode.java
new file mode 100644
index 0000000..179ec6e
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/IincInsnNode.java
@@ -0,0 +1,82 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree;
+
+import java.util.Map;
+
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+/**
+ * A node that represents an IINC instruction.
+ * 
+ * @author Eric Bruneton
+ */
+public class IincInsnNode extends AbstractInsnNode {
+
+    /**
+     * Index of the local variable to be incremented.
+     */
+    public int var;
+
+    /**
+     * Amount to increment the local variable by.
+     */
+    public int incr;
+
+    /**
+     * Constructs a new {@link IincInsnNode}.
+     * 
+     * @param var
+     *            index of the local variable to be incremented.
+     * @param incr
+     *            increment amount to increment the local variable by.
+     */
+    public IincInsnNode(final int var, final int incr) {
+        super(Opcodes.IINC);
+        this.var = var;
+        this.incr = incr;
+    }
+
+    @Override
+    public int getType() {
+        return IINC_INSN;
+    }
+
+    @Override
+    public void accept(final MethodVisitor mv) {
+        mv.visitIincInsn(var, incr);
+    }
+
+    @Override
+    public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+        return new IincInsnNode(var, incr);
+    }
+}
\ No newline at end of file
diff --git a/src/main/asm/org/objectweb/asm/tree/InnerClassNode.java b/src/main/asm/org/objectweb/asm/tree/InnerClassNode.java
new file mode 100644
index 0000000..5198cfb
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/InnerClassNode.java
@@ -0,0 +1,101 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree;
+
+import org.objectweb.asm.ClassVisitor;
+
+/**
+ * A node that represents an inner class.
+ * 
+ * @author Eric Bruneton
+ */
+public class InnerClassNode {
+
+    /**
+     * The internal name of an inner class (see
+     * {@link org.objectweb.asm.Type#getInternalName() getInternalName}).
+     */
+    public String name;
+
+    /**
+     * The internal name of the class to which the inner class belongs (see
+     * {@link org.objectweb.asm.Type#getInternalName() getInternalName}). May be
+     * <tt>null</tt>.
+     */
+    public String outerName;
+
+    /**
+     * The (simple) name of the inner class inside its enclosing class. May be
+     * <tt>null</tt> for anonymous inner classes.
+     */
+    public String innerName;
+
+    /**
+     * The access flags of the inner class as originally declared in the
+     * enclosing class.
+     */
+    public int access;
+
+    /**
+     * Constructs a new {@link InnerClassNode}.
+     * 
+     * @param name
+     *            the internal name of an inner class (see
+     *            {@link org.objectweb.asm.Type#getInternalName()
+     *            getInternalName}).
+     * @param outerName
+     *            the internal name of the class to which the inner class
+     *            belongs (see {@link org.objectweb.asm.Type#getInternalName()
+     *            getInternalName}). May be <tt>null</tt>.
+     * @param innerName
+     *            the (simple) name of the inner class inside its enclosing
+     *            class. May be <tt>null</tt> for anonymous inner classes.
+     * @param access
+     *            the access flags of the inner class as originally declared in
+     *            the enclosing class.
+     */
+    public InnerClassNode(final String name, final String outerName,
+            final String innerName, final int access) {
+        this.name = name;
+        this.outerName = outerName;
+        this.innerName = innerName;
+        this.access = access;
+    }
+
+    /**
+     * Makes the given class visitor visit this inner class.
+     * 
+     * @param cv
+     *            a class visitor.
+     */
+    public void accept(final ClassVisitor cv) {
+        cv.visitInnerClass(name, outerName, innerName, access);
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/InsnList.java b/src/main/asm/org/objectweb/asm/tree/InsnList.java
new file mode 100644
index 0000000..e3630c5
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/InsnList.java
@@ -0,0 +1,600 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree;
+
+import java.util.ListIterator;
+import java.util.NoSuchElementException;
+
+import org.objectweb.asm.MethodVisitor;
+
+/**
+ * A doubly linked list of {@link AbstractInsnNode} objects. <i>This
+ * implementation is not thread safe</i>.
+ */
+public class InsnList {
+
+    /**
+     * The number of instructions in this list.
+     */
+    private int size;
+
+    /**
+     * The first instruction in this list. May be <tt>null</tt>.
+     */
+    private AbstractInsnNode first;
+
+    /**
+     * The last instruction in this list. May be <tt>null</tt>.
+     */
+    private AbstractInsnNode last;
+
+    /**
+     * A cache of the instructions of this list. This cache is used to improve
+     * the performance of the {@link #get} method.
+     */
+    AbstractInsnNode[] cache;
+
+    /**
+     * Returns the number of instructions in this list.
+     * 
+     * @return the number of instructions in this list.
+     */
+    public int size() {
+        return size;
+    }
+
+    /**
+     * Returns the first instruction in this list.
+     * 
+     * @return the first instruction in this list, or <tt>null</tt> if the list
+     *         is empty.
+     */
+    public AbstractInsnNode getFirst() {
+        return first;
+    }
+
+    /**
+     * Returns the last instruction in this list.
+     * 
+     * @return the last instruction in this list, or <tt>null</tt> if the list
+     *         is empty.
+     */
+    public AbstractInsnNode getLast() {
+        return last;
+    }
+
+    /**
+     * Returns the instruction whose index is given. This method builds a cache
+     * of the instructions in this list to avoid scanning the whole list each
+     * time it is called. Once the cache is built, this method run in constant
+     * time. This cache is invalidated by all the methods that modify the list.
+     * 
+     * @param index
+     *            the index of the instruction that must be returned.
+     * @return the instruction whose index is given.
+     * @throws IndexOutOfBoundsException
+     *             if (index < 0 || index >= size()).
+     */
+    public AbstractInsnNode get(final int index) {
+        if (index < 0 || index >= size) {
+            throw new IndexOutOfBoundsException();
+        }
+        if (cache == null) {
+            cache = toArray();
+        }
+        return cache[index];
+    }
+
+    /**
+     * Returns <tt>true</tt> if the given instruction belongs to this list. This
+     * method always scans the instructions of this list until it finds the
+     * given instruction or reaches the end of the list.
+     * 
+     * @param insn
+     *            an instruction.
+     * @return <tt>true</tt> if the given instruction belongs to this list.
+     */
+    public boolean contains(final AbstractInsnNode insn) {
+        AbstractInsnNode i = first;
+        while (i != null && i != insn) {
+            i = i.next;
+        }
+        return i != null;
+    }
+
+    /**
+     * Returns the index of the given instruction in this list. This method
+     * builds a cache of the instruction indexes to avoid scanning the whole
+     * list each time it is called. Once the cache is built, this method run in
+     * constant time. The cache is invalidated by all the methods that modify
+     * the list.
+     * 
+     * @param insn
+     *            an instruction <i>of this list</i>.
+     * @return the index of the given instruction in this list. <i>The result of
+     *         this method is undefined if the given instruction does not belong
+     *         to this list</i>. Use {@link #contains contains} to test if an
+     *         instruction belongs to an instruction list or not.
+     */
+    public int indexOf(final AbstractInsnNode insn) {
+        if (cache == null) {
+            cache = toArray();
+        }
+        return insn.index;
+    }
+
+    /**
+     * Makes the given visitor visit all of the instructions in this list.
+     * 
+     * @param mv
+     *            the method visitor that must visit the instructions.
+     */
+    public void accept(final MethodVisitor mv) {
+        AbstractInsnNode insn = first;
+        while (insn != null) {
+            insn.accept(mv);
+            insn = insn.next;
+        }
+    }
+
+    /**
+     * Returns an iterator over the instructions in this list.
+     * 
+     * @return an iterator over the instructions in this list.
+     */
+    public ListIterator<AbstractInsnNode> iterator() {
+        return iterator(0);
+    }
+
+    /**
+     * Returns an iterator over the instructions in this list.
+     * 
+     * @return an iterator over the instructions in this list.
+     */
+    @SuppressWarnings("unchecked")
+    public ListIterator<AbstractInsnNode> iterator(int index) {
+        return new InsnListIterator(index);
+    }
+
+    /**
+     * Returns an array containing all of the instructions in this list.
+     * 
+     * @return an array containing all of the instructions in this list.
+     */
+    public AbstractInsnNode[] toArray() {
+        int i = 0;
+        AbstractInsnNode elem = first;
+        AbstractInsnNode[] insns = new AbstractInsnNode[size];
+        while (elem != null) {
+            insns[i] = elem;
+            elem.index = i++;
+            elem = elem.next;
+        }
+        return insns;
+    }
+
+    /**
+     * Replaces an instruction of this list with another instruction.
+     * 
+     * @param location
+     *            an instruction <i>of this list</i>.
+     * @param insn
+     *            another instruction, <i>which must not belong to any
+     *            {@link InsnList}</i>.
+     */
+    public void set(final AbstractInsnNode location, final AbstractInsnNode insn) {
+        AbstractInsnNode next = location.next;
+        insn.next = next;
+        if (next != null) {
+            next.prev = insn;
+        } else {
+            last = insn;
+        }
+        AbstractInsnNode prev = location.prev;
+        insn.prev = prev;
+        if (prev != null) {
+            prev.next = insn;
+        } else {
+            first = insn;
+        }
+        if (cache != null) {
+            int index = location.index;
+            cache[index] = insn;
+            insn.index = index;
+        } else {
+            insn.index = 0; // insn now belongs to an InsnList
+        }
+        location.index = -1; // i no longer belongs to an InsnList
+        location.prev = null;
+        location.next = null;
+    }
+
+    /**
+     * Adds the given instruction to the end of this list.
+     * 
+     * @param insn
+     *            an instruction, <i>which must not belong to any
+     *            {@link InsnList}</i>.
+     */
+    public void add(final AbstractInsnNode insn) {
+        ++size;
+        if (last == null) {
+            first = insn;
+            last = insn;
+        } else {
+            last.next = insn;
+            insn.prev = last;
+        }
+        last = insn;
+        cache = null;
+        insn.index = 0; // insn now belongs to an InsnList
+    }
+
+    /**
+     * Adds the given instructions to the end of this list.
+     * 
+     * @param insns
+     *            an instruction list, which is cleared during the process. This
+     *            list must be different from 'this'.
+     */
+    public void add(final InsnList insns) {
+        if (insns.size == 0) {
+            return;
+        }
+        size += insns.size;
+        if (last == null) {
+            first = insns.first;
+            last = insns.last;
+        } else {
+            AbstractInsnNode elem = insns.first;
+            last.next = elem;
+            elem.prev = last;
+            last = insns.last;
+        }
+        cache = null;
+        insns.removeAll(false);
+    }
+
+    /**
+     * Inserts the given instruction at the begining of this list.
+     * 
+     * @param insn
+     *            an instruction, <i>which must not belong to any
+     *            {@link InsnList}</i>.
+     */
+    public void insert(final AbstractInsnNode insn) {
+        ++size;
+        if (first == null) {
+            first = insn;
+            last = insn;
+        } else {
+            first.prev = insn;
+            insn.next = first;
+        }
+        first = insn;
+        cache = null;
+        insn.index = 0; // insn now belongs to an InsnList
+    }
+
+    /**
+     * Inserts the given instructions at the begining of this list.
+     * 
+     * @param insns
+     *            an instruction list, which is cleared during the process. This
+     *            list must be different from 'this'.
+     */
+    public void insert(final InsnList insns) {
+        if (insns.size == 0) {
+            return;
+        }
+        size += insns.size;
+        if (first == null) {
+            first = insns.first;
+            last = insns.last;
+        } else {
+            AbstractInsnNode elem = insns.last;
+            first.prev = elem;
+            elem.next = first;
+            first = insns.first;
+        }
+        cache = null;
+        insns.removeAll(false);
+    }
+
+    /**
+     * Inserts the given instruction after the specified instruction.
+     * 
+     * @param location
+     *            an instruction <i>of this list</i> after which insn must be
+     *            inserted.
+     * @param insn
+     *            the instruction to be inserted, <i>which must not belong to
+     *            any {@link InsnList}</i>.
+     */
+    public void insert(final AbstractInsnNode location,
+            final AbstractInsnNode insn) {
+        ++size;
+        AbstractInsnNode next = location.next;
+        if (next == null) {
+            last = insn;
+        } else {
+            next.prev = insn;
+        }
+        location.next = insn;
+        insn.next = next;
+        insn.prev = location;
+        cache = null;
+        insn.index = 0; // insn now belongs to an InsnList
+    }
+
+    /**
+     * Inserts the given instructions after the specified instruction.
+     * 
+     * @param location
+     *            an instruction <i>of this list</i> after which the
+     *            instructions must be inserted.
+     * @param insns
+     *            the instruction list to be inserted, which is cleared during
+     *            the process. This list must be different from 'this'.
+     */
+    public void insert(final AbstractInsnNode location, final InsnList insns) {
+        if (insns.size == 0) {
+            return;
+        }
+        size += insns.size;
+        AbstractInsnNode ifirst = insns.first;
+        AbstractInsnNode ilast = insns.last;
+        AbstractInsnNode next = location.next;
+        if (next == null) {
+            last = ilast;
+        } else {
+            next.prev = ilast;
+        }
+        location.next = ifirst;
+        ilast.next = next;
+        ifirst.prev = location;
+        cache = null;
+        insns.removeAll(false);
+    }
+
+    /**
+     * Inserts the given instruction before the specified instruction.
+     * 
+     * @param location
+     *            an instruction <i>of this list</i> before which insn must be
+     *            inserted.
+     * @param insn
+     *            the instruction to be inserted, <i>which must not belong to
+     *            any {@link InsnList}</i>.
+     */
+    public void insertBefore(final AbstractInsnNode location,
+            final AbstractInsnNode insn) {
+        ++size;
+        AbstractInsnNode prev = location.prev;
+        if (prev == null) {
+            first = insn;
+        } else {
+            prev.next = insn;
+        }
+        location.prev = insn;
+        insn.next = location;
+        insn.prev = prev;
+        cache = null;
+        insn.index = 0; // insn now belongs to an InsnList
+    }
+
+    /**
+     * Inserts the given instructions before the specified instruction.
+     * 
+     * @param location
+     *            an instruction <i>of this list</i> before which the
+     *            instructions must be inserted.
+     * @param insns
+     *            the instruction list to be inserted, which is cleared during
+     *            the process. This list must be different from 'this'.
+     */
+    public void insertBefore(final AbstractInsnNode location,
+            final InsnList insns) {
+        if (insns.size == 0) {
+            return;
+        }
+        size += insns.size;
+        AbstractInsnNode ifirst = insns.first;
+        AbstractInsnNode ilast = insns.last;
+        AbstractInsnNode prev = location.prev;
+        if (prev == null) {
+            first = ifirst;
+        } else {
+            prev.next = ifirst;
+        }
+        location.prev = ilast;
+        ilast.next = location;
+        ifirst.prev = prev;
+        cache = null;
+        insns.removeAll(false);
+    }
+
+    /**
+     * Removes the given instruction from this list.
+     * 
+     * @param insn
+     *            the instruction <i>of this list</i> that must be removed.
+     */
+    public void remove(final AbstractInsnNode insn) {
+        --size;
+        AbstractInsnNode next = insn.next;
+        AbstractInsnNode prev = insn.prev;
+        if (next == null) {
+            if (prev == null) {
+                first = null;
+                last = null;
+            } else {
+                prev.next = null;
+                last = prev;
+            }
+        } else {
+            if (prev == null) {
+                first = next;
+                next.prev = null;
+            } else {
+                prev.next = next;
+                next.prev = prev;
+            }
+        }
+        cache = null;
+        insn.index = -1; // insn no longer belongs to an InsnList
+        insn.prev = null;
+        insn.next = null;
+    }
+
+    /**
+     * Removes all of the instructions of this list.
+     * 
+     * @param mark
+     *            if the instructions must be marked as no longer belonging to
+     *            any {@link InsnList}.
+     */
+    void removeAll(final boolean mark) {
+        if (mark) {
+            AbstractInsnNode insn = first;
+            while (insn != null) {
+                AbstractInsnNode next = insn.next;
+                insn.index = -1; // insn no longer belongs to an InsnList
+                insn.prev = null;
+                insn.next = null;
+                insn = next;
+            }
+        }
+        size = 0;
+        first = null;
+        last = null;
+        cache = null;
+    }
+
+    /**
+     * Removes all of the instructions of this list.
+     */
+    public void clear() {
+        removeAll(false);
+    }
+
+    /**
+     * Reset all labels in the instruction list. This method should be called
+     * before reusing same instructions list between several
+     * <code>ClassWriter</code>s.
+     */
+    public void resetLabels() {
+        AbstractInsnNode insn = first;
+        while (insn != null) {
+            if (insn instanceof LabelNode) {
+                ((LabelNode) insn).resetLabel();
+            }
+            insn = insn.next;
+        }
+    }
+
+    // this class is not generified because it will create bridges
+    private final class InsnListIterator implements ListIterator {
+
+        AbstractInsnNode next;
+
+        AbstractInsnNode prev;
+
+        InsnListIterator(int index) {
+            if (index == size()) {
+                next = null;
+                prev = getLast();
+            } else {
+                next = get(index);
+                prev = next.prev;
+            }
+        }
+
+        public boolean hasNext() {
+            return next != null;
+        }
+
+        public Object next() {
+            if (next == null) {
+                throw new NoSuchElementException();
+            }
+            AbstractInsnNode result = next;
+            prev = result;
+            next = result.next;
+            return result;
+        }
+
+        public void remove() {
+            InsnList.this.remove(prev);
+            prev = prev.prev;
+        }
+
+        public boolean hasPrevious() {
+            return prev != null;
+        }
+
+        public Object previous() {
+            AbstractInsnNode result = prev;
+            next = result;
+            prev = result.prev;
+            return result;
+        }
+
+        public int nextIndex() {
+            if (next == null) {
+                return size();
+            }
+            if (cache == null) {
+                cache = toArray();
+            }
+            return next.index;
+        }
+
+        public int previousIndex() {
+            if (prev == null) {
+                return -1;
+            }
+            if (cache == null) {
+                cache = toArray();
+            }
+            return prev.index;
+        }
+
+        public void add(Object o) {
+            InsnList.this.insertBefore(next, (AbstractInsnNode) o);
+            prev = (AbstractInsnNode) o;
+        }
+
+        public void set(Object o) {
+            InsnList.this.set(next.prev, (AbstractInsnNode) o);
+            prev = (AbstractInsnNode) o;
+        }
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/InsnNode.java b/src/main/asm/org/objectweb/asm/tree/InsnNode.java
new file mode 100644
index 0000000..7221098
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/InsnNode.java
@@ -0,0 +1,87 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree;
+
+import java.util.Map;
+
+import org.objectweb.asm.MethodVisitor;
+
+/**
+ * A node that represents a zero operand instruction.
+ * 
+ * @author Eric Bruneton
+ */
+public class InsnNode extends AbstractInsnNode {
+
+    /**
+     * Constructs a new {@link InsnNode}.
+     * 
+     * @param opcode
+     *            the opcode of the instruction to be constructed. This opcode
+     *            must be NOP, ACONST_NULL, ICONST_M1, ICONST_0, ICONST_1,
+     *            ICONST_2, ICONST_3, ICONST_4, ICONST_5, LCONST_0, LCONST_1,
+     *            FCONST_0, FCONST_1, FCONST_2, DCONST_0, DCONST_1, IALOAD,
+     *            LALOAD, FALOAD, DALOAD, AALOAD, BALOAD, CALOAD, SALOAD,
+     *            IASTORE, LASTORE, FASTORE, DASTORE, AASTORE, BASTORE, CASTORE,
+     *            SASTORE, POP, POP2, DUP, DUP_X1, DUP_X2, DUP2, DUP2_X1,
+     *            DUP2_X2, SWAP, IADD, LADD, FADD, DADD, ISUB, LSUB, FSUB, DSUB,
+     *            IMUL, LMUL, FMUL, DMUL, IDIV, LDIV, FDIV, DDIV, IREM, LREM,
+     *            FREM, DREM, INEG, LNEG, FNEG, DNEG, ISHL, LSHL, ISHR, LSHR,
+     *            IUSHR, LUSHR, IAND, LAND, IOR, LOR, IXOR, LXOR, I2L, I2F, I2D,
+     *            L2I, L2F, L2D, F2I, F2L, F2D, D2I, D2L, D2F, I2B, I2C, I2S,
+     *            LCMP, FCMPL, FCMPG, DCMPL, DCMPG, IRETURN, LRETURN, FRETURN,
+     *            DRETURN, ARETURN, RETURN, ARRAYLENGTH, ATHROW, MONITORENTER,
+     *            or MONITOREXIT.
+     */
+    public InsnNode(final int opcode) {
+        super(opcode);
+    }
+
+    @Override
+    public int getType() {
+        return INSN;
+    }
+
+    /**
+     * Makes the given visitor visit this instruction.
+     * 
+     * @param mv
+     *            a method visitor.
+     */
+    @Override
+    public void accept(final MethodVisitor mv) {
+        mv.visitInsn(opcode);
+    }
+
+    @Override
+    public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+        return new InsnNode(opcode);
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/IntInsnNode.java b/src/main/asm/org/objectweb/asm/tree/IntInsnNode.java
new file mode 100644
index 0000000..9fa80df
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/IntInsnNode.java
@@ -0,0 +1,87 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree;
+
+import java.util.Map;
+
+import org.objectweb.asm.MethodVisitor;
+
+/**
+ * A node that represents an instruction with a single int operand.
+ * 
+ * @author Eric Bruneton
+ */
+public class IntInsnNode extends AbstractInsnNode {
+
+    /**
+     * The operand of this instruction.
+     */
+    public int operand;
+
+    /**
+     * Constructs a new {@link IntInsnNode}.
+     * 
+     * @param opcode
+     *            the opcode of the instruction to be constructed. This opcode
+     *            must be BIPUSH, SIPUSH or NEWARRAY.
+     * @param operand
+     *            the operand of the instruction to be constructed.
+     */
+    public IntInsnNode(final int opcode, final int operand) {
+        super(opcode);
+        this.operand = operand;
+    }
+
+    /**
+     * Sets the opcode of this instruction.
+     * 
+     * @param opcode
+     *            the new instruction opcode. This opcode must be BIPUSH, SIPUSH
+     *            or NEWARRAY.
+     */
+    public void setOpcode(final int opcode) {
+        this.opcode = opcode;
+    }
+
+    @Override
+    public int getType() {
+        return INT_INSN;
+    }
+
+    @Override
+    public void accept(final MethodVisitor mv) {
+        mv.visitIntInsn(opcode, operand);
+    }
+
+    @Override
+    public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+        return new IntInsnNode(opcode, operand);
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/InvokeDynamicInsnNode.java b/src/main/asm/org/objectweb/asm/tree/InvokeDynamicInsnNode.java
new file mode 100644
index 0000000..2ae1d97
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/InvokeDynamicInsnNode.java
@@ -0,0 +1,100 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree;
+
+import java.util.Map;
+
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+/**
+ * A node that represents an invokedynamic instruction.
+ * 
+ * @author Remi Forax
+ */
+public class InvokeDynamicInsnNode extends AbstractInsnNode {
+
+    /**
+     * Invokedynamic name.
+     */
+    public String name;
+
+    /**
+     * Invokedynamic descriptor.
+     */
+    public String desc;
+
+    /**
+     * Bootstrap method
+     */
+    public Handle bsm;
+
+    /**
+     * Bootstrap constant arguments
+     */
+    public Object[] bsmArgs;
+
+    /**
+     * Constructs a new {@link InvokeDynamicInsnNode}.
+     * 
+     * @param name
+     *            invokedynamic name.
+     * @param desc
+     *            invokedynamic descriptor (see {@link org.objectweb.asm.Type}).
+     * @param bsm
+     *            the bootstrap method.
+     * @param bsmArgs
+     *            the boostrap constant arguments.
+     */
+    public InvokeDynamicInsnNode(final String name, final String desc,
+            final Handle bsm, final Object... bsmArgs) {
+        super(Opcodes.INVOKEDYNAMIC);
+        this.name = name;
+        this.desc = desc;
+        this.bsm = bsm;
+        this.bsmArgs = bsmArgs;
+    }
+
+    @Override
+    public int getType() {
+        return INVOKE_DYNAMIC_INSN;
+    }
+
+    @Override
+    public void accept(final MethodVisitor mv) {
+        mv.visitInvokeDynamicInsn(name, desc, bsm, bsmArgs);
+    }
+
+    @Override
+    public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+        return new InvokeDynamicInsnNode(name, desc, bsm, bsmArgs);
+    }
+}
\ No newline at end of file
diff --git a/src/main/asm/org/objectweb/asm/tree/JumpInsnNode.java b/src/main/asm/org/objectweb/asm/tree/JumpInsnNode.java
new file mode 100644
index 0000000..9cb1dcb
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/JumpInsnNode.java
@@ -0,0 +1,95 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree;
+
+import java.util.Map;
+
+import org.objectweb.asm.MethodVisitor;
+
+/**
+ * A node that represents a jump instruction. A jump instruction is an
+ * instruction that may jump to another instruction.
+ * 
+ * @author Eric Bruneton
+ */
+public class JumpInsnNode extends AbstractInsnNode {
+
+    /**
+     * The operand of this instruction. This operand is a label that designates
+     * the instruction to which this instruction may jump.
+     */
+    public LabelNode label;
+
+    /**
+     * Constructs a new {@link JumpInsnNode}.
+     * 
+     * @param opcode
+     *            the opcode of the type instruction to be constructed. This
+     *            opcode must be IFEQ, IFNE, IFLT, IFGE, IFGT, IFLE, IF_ICMPEQ,
+     *            IF_ICMPNE, IF_ICMPLT, IF_ICMPGE, IF_ICMPGT, IF_ICMPLE,
+     *            IF_ACMPEQ, IF_ACMPNE, GOTO, JSR, IFNULL or IFNONNULL.
+     * @param label
+     *            the operand of the instruction to be constructed. This operand
+     *            is a label that designates the instruction to which the jump
+     *            instruction may jump.
+     */
+    public JumpInsnNode(final int opcode, final LabelNode label) {
+        super(opcode);
+        this.label = label;
+    }
+
+    /**
+     * Sets the opcode of this instruction.
+     * 
+     * @param opcode
+     *            the new instruction opcode. This opcode must be IFEQ, IFNE,
+     *            IFLT, IFGE, IFGT, IFLE, IF_ICMPEQ, IF_ICMPNE, IF_ICMPLT,
+     *            IF_ICMPGE, IF_ICMPGT, IF_ICMPLE, IF_ACMPEQ, IF_ACMPNE, GOTO,
+     *            JSR, IFNULL or IFNONNULL.
+     */
+    public void setOpcode(final int opcode) {
+        this.opcode = opcode;
+    }
+
+    @Override
+    public int getType() {
+        return JUMP_INSN;
+    }
+
+    @Override
+    public void accept(final MethodVisitor mv) {
+        mv.visitJumpInsn(opcode, label.getLabel());
+    }
+
+    @Override
+    public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+        return new JumpInsnNode(opcode, clone(label, labels));
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/LabelNode.java b/src/main/asm/org/objectweb/asm/tree/LabelNode.java
new file mode 100644
index 0000000..b6381bd
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/LabelNode.java
@@ -0,0 +1,78 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree;
+
+import java.util.Map;
+
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+
+/**
+ * An {@link AbstractInsnNode} that encapsulates a {@link Label}.
+ */
+public class LabelNode extends AbstractInsnNode {
+
+    private Label label;
+
+    public LabelNode() {
+        super(-1);
+    }
+
+    public LabelNode(final Label label) {
+        super(-1);
+        this.label = label;
+    }
+
+    @Override
+    public int getType() {
+        return LABEL;
+    }
+
+    public Label getLabel() {
+        if (label == null) {
+            label = new Label();
+        }
+        return label;
+    }
+
+    @Override
+    public void accept(final MethodVisitor cv) {
+        cv.visitLabel(getLabel());
+    }
+
+    @Override
+    public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+        return labels.get(this);
+    }
+
+    public void resetLabel() {
+        label = null;
+    }
+}
\ No newline at end of file
diff --git a/src/main/asm/org/objectweb/asm/tree/LdcInsnNode.java b/src/main/asm/org/objectweb/asm/tree/LdcInsnNode.java
new file mode 100644
index 0000000..9209f46
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/LdcInsnNode.java
@@ -0,0 +1,78 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree;
+
+import java.util.Map;
+
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+/**
+ * A node that represents an LDC instruction.
+ * 
+ * @author Eric Bruneton
+ */
+public class LdcInsnNode extends AbstractInsnNode {
+
+    /**
+     * The constant to be loaded on the stack. This parameter must be a non null
+     * {@link Integer}, a {@link Float}, a {@link Long}, a {@link Double}, a
+     * {@link String} or a {@link org.objectweb.asm.Type}.
+     */
+    public Object cst;
+
+    /**
+     * Constructs a new {@link LdcInsnNode}.
+     * 
+     * @param cst
+     *            the constant to be loaded on the stack. This parameter must be
+     *            a non null {@link Integer}, a {@link Float}, a {@link Long}, a
+     *            {@link Double} or a {@link String}.
+     */
+    public LdcInsnNode(final Object cst) {
+        super(Opcodes.LDC);
+        this.cst = cst;
+    }
+
+    @Override
+    public int getType() {
+        return LDC_INSN;
+    }
+
+    @Override
+    public void accept(final MethodVisitor mv) {
+        mv.visitLdcInsn(cst);
+    }
+
+    @Override
+    public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+        return new LdcInsnNode(cst);
+    }
+}
\ No newline at end of file
diff --git a/src/main/asm/org/objectweb/asm/tree/LineNumberNode.java b/src/main/asm/org/objectweb/asm/tree/LineNumberNode.java
new file mode 100644
index 0000000..cda1694
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/LineNumberNode.java
@@ -0,0 +1,84 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree;
+
+import java.util.Map;
+
+import org.objectweb.asm.MethodVisitor;
+
+/**
+ * A node that represents a line number declaration. These nodes are pseudo
+ * instruction nodes in order to be inserted in an instruction list.
+ * 
+ * @author Eric Bruneton
+ */
+public class LineNumberNode extends AbstractInsnNode {
+
+    /**
+     * A line number. This number refers to the source file from which the class
+     * was compiled.
+     */
+    public int line;
+
+    /**
+     * The first instruction corresponding to this line number.
+     */
+    public LabelNode start;
+
+    /**
+     * Constructs a new {@link LineNumberNode}.
+     * 
+     * @param line
+     *            a line number. This number refers to the source file from
+     *            which the class was compiled.
+     * @param start
+     *            the first instruction corresponding to this line number.
+     */
+    public LineNumberNode(final int line, final LabelNode start) {
+        super(-1);
+        this.line = line;
+        this.start = start;
+    }
+
+    @Override
+    public int getType() {
+        return LINE;
+    }
+
+    @Override
+    public void accept(final MethodVisitor mv) {
+        mv.visitLineNumber(line, start.getLabel());
+    }
+
+    @Override
+    public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+        return new LineNumberNode(line, clone(start, labels));
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/LocalVariableNode.java b/src/main/asm/org/objectweb/asm/tree/LocalVariableNode.java
new file mode 100644
index 0000000..033f83e
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/LocalVariableNode.java
@@ -0,0 +1,112 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree;
+
+import org.objectweb.asm.MethodVisitor;
+
+/**
+ * A node that represents a local variable declaration.
+ * 
+ * @author Eric Bruneton
+ */
+public class LocalVariableNode {
+
+    /**
+     * The name of a local variable.
+     */
+    public String name;
+
+    /**
+     * The type descriptor of this local variable.
+     */
+    public String desc;
+
+    /**
+     * The signature of this local variable. May be <tt>null</tt>.
+     */
+    public String signature;
+
+    /**
+     * The first instruction corresponding to the scope of this local variable
+     * (inclusive).
+     */
+    public LabelNode start;
+
+    /**
+     * The last instruction corresponding to the scope of this local variable
+     * (exclusive).
+     */
+    public LabelNode end;
+
+    /**
+     * The local variable's index.
+     */
+    public int index;
+
+    /**
+     * Constructs a new {@link LocalVariableNode}.
+     * 
+     * @param name
+     *            the name of a local variable.
+     * @param desc
+     *            the type descriptor of this local variable.
+     * @param signature
+     *            the signature of this local variable. May be <tt>null</tt>.
+     * @param start
+     *            the first instruction corresponding to the scope of this local
+     *            variable (inclusive).
+     * @param end
+     *            the last instruction corresponding to the scope of this local
+     *            variable (exclusive).
+     * @param index
+     *            the local variable's index.
+     */
+    public LocalVariableNode(final String name, final String desc,
+            final String signature, final LabelNode start, final LabelNode end,
+            final int index) {
+        this.name = name;
+        this.desc = desc;
+        this.signature = signature;
+        this.start = start;
+        this.end = end;
+        this.index = index;
+    }
+
+    /**
+     * Makes the given visitor visit this local variable declaration.
+     * 
+     * @param mv
+     *            a method visitor.
+     */
+    public void accept(final MethodVisitor mv) {
+        mv.visitLocalVariable(name, desc, signature, start.getLabel(),
+                end.getLabel(), index);
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/LookupSwitchInsnNode.java b/src/main/asm/org/objectweb/asm/tree/LookupSwitchInsnNode.java
new file mode 100644
index 0000000..c44c5ef
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/LookupSwitchInsnNode.java
@@ -0,0 +1,117 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+/**
+ * A node that represents a LOOKUPSWITCH instruction.
+ * 
+ * @author Eric Bruneton
+ */
+public class LookupSwitchInsnNode extends AbstractInsnNode {
+
+    /**
+     * Beginning of the default handler block.
+     */
+    public LabelNode dflt;
+
+    /**
+     * The values of the keys. This list is a list of {@link Integer} objects.
+     */
+    public List<Integer> keys;
+
+    /**
+     * Beginnings of the handler blocks. This list is a list of
+     * {@link LabelNode} objects.
+     */
+    public List<LabelNode> labels;
+
+    /**
+     * Constructs a new {@link LookupSwitchInsnNode}.
+     * 
+     * @param dflt
+     *            beginning of the default handler block.
+     * @param keys
+     *            the values of the keys.
+     * @param labels
+     *            beginnings of the handler blocks. <tt>labels[i]</tt> is the
+     *            beginning of the handler block for the <tt>keys[i]</tt> key.
+     */
+    public LookupSwitchInsnNode(final LabelNode dflt, final int[] keys,
+            final LabelNode[] labels) {
+        super(Opcodes.LOOKUPSWITCH);
+        this.dflt = dflt;
+        this.keys = new ArrayList<Integer>(keys == null ? 0 : keys.length);
+        this.labels = new ArrayList<LabelNode>(labels == null ? 0
+                : labels.length);
+        if (keys != null) {
+            for (int i = 0; i < keys.length; ++i) {
+                this.keys.add(new Integer(keys[i]));
+            }
+        }
+        if (labels != null) {
+            this.labels.addAll(Arrays.asList(labels));
+        }
+    }
+
+    @Override
+    public int getType() {
+        return LOOKUPSWITCH_INSN;
+    }
+
+    @Override
+    public void accept(final MethodVisitor mv) {
+        int[] keys = new int[this.keys.size()];
+        for (int i = 0; i < keys.length; ++i) {
+            keys[i] = this.keys.get(i).intValue();
+        }
+        Label[] labels = new Label[this.labels.size()];
+        for (int i = 0; i < labels.length; ++i) {
+            labels[i] = this.labels.get(i).getLabel();
+        }
+        mv.visitLookupSwitchInsn(dflt.getLabel(), keys, labels);
+    }
+
+    @Override
+    public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+        LookupSwitchInsnNode clone = new LookupSwitchInsnNode(clone(dflt,
+                labels), null, clone(this.labels, labels));
+        clone.keys.addAll(keys);
+        return clone;
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/MethodInsnNode.java b/src/main/asm/org/objectweb/asm/tree/MethodInsnNode.java
new file mode 100644
index 0000000..bd3d4a6
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/MethodInsnNode.java
@@ -0,0 +1,109 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree;
+
+import java.util.Map;
+
+import org.objectweb.asm.MethodVisitor;
+
+/**
+ * A node that represents a method instruction. A method instruction is an
+ * instruction that invokes a method.
+ * 
+ * @author Eric Bruneton
+ */
+public class MethodInsnNode extends AbstractInsnNode {
+
+    /**
+     * The internal name of the method's owner class (see
+     * {@link org.objectweb.asm.Type#getInternalName() getInternalName}).
+     */
+    public String owner;
+
+    /**
+     * The method's name.
+     */
+    public String name;
+
+    /**
+     * The method's descriptor (see {@link org.objectweb.asm.Type}).
+     */
+    public String desc;
+
+    /**
+     * Constructs a new {@link MethodInsnNode}.
+     * 
+     * @param opcode
+     *            the opcode of the type instruction to be constructed. This
+     *            opcode must be INVOKEVIRTUAL, INVOKESPECIAL, INVOKESTATIC or
+     *            INVOKEINTERFACE.
+     * @param owner
+     *            the internal name of the method's owner class (see
+     *            {@link org.objectweb.asm.Type#getInternalName()
+     *            getInternalName}).
+     * @param name
+     *            the method's name.
+     * @param desc
+     *            the method's descriptor (see {@link org.objectweb.asm.Type}).
+     */
+    public MethodInsnNode(final int opcode, final String owner,
+            final String name, final String desc) {
+        super(opcode);
+        this.owner = owner;
+        this.name = name;
+        this.desc = desc;
+    }
+
+    /**
+     * Sets the opcode of this instruction.
+     * 
+     * @param opcode
+     *            the new instruction opcode. This opcode must be INVOKEVIRTUAL,
+     *            INVOKESPECIAL, INVOKESTATIC or INVOKEINTERFACE.
+     */
+    public void setOpcode(final int opcode) {
+        this.opcode = opcode;
+    }
+
+    @Override
+    public int getType() {
+        return METHOD_INSN;
+    }
+
+    @Override
+    public void accept(final MethodVisitor mv) {
+        mv.visitMethodInsn(opcode, owner, name, desc);
+    }
+
+    @Override
+    public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+        return new MethodInsnNode(opcode, owner, name, desc);
+    }
+}
\ No newline at end of file
diff --git a/src/main/asm/org/objectweb/asm/tree/MethodNode.java b/src/main/asm/org/objectweb/asm/tree/MethodNode.java
new file mode 100644
index 0000000..bf380cf
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/MethodNode.java
@@ -0,0 +1,597 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Attribute;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+
+/**
+ * A node that represents a method.
+ * 
+ * @author Eric Bruneton
+ */
+public class MethodNode extends MethodVisitor {
+
+    /**
+     * The method's access flags (see {@link Opcodes}). This field also
+     * indicates if the method is synthetic and/or deprecated.
+     */
+    public int access;
+
+    /**
+     * The method's name.
+     */
+    public String name;
+
+    /**
+     * The method's descriptor (see {@link Type}).
+     */
+    public String desc;
+
+    /**
+     * The method's signature. May be <tt>null</tt>.
+     */
+    public String signature;
+
+    /**
+     * The internal names of the method's exception classes (see
+     * {@link Type#getInternalName() getInternalName}). This list is a list of
+     * {@link String} objects.
+     */
+    public List<String> exceptions;
+
+    /**
+     * The runtime visible annotations of this method. This list is a list of
+     * {@link AnnotationNode} objects. May be <tt>null</tt>.
+     * 
+     * @associates org.objectweb.asm.tree.AnnotationNode
+     * @label visible
+     */
+    public List<AnnotationNode> visibleAnnotations;
+
+    /**
+     * The runtime invisible annotations of this method. This list is a list of
+     * {@link AnnotationNode} objects. May be <tt>null</tt>.
+     * 
+     * @associates org.objectweb.asm.tree.AnnotationNode
+     * @label invisible
+     */
+    public List<AnnotationNode> invisibleAnnotations;
+
+    /**
+     * The non standard attributes of this method. This list is a list of
+     * {@link Attribute} objects. May be <tt>null</tt>.
+     * 
+     * @associates org.objectweb.asm.Attribute
+     */
+    public List<Attribute> attrs;
+
+    /**
+     * The default value of this annotation interface method. This field must be
+     * a {@link Byte}, {@link Boolean}, {@link Character}, {@link Short},
+     * {@link Integer}, {@link Long}, {@link Float}, {@link Double},
+     * {@link String} or {@link Type}, or an two elements String array (for
+     * enumeration values), a {@link AnnotationNode}, or a {@link List} of
+     * values of one of the preceding types. May be <tt>null</tt>.
+     */
+    public Object annotationDefault;
+
+    /**
+     * The runtime visible parameter annotations of this method. These lists are
+     * lists of {@link AnnotationNode} objects. May be <tt>null</tt>.
+     * 
+     * @associates org.objectweb.asm.tree.AnnotationNode
+     * @label invisible parameters
+     */
+    public List<AnnotationNode>[] visibleParameterAnnotations;
+
+    /**
+     * The runtime invisible parameter annotations of this method. These lists
+     * are lists of {@link AnnotationNode} objects. May be <tt>null</tt>.
+     * 
+     * @associates org.objectweb.asm.tree.AnnotationNode
+     * @label visible parameters
+     */
+    public List<AnnotationNode>[] invisibleParameterAnnotations;
+
+    /**
+     * The instructions of this method. This list is a list of
+     * {@link AbstractInsnNode} objects.
+     * 
+     * @associates org.objectweb.asm.tree.AbstractInsnNode
+     * @label instructions
+     */
+    public InsnList instructions;
+
+    /**
+     * The try catch blocks of this method. This list is a list of
+     * {@link TryCatchBlockNode} objects.
+     * 
+     * @associates org.objectweb.asm.tree.TryCatchBlockNode
+     */
+    public List<TryCatchBlockNode> tryCatchBlocks;
+
+    /**
+     * The maximum stack size of this method.
+     */
+    public int maxStack;
+
+    /**
+     * The maximum number of local variables of this method.
+     */
+    public int maxLocals;
+
+    /**
+     * The local variables of this method. This list is a list of
+     * {@link LocalVariableNode} objects. May be <tt>null</tt>
+     * 
+     * @associates org.objectweb.asm.tree.LocalVariableNode
+     */
+    public List<LocalVariableNode> localVariables;
+
+    /**
+     * If the accept method has been called on this object.
+     */
+    private boolean visited;
+
+    /**
+     * Constructs an uninitialized {@link MethodNode}. <i>Subclasses must not
+     * use this constructor</i>. Instead, they must use the
+     * {@link #MethodNode(int)} version.
+     */
+    public MethodNode() {
+        this(Opcodes.ASM4);
+    }
+
+    /**
+     * Constructs an uninitialized {@link MethodNode}.
+     * 
+     * @param api
+     *            the ASM API version implemented by this visitor. Must be one
+     *            of {@link Opcodes#ASM4}.
+     */
+    public MethodNode(final int api) {
+        super(api);
+        this.instructions = new InsnList();
+    }
+
+    /**
+     * Constructs a new {@link MethodNode}. <i>Subclasses must not use this
+     * constructor</i>. Instead, they must use the
+     * {@link #MethodNode(int, int, String, String, String, String[])} version.
+     * 
+     * @param access
+     *            the method's access flags (see {@link Opcodes}). This
+     *            parameter also indicates if the method is synthetic and/or
+     *            deprecated.
+     * @param name
+     *            the method's name.
+     * @param desc
+     *            the method's descriptor (see {@link Type}).
+     * @param signature
+     *            the method's signature. May be <tt>null</tt>.
+     * @param exceptions
+     *            the internal names of the method's exception classes (see
+     *            {@link Type#getInternalName() getInternalName}). May be
+     *            <tt>null</tt>.
+     */
+    public MethodNode(final int access, final String name, final String desc,
+            final String signature, final String[] exceptions) {
+        this(Opcodes.ASM4, access, name, desc, signature, exceptions);
+    }
+
+    /**
+     * Constructs a new {@link MethodNode}.
+     * 
+     * @param api
+     *            the ASM API version implemented by this visitor. Must be one
+     *            of {@link Opcodes#ASM4}.
+     * @param access
+     *            the method's access flags (see {@link Opcodes}). This
+     *            parameter also indicates if the method is synthetic and/or
+     *            deprecated.
+     * @param name
+     *            the method's name.
+     * @param desc
+     *            the method's descriptor (see {@link Type}).
+     * @param signature
+     *            the method's signature. May be <tt>null</tt>.
+     * @param exceptions
+     *            the internal names of the method's exception classes (see
+     *            {@link Type#getInternalName() getInternalName}). May be
+     *            <tt>null</tt>.
+     */
+    public MethodNode(final int api, final int access, final String name,
+            final String desc, final String signature, final String[] exceptions) {
+        super(api);
+        this.access = access;
+        this.name = name;
+        this.desc = desc;
+        this.signature = signature;
+        this.exceptions = new ArrayList<String>(exceptions == null ? 0
+                : exceptions.length);
+        boolean isAbstract = (access & Opcodes.ACC_ABSTRACT) != 0;
+        if (!isAbstract) {
+            this.localVariables = new ArrayList<LocalVariableNode>(5);
+        }
+        this.tryCatchBlocks = new ArrayList<TryCatchBlockNode>();
+        if (exceptions != null) {
+            this.exceptions.addAll(Arrays.asList(exceptions));
+        }
+        this.instructions = new InsnList();
+    }
+
+    // ------------------------------------------------------------------------
+    // Implementation of the MethodVisitor abstract class
+    // ------------------------------------------------------------------------
+
+    @Override
+    public AnnotationVisitor visitAnnotationDefault() {
+        return new AnnotationNode(new ArrayList<Object>(0) {
+            @Override
+            public boolean add(final Object o) {
+                annotationDefault = o;
+                return super.add(o);
+            }
+        });
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotation(final String desc,
+            final boolean visible) {
+        AnnotationNode an = new AnnotationNode(desc);
+        if (visible) {
+            if (visibleAnnotations == null) {
+                visibleAnnotations = new ArrayList<AnnotationNode>(1);
+            }
+            visibleAnnotations.add(an);
+        } else {
+            if (invisibleAnnotations == null) {
+                invisibleAnnotations = new ArrayList<AnnotationNode>(1);
+            }
+            invisibleAnnotations.add(an);
+        }
+        return an;
+    }
+
+    @Override
+    public AnnotationVisitor visitParameterAnnotation(final int parameter,
+            final String desc, final boolean visible) {
+        AnnotationNode an = new AnnotationNode(desc);
+        if (visible) {
+            if (visibleParameterAnnotations == null) {
+                int params = Type.getArgumentTypes(this.desc).length;
+                visibleParameterAnnotations = (List<AnnotationNode>[]) new List<?>[params];
+            }
+            if (visibleParameterAnnotations[parameter] == null) {
+                visibleParameterAnnotations[parameter] = new ArrayList<AnnotationNode>(
+                        1);
+            }
+            visibleParameterAnnotations[parameter].add(an);
+        } else {
+            if (invisibleParameterAnnotations == null) {
+                int params = Type.getArgumentTypes(this.desc).length;
+                invisibleParameterAnnotations = (List<AnnotationNode>[]) new List<?>[params];
+            }
+            if (invisibleParameterAnnotations[parameter] == null) {
+                invisibleParameterAnnotations[parameter] = new ArrayList<AnnotationNode>(
+                        1);
+            }
+            invisibleParameterAnnotations[parameter].add(an);
+        }
+        return an;
+    }
+
+    @Override
+    public void visitAttribute(final Attribute attr) {
+        if (attrs == null) {
+            attrs = new ArrayList<Attribute>(1);
+        }
+        attrs.add(attr);
+    }
+
+    @Override
+    public void visitCode() {
+    }
+
+    @Override
+    public void visitFrame(final int type, final int nLocal,
+            final Object[] local, final int nStack, final Object[] stack) {
+        instructions.add(new FrameNode(type, nLocal, local == null ? null
+                : getLabelNodes(local), nStack, stack == null ? null
+                : getLabelNodes(stack)));
+    }
+
+    @Override
+    public void visitInsn(final int opcode) {
+        instructions.add(new InsnNode(opcode));
+    }
+
+    @Override
+    public void visitIntInsn(final int opcode, final int operand) {
+        instructions.add(new IntInsnNode(opcode, operand));
+    }
+
+    @Override
+    public void visitVarInsn(final int opcode, final int var) {
+        instructions.add(new VarInsnNode(opcode, var));
+    }
+
+    @Override
+    public void visitTypeInsn(final int opcode, final String type) {
+        instructions.add(new TypeInsnNode(opcode, type));
+    }
+
+    @Override
+    public void visitFieldInsn(final int opcode, final String owner,
+            final String name, final String desc) {
+        instructions.add(new FieldInsnNode(opcode, owner, name, desc));
+    }
+
+    @Override
+    public void visitMethodInsn(final int opcode, final String owner,
+            final String name, final String desc) {
+        instructions.add(new MethodInsnNode(opcode, owner, name, desc));
+    }
+
+    @Override
+    public void visitInvokeDynamicInsn(String name, String desc, Handle bsm,
+            Object... bsmArgs) {
+        instructions.add(new InvokeDynamicInsnNode(name, desc, bsm, bsmArgs));
+    }
+
+    @Override
+    public void visitJumpInsn(final int opcode, final Label label) {
+        instructions.add(new JumpInsnNode(opcode, getLabelNode(label)));
+    }
+
+    @Override
+    public void visitLabel(final Label label) {
+        instructions.add(getLabelNode(label));
+    }
+
+    @Override
+    public void visitLdcInsn(final Object cst) {
+        instructions.add(new LdcInsnNode(cst));
+    }
+
+    @Override
+    public void visitIincInsn(final int var, final int increment) {
+        instructions.add(new IincInsnNode(var, increment));
+    }
+
+    @Override
+    public void visitTableSwitchInsn(final int min, final int max,
+            final Label dflt, final Label... labels) {
+        instructions.add(new TableSwitchInsnNode(min, max, getLabelNode(dflt),
+                getLabelNodes(labels)));
+    }
+
+    @Override
+    public void visitLookupSwitchInsn(final Label dflt, final int[] keys,
+            final Label[] labels) {
+        instructions.add(new LookupSwitchInsnNode(getLabelNode(dflt), keys,
+                getLabelNodes(labels)));
+    }
+
+    @Override
+    public void visitMultiANewArrayInsn(final String desc, final int dims) {
+        instructions.add(new MultiANewArrayInsnNode(desc, dims));
+    }
+
+    @Override
+    public void visitTryCatchBlock(final Label start, final Label end,
+            final Label handler, final String type) {
+        tryCatchBlocks.add(new TryCatchBlockNode(getLabelNode(start),
+                getLabelNode(end), getLabelNode(handler), type));
+    }
+
+    @Override
+    public void visitLocalVariable(final String name, final String desc,
+            final String signature, final Label start, final Label end,
+            final int index) {
+        localVariables.add(new LocalVariableNode(name, desc, signature,
+                getLabelNode(start), getLabelNode(end), index));
+    }
+
+    @Override
+    public void visitLineNumber(final int line, final Label start) {
+        instructions.add(new LineNumberNode(line, getLabelNode(start)));
+    }
+
+    @Override
+    public void visitMaxs(final int maxStack, final int maxLocals) {
+        this.maxStack = maxStack;
+        this.maxLocals = maxLocals;
+    }
+
+    @Override
+    public void visitEnd() {
+    }
+
+    /**
+     * Returns the LabelNode corresponding to the given Label. Creates a new
+     * LabelNode if necessary. The default implementation of this method uses
+     * the {@link Label#info} field to store associations between labels and
+     * label nodes.
+     * 
+     * @param l
+     *            a Label.
+     * @return the LabelNode corresponding to l.
+     */
+    protected LabelNode getLabelNode(final Label l) {
+        if (!(l.info instanceof LabelNode)) {
+            l.info = new LabelNode();
+        }
+        return (LabelNode) l.info;
+    }
+
+    private LabelNode[] getLabelNodes(final Label[] l) {
+        LabelNode[] nodes = new LabelNode[l.length];
+        for (int i = 0; i < l.length; ++i) {
+            nodes[i] = getLabelNode(l[i]);
+        }
+        return nodes;
+    }
+
+    private Object[] getLabelNodes(final Object[] objs) {
+        Object[] nodes = new Object[objs.length];
+        for (int i = 0; i < objs.length; ++i) {
+            Object o = objs[i];
+            if (o instanceof Label) {
+                o = getLabelNode((Label) o);
+            }
+            nodes[i] = o;
+        }
+        return nodes;
+    }
+
+    // ------------------------------------------------------------------------
+    // Accept method
+    // ------------------------------------------------------------------------
+
+    /**
+     * Checks that this method node is compatible with the given ASM API
+     * version. This methods checks that this node, and all its nodes
+     * recursively, do not contain elements that were introduced in more recent
+     * versions of the ASM API than the given version.
+     * 
+     * @param api
+     *            an ASM API version. Must be one of {@link Opcodes#ASM4}.
+     */
+    public void check(final int api) {
+        // nothing to do
+    }
+
+    /**
+     * Makes the given class visitor visit this method.
+     * 
+     * @param cv
+     *            a class visitor.
+     */
+    public void accept(final ClassVisitor cv) {
+        String[] exceptions = new String[this.exceptions.size()];
+        this.exceptions.toArray(exceptions);
+        MethodVisitor mv = cv.visitMethod(access, name, desc, signature,
+                exceptions);
+        if (mv != null) {
+            accept(mv);
+        }
+    }
+
+    /**
+     * Makes the given method visitor visit this method.
+     * 
+     * @param mv
+     *            a method visitor.
+     */
+    public void accept(final MethodVisitor mv) {
+        // visits the method attributes
+        int i, j, n;
+        if (annotationDefault != null) {
+            AnnotationVisitor av = mv.visitAnnotationDefault();
+            AnnotationNode.accept(av, null, annotationDefault);
+            if (av != null) {
+                av.visitEnd();
+            }
+        }
+        n = visibleAnnotations == null ? 0 : visibleAnnotations.size();
+        for (i = 0; i < n; ++i) {
+            AnnotationNode an = visibleAnnotations.get(i);
+            an.accept(mv.visitAnnotation(an.desc, true));
+        }
+        n = invisibleAnnotations == null ? 0 : invisibleAnnotations.size();
+        for (i = 0; i < n; ++i) {
+            AnnotationNode an = invisibleAnnotations.get(i);
+            an.accept(mv.visitAnnotation(an.desc, false));
+        }
+        n = visibleParameterAnnotations == null ? 0
+                : visibleParameterAnnotations.length;
+        for (i = 0; i < n; ++i) {
+            List<?> l = visibleParameterAnnotations[i];
+            if (l == null) {
+                continue;
+            }
+            for (j = 0; j < l.size(); ++j) {
+                AnnotationNode an = (AnnotationNode) l.get(j);
+                an.accept(mv.visitParameterAnnotation(i, an.desc, true));
+            }
+        }
+        n = invisibleParameterAnnotations == null ? 0
+                : invisibleParameterAnnotations.length;
+        for (i = 0; i < n; ++i) {
+            List<?> l = invisibleParameterAnnotations[i];
+            if (l == null) {
+                continue;
+            }
+            for (j = 0; j < l.size(); ++j) {
+                AnnotationNode an = (AnnotationNode) l.get(j);
+                an.accept(mv.visitParameterAnnotation(i, an.desc, false));
+            }
+        }
+        if (visited) {
+            instructions.resetLabels();
+        }
+        n = attrs == null ? 0 : attrs.size();
+        for (i = 0; i < n; ++i) {
+            mv.visitAttribute(attrs.get(i));
+        }
+        // visits the method's code
+        if (instructions.size() > 0) {
+            mv.visitCode();
+            // visits try catch blocks
+            n = tryCatchBlocks == null ? 0 : tryCatchBlocks.size();
+            for (i = 0; i < n; ++i) {
+                tryCatchBlocks.get(i).accept(mv);
+            }
+            // visits instructions
+            instructions.accept(mv);
+            // visits local variables
+            n = localVariables == null ? 0 : localVariables.size();
+            for (i = 0; i < n; ++i) {
+                localVariables.get(i).accept(mv);
+            }
+            // visits maxs
+            mv.visitMaxs(maxStack, maxLocals);
+            visited = true;
+        }
+        mv.visitEnd();
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/MultiANewArrayInsnNode.java b/src/main/asm/org/objectweb/asm/tree/MultiANewArrayInsnNode.java
new file mode 100644
index 0000000..4954890
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/MultiANewArrayInsnNode.java
@@ -0,0 +1,83 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree;
+
+import java.util.Map;
+
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+/**
+ * A node that represents a MULTIANEWARRAY instruction.
+ * 
+ * @author Eric Bruneton
+ */
+public class MultiANewArrayInsnNode extends AbstractInsnNode {
+
+    /**
+     * An array type descriptor (see {@link org.objectweb.asm.Type}).
+     */
+    public String desc;
+
+    /**
+     * Number of dimensions of the array to allocate.
+     */
+    public int dims;
+
+    /**
+     * Constructs a new {@link MultiANewArrayInsnNode}.
+     * 
+     * @param desc
+     *            an array type descriptor (see {@link org.objectweb.asm.Type}).
+     * @param dims
+     *            number of dimensions of the array to allocate.
+     */
+    public MultiANewArrayInsnNode(final String desc, final int dims) {
+        super(Opcodes.MULTIANEWARRAY);
+        this.desc = desc;
+        this.dims = dims;
+    }
+
+    @Override
+    public int getType() {
+        return MULTIANEWARRAY_INSN;
+    }
+
+    @Override
+    public void accept(final MethodVisitor mv) {
+        mv.visitMultiANewArrayInsn(desc, dims);
+    }
+
+    @Override
+    public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+        return new MultiANewArrayInsnNode(desc, dims);
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/asm/org/objectweb/asm/tree/TableSwitchInsnNode.java b/src/main/asm/org/objectweb/asm/tree/TableSwitchInsnNode.java
new file mode 100644
index 0000000..3b47340
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/TableSwitchInsnNode.java
@@ -0,0 +1,113 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+/**
+ * A node that represents a TABLESWITCH instruction.
+ * 
+ * @author Eric Bruneton
+ */
+public class TableSwitchInsnNode extends AbstractInsnNode {
+
+    /**
+     * The minimum key value.
+     */
+    public int min;
+
+    /**
+     * The maximum key value.
+     */
+    public int max;
+
+    /**
+     * Beginning of the default handler block.
+     */
+    public LabelNode dflt;
+
+    /**
+     * Beginnings of the handler blocks. This list is a list of
+     * {@link LabelNode} objects.
+     */
+    public List<LabelNode> labels;
+
+    /**
+     * Constructs a new {@link TableSwitchInsnNode}.
+     * 
+     * @param min
+     *            the minimum key value.
+     * @param max
+     *            the maximum key value.
+     * @param dflt
+     *            beginning of the default handler block.
+     * @param labels
+     *            beginnings of the handler blocks. <tt>labels[i]</tt> is the
+     *            beginning of the handler block for the <tt>min + i</tt> key.
+     */
+    public TableSwitchInsnNode(final int min, final int max,
+            final LabelNode dflt, final LabelNode... labels) {
+        super(Opcodes.TABLESWITCH);
+        this.min = min;
+        this.max = max;
+        this.dflt = dflt;
+        this.labels = new ArrayList<LabelNode>();
+        if (labels != null) {
+            this.labels.addAll(Arrays.asList(labels));
+        }
+    }
+
+    @Override
+    public int getType() {
+        return TABLESWITCH_INSN;
+    }
+
+    @Override
+    public void accept(final MethodVisitor mv) {
+        Label[] labels = new Label[this.labels.size()];
+        for (int i = 0; i < labels.length; ++i) {
+            labels[i] = this.labels.get(i).getLabel();
+        }
+        mv.visitTableSwitchInsn(min, max, dflt.getLabel(), labels);
+    }
+
+    @Override
+    public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+        return new TableSwitchInsnNode(min, max, clone(dflt, labels), clone(
+                this.labels, labels));
+    }
+}
\ No newline at end of file
diff --git a/src/main/asm/org/objectweb/asm/tree/TryCatchBlockNode.java b/src/main/asm/org/objectweb/asm/tree/TryCatchBlockNode.java
new file mode 100644
index 0000000..e859d2b
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/TryCatchBlockNode.java
@@ -0,0 +1,94 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree;
+
+import org.objectweb.asm.MethodVisitor;
+
+/**
+ * A node that represents a try catch block.
+ * 
+ * @author Eric Bruneton
+ */
+public class TryCatchBlockNode {
+
+    /**
+     * Beginning of the exception handler's scope (inclusive).
+     */
+    public LabelNode start;
+
+    /**
+     * End of the exception handler's scope (exclusive).
+     */
+    public LabelNode end;
+
+    /**
+     * Beginning of the exception handler's code.
+     */
+    public LabelNode handler;
+
+    /**
+     * Internal name of the type of exceptions handled by the handler. May be
+     * <tt>null</tt> to catch any exceptions (for "finally" blocks).
+     */
+    public String type;
+
+    /**
+     * Constructs a new {@link TryCatchBlockNode}.
+     * 
+     * @param start
+     *            beginning of the exception handler's scope (inclusive).
+     * @param end
+     *            end of the exception handler's scope (exclusive).
+     * @param handler
+     *            beginning of the exception handler's code.
+     * @param type
+     *            internal name of the type of exceptions handled by the
+     *            handler, or <tt>null</tt> to catch any exceptions (for
+     *            "finally" blocks).
+     */
+    public TryCatchBlockNode(final LabelNode start, final LabelNode end,
+            final LabelNode handler, final String type) {
+        this.start = start;
+        this.end = end;
+        this.handler = handler;
+        this.type = type;
+    }
+
+    /**
+     * Makes the given visitor visit this try catch block.
+     * 
+     * @param mv
+     *            a method visitor.
+     */
+    public void accept(final MethodVisitor mv) {
+        mv.visitTryCatchBlock(start.getLabel(), end.getLabel(),
+                handler == null ? null : handler.getLabel(), type);
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/TypeInsnNode.java b/src/main/asm/org/objectweb/asm/tree/TypeInsnNode.java
new file mode 100644
index 0000000..85e0dc1
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/TypeInsnNode.java
@@ -0,0 +1,90 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree;
+
+import java.util.Map;
+
+import org.objectweb.asm.MethodVisitor;
+
+/**
+ * A node that represents a type instruction. A type instruction is an
+ * instruction that takes a type descriptor as parameter.
+ * 
+ * @author Eric Bruneton
+ */
+public class TypeInsnNode extends AbstractInsnNode {
+
+    /**
+     * The operand of this instruction. This operand is an internal name (see
+     * {@link org.objectweb.asm.Type}).
+     */
+    public String desc;
+
+    /**
+     * Constructs a new {@link TypeInsnNode}.
+     * 
+     * @param opcode
+     *            the opcode of the type instruction to be constructed. This
+     *            opcode must be NEW, ANEWARRAY, CHECKCAST or INSTANCEOF.
+     * @param desc
+     *            the operand of the instruction to be constructed. This operand
+     *            is an internal name (see {@link org.objectweb.asm.Type}).
+     */
+    public TypeInsnNode(final int opcode, final String desc) {
+        super(opcode);
+        this.desc = desc;
+    }
+
+    /**
+     * Sets the opcode of this instruction.
+     * 
+     * @param opcode
+     *            the new instruction opcode. This opcode must be NEW,
+     *            ANEWARRAY, CHECKCAST or INSTANCEOF.
+     */
+    public void setOpcode(final int opcode) {
+        this.opcode = opcode;
+    }
+
+    @Override
+    public int getType() {
+        return TYPE_INSN;
+    }
+
+    @Override
+    public void accept(final MethodVisitor mv) {
+        mv.visitTypeInsn(opcode, desc);
+    }
+
+    @Override
+    public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+        return new TypeInsnNode(opcode, desc);
+    }
+}
\ No newline at end of file
diff --git a/src/main/asm/org/objectweb/asm/tree/VarInsnNode.java b/src/main/asm/org/objectweb/asm/tree/VarInsnNode.java
new file mode 100644
index 0000000..a82266d
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/VarInsnNode.java
@@ -0,0 +1,93 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree;
+
+import java.util.Map;
+
+import org.objectweb.asm.MethodVisitor;
+
+/**
+ * A node that represents a local variable instruction. A local variable
+ * instruction is an instruction that loads or stores the value of a local
+ * variable.
+ * 
+ * @author Eric Bruneton
+ */
+public class VarInsnNode extends AbstractInsnNode {
+
+    /**
+     * The operand of this instruction. This operand is the index of a local
+     * variable.
+     */
+    public int var;
+
+    /**
+     * Constructs a new {@link VarInsnNode}.
+     * 
+     * @param opcode
+     *            the opcode of the local variable instruction to be
+     *            constructed. This opcode must be ILOAD, LLOAD, FLOAD, DLOAD,
+     *            ALOAD, ISTORE, LSTORE, FSTORE, DSTORE, ASTORE or RET.
+     * @param var
+     *            the operand of the instruction to be constructed. This operand
+     *            is the index of a local variable.
+     */
+    public VarInsnNode(final int opcode, final int var) {
+        super(opcode);
+        this.var = var;
+    }
+
+    /**
+     * Sets the opcode of this instruction.
+     * 
+     * @param opcode
+     *            the new instruction opcode. This opcode must be ILOAD, LLOAD,
+     *            FLOAD, DLOAD, ALOAD, ISTORE, LSTORE, FSTORE, DSTORE, ASTORE or
+     *            RET.
+     */
+    public void setOpcode(final int opcode) {
+        this.opcode = opcode;
+    }
+
+    @Override
+    public int getType() {
+        return VAR_INSN;
+    }
+
+    @Override
+    public void accept(final MethodVisitor mv) {
+        mv.visitVarInsn(opcode, var);
+    }
+
+    @Override
+    public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+        return new VarInsnNode(opcode, var);
+    }
+}
\ No newline at end of file
diff --git a/src/main/asm/org/objectweb/asm/tree/analysis/Analyzer.java b/src/main/asm/org/objectweb/asm/tree/analysis/Analyzer.java
new file mode 100644
index 0000000..90aed9b
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/analysis/Analyzer.java
@@ -0,0 +1,549 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree.analysis;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.IincInsnNode;
+import org.objectweb.asm.tree.InsnList;
+import org.objectweb.asm.tree.JumpInsnNode;
+import org.objectweb.asm.tree.LabelNode;
+import org.objectweb.asm.tree.LookupSwitchInsnNode;
+import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.tree.TableSwitchInsnNode;
+import org.objectweb.asm.tree.TryCatchBlockNode;
+import org.objectweb.asm.tree.VarInsnNode;
+
+/**
+ * A semantic bytecode analyzer. <i>This class does not fully check that JSR and
+ * RET instructions are valid.</i>
+ * 
+ * @param <V>
+ *            type of the Value used for the analysis.
+ * 
+ * @author Eric Bruneton
+ */
+public class Analyzer<V extends Value> implements Opcodes {
+
+    private final Interpreter<V> interpreter;
+
+    private int n;
+
+    private InsnList insns;
+
+    private List<TryCatchBlockNode>[] handlers;
+
+    private Frame<V>[] frames;
+
+    private Subroutine[] subroutines;
+
+    private boolean[] queued;
+
+    private int[] queue;
+
+    private int top;
+
+    /**
+     * Constructs a new {@link Analyzer}.
+     * 
+     * @param interpreter
+     *            the interpreter to be used to symbolically interpret the
+     *            bytecode instructions.
+     */
+    public Analyzer(final Interpreter<V> interpreter) {
+        this.interpreter = interpreter;
+    }
+
+    /**
+     * Analyzes the given method.
+     * 
+     * @param owner
+     *            the internal name of the class to which the method belongs.
+     * @param m
+     *            the method to be analyzed.
+     * @return the symbolic state of the execution stack frame at each bytecode
+     *         instruction of the method. The size of the returned array is
+     *         equal to the number of instructions (and labels) of the method. A
+     *         given frame is <tt>null</tt> if and only if the corresponding
+     *         instruction cannot be reached (dead code).
+     * @throws AnalyzerException
+     *             if a problem occurs during the analysis.
+     */
+    public Frame<V>[] analyze(final String owner, final MethodNode m)
+            throws AnalyzerException {
+        if ((m.access & (ACC_ABSTRACT | ACC_NATIVE)) != 0) {
+            frames = (Frame<V>[]) new Frame<?>[0];
+            return frames;
+        }
+        n = m.instructions.size();
+        insns = m.instructions;
+        handlers = (List<TryCatchBlockNode>[]) new List<?>[n];
+        frames = (Frame<V>[]) new Frame<?>[n];
+        subroutines = new Subroutine[n];
+        queued = new boolean[n];
+        queue = new int[n];
+        top = 0;
+
+        // computes exception handlers for each instruction
+        for (int i = 0; i < m.tryCatchBlocks.size(); ++i) {
+            TryCatchBlockNode tcb = m.tryCatchBlocks.get(i);
+            int begin = insns.indexOf(tcb.start);
+            int end = insns.indexOf(tcb.end);
+            for (int j = begin; j < end; ++j) {
+                List<TryCatchBlockNode> insnHandlers = handlers[j];
+                if (insnHandlers == null) {
+                    insnHandlers = new ArrayList<TryCatchBlockNode>();
+                    handlers[j] = insnHandlers;
+                }
+                insnHandlers.add(tcb);
+            }
+        }
+
+        // computes the subroutine for each instruction:
+        Subroutine main = new Subroutine(null, m.maxLocals, null);
+        List<AbstractInsnNode> subroutineCalls = new ArrayList<AbstractInsnNode>();
+        Map<LabelNode, Subroutine> subroutineHeads = new HashMap<LabelNode, Subroutine>();
+        findSubroutine(0, main, subroutineCalls);
+        while (!subroutineCalls.isEmpty()) {
+            JumpInsnNode jsr = (JumpInsnNode) subroutineCalls.remove(0);
+            Subroutine sub = subroutineHeads.get(jsr.label);
+            if (sub == null) {
+                sub = new Subroutine(jsr.label, m.maxLocals, jsr);
+                subroutineHeads.put(jsr.label, sub);
+                findSubroutine(insns.indexOf(jsr.label), sub, subroutineCalls);
+            } else {
+                sub.callers.add(jsr);
+            }
+        }
+        for (int i = 0; i < n; ++i) {
+            if (subroutines[i] != null && subroutines[i].start == null) {
+                subroutines[i] = null;
+            }
+        }
+
+        // initializes the data structures for the control flow analysis
+        Frame<V> current = newFrame(m.maxLocals, m.maxStack);
+        Frame<V> handler = newFrame(m.maxLocals, m.maxStack);
+        current.setReturn(interpreter.newValue(Type.getReturnType(m.desc)));
+        Type[] args = Type.getArgumentTypes(m.desc);
+        int local = 0;
+        if ((m.access & ACC_STATIC) == 0) {
+            Type ctype = Type.getObjectType(owner);
+            current.setLocal(local++, interpreter.newValue(ctype));
+        }
+        for (int i = 0; i < args.length; ++i) {
+            current.setLocal(local++, interpreter.newValue(args[i]));
+            if (args[i].getSize() == 2) {
+                current.setLocal(local++, interpreter.newValue(null));
+            }
+        }
+        while (local < m.maxLocals) {
+            current.setLocal(local++, interpreter.newValue(null));
+        }
+        merge(0, current, null);
+
+        init(owner, m);
+
+        // control flow analysis
+        while (top > 0) {
+            int insn = queue[--top];
+            Frame<V> f = frames[insn];
+            Subroutine subroutine = subroutines[insn];
+            queued[insn] = false;
+
+            AbstractInsnNode insnNode = null;
+            try {
+                insnNode = m.instructions.get(insn);
+                int insnOpcode = insnNode.getOpcode();
+                int insnType = insnNode.getType();
+
+                if (insnType == AbstractInsnNode.LABEL
+                        || insnType == AbstractInsnNode.LINE
+                        || insnType == AbstractInsnNode.FRAME) {
+                    merge(insn + 1, f, subroutine);
+                    newControlFlowEdge(insn, insn + 1);
+                } else {
+                    current.init(f).execute(insnNode, interpreter);
+                    subroutine = subroutine == null ? null : subroutine.copy();
+
+                    if (insnNode instanceof JumpInsnNode) {
+                        JumpInsnNode j = (JumpInsnNode) insnNode;
+                        if (insnOpcode != GOTO && insnOpcode != JSR) {
+                            merge(insn + 1, current, subroutine);
+                            newControlFlowEdge(insn, insn + 1);
+                        }
+                        int jump = insns.indexOf(j.label);
+                        if (insnOpcode == JSR) {
+                            merge(jump, current, new Subroutine(j.label,
+                                    m.maxLocals, j));
+                        } else {
+                            merge(jump, current, subroutine);
+                        }
+                        newControlFlowEdge(insn, jump);
+                    } else if (insnNode instanceof LookupSwitchInsnNode) {
+                        LookupSwitchInsnNode lsi = (LookupSwitchInsnNode) insnNode;
+                        int jump = insns.indexOf(lsi.dflt);
+                        merge(jump, current, subroutine);
+                        newControlFlowEdge(insn, jump);
+                        for (int j = 0; j < lsi.labels.size(); ++j) {
+                            LabelNode label = lsi.labels.get(j);
+                            jump = insns.indexOf(label);
+                            merge(jump, current, subroutine);
+                            newControlFlowEdge(insn, jump);
+                        }
+                    } else if (insnNode instanceof TableSwitchInsnNode) {
+                        TableSwitchInsnNode tsi = (TableSwitchInsnNode) insnNode;
+                        int jump = insns.indexOf(tsi.dflt);
+                        merge(jump, current, subroutine);
+                        newControlFlowEdge(insn, jump);
+                        for (int j = 0; j < tsi.labels.size(); ++j) {
+                            LabelNode label = tsi.labels.get(j);
+                            jump = insns.indexOf(label);
+                            merge(jump, current, subroutine);
+                            newControlFlowEdge(insn, jump);
+                        }
+                    } else if (insnOpcode == RET) {
+                        if (subroutine == null) {
+                            throw new AnalyzerException(insnNode,
+                                    "RET instruction outside of a sub routine");
+                        }
+                        for (int i = 0; i < subroutine.callers.size(); ++i) {
+                            JumpInsnNode caller = subroutine.callers.get(i);
+                            int call = insns.indexOf(caller);
+                            if (frames[call] != null) {
+                                merge(call + 1, frames[call], current,
+                                        subroutines[call], subroutine.access);
+                                newControlFlowEdge(insn, call + 1);
+                            }
+                        }
+                    } else if (insnOpcode != ATHROW
+                            && (insnOpcode < IRETURN || insnOpcode > RETURN)) {
+                        if (subroutine != null) {
+                            if (insnNode instanceof VarInsnNode) {
+                                int var = ((VarInsnNode) insnNode).var;
+                                subroutine.access[var] = true;
+                                if (insnOpcode == LLOAD || insnOpcode == DLOAD
+                                        || insnOpcode == LSTORE
+                                        || insnOpcode == DSTORE) {
+                                    subroutine.access[var + 1] = true;
+                                }
+                            } else if (insnNode instanceof IincInsnNode) {
+                                int var = ((IincInsnNode) insnNode).var;
+                                subroutine.access[var] = true;
+                            }
+                        }
+                        merge(insn + 1, current, subroutine);
+                        newControlFlowEdge(insn, insn + 1);
+                    }
+                }
+
+                List<TryCatchBlockNode> insnHandlers = handlers[insn];
+                if (insnHandlers != null) {
+                    for (int i = 0; i < insnHandlers.size(); ++i) {
+                        TryCatchBlockNode tcb = insnHandlers.get(i);
+                        Type type;
+                        if (tcb.type == null) {
+                            type = Type.getObjectType("java/lang/Throwable");
+                        } else {
+                            type = Type.getObjectType(tcb.type);
+                        }
+                        int jump = insns.indexOf(tcb.handler);
+                        if (newControlFlowExceptionEdge(insn, tcb)) {
+                            handler.init(f);
+                            handler.clearStack();
+                            handler.push(interpreter.newValue(type));
+                            merge(jump, handler, subroutine);
+                        }
+                    }
+                }
+            } catch (AnalyzerException e) {
+                throw new AnalyzerException(e.node, "Error at instruction "
+                        + insn + ": " + e.getMessage(), e);
+            } catch (Exception e) {
+                throw new AnalyzerException(insnNode, "Error at instruction "
+                        + insn + ": " + e.getMessage(), e);
+            }
+        }
+
+        return frames;
+    }
+
+    private void findSubroutine(int insn, final Subroutine sub,
+            final List<AbstractInsnNode> calls) throws AnalyzerException {
+        while (true) {
+            if (insn < 0 || insn >= n) {
+                throw new AnalyzerException(null,
+                        "Execution can fall off end of the code");
+            }
+            if (subroutines[insn] != null) {
+                return;
+            }
+            subroutines[insn] = sub.copy();
+            AbstractInsnNode node = insns.get(insn);
+
+            // calls findSubroutine recursively on normal successors
+            if (node instanceof JumpInsnNode) {
+                if (node.getOpcode() == JSR) {
+                    // do not follow a JSR, it leads to another subroutine!
+                    calls.add(node);
+                } else {
+                    JumpInsnNode jnode = (JumpInsnNode) node;
+                    findSubroutine(insns.indexOf(jnode.label), sub, calls);
+                }
+            } else if (node instanceof TableSwitchInsnNode) {
+                TableSwitchInsnNode tsnode = (TableSwitchInsnNode) node;
+                findSubroutine(insns.indexOf(tsnode.dflt), sub, calls);
+                for (int i = tsnode.labels.size() - 1; i >= 0; --i) {
+                    LabelNode l = tsnode.labels.get(i);
+                    findSubroutine(insns.indexOf(l), sub, calls);
+                }
+            } else if (node instanceof LookupSwitchInsnNode) {
+                LookupSwitchInsnNode lsnode = (LookupSwitchInsnNode) node;
+                findSubroutine(insns.indexOf(lsnode.dflt), sub, calls);
+                for (int i = lsnode.labels.size() - 1; i >= 0; --i) {
+                    LabelNode l = lsnode.labels.get(i);
+                    findSubroutine(insns.indexOf(l), sub, calls);
+                }
+            }
+
+            // calls findSubroutine recursively on exception handler successors
+            List<TryCatchBlockNode> insnHandlers = handlers[insn];
+            if (insnHandlers != null) {
+                for (int i = 0; i < insnHandlers.size(); ++i) {
+                    TryCatchBlockNode tcb = insnHandlers.get(i);
+                    findSubroutine(insns.indexOf(tcb.handler), sub, calls);
+                }
+            }
+
+            // if insn does not falls through to the next instruction, return.
+            switch (node.getOpcode()) {
+            case GOTO:
+            case RET:
+            case TABLESWITCH:
+            case LOOKUPSWITCH:
+            case IRETURN:
+            case LRETURN:
+            case FRETURN:
+            case DRETURN:
+            case ARETURN:
+            case RETURN:
+            case ATHROW:
+                return;
+            }
+            insn++;
+        }
+    }
+
+    /**
+     * Returns the symbolic stack frame for each instruction of the last
+     * recently analyzed method.
+     * 
+     * @return the symbolic state of the execution stack frame at each bytecode
+     *         instruction of the method. The size of the returned array is
+     *         equal to the number of instructions (and labels) of the method. A
+     *         given frame is <tt>null</tt> if the corresponding instruction
+     *         cannot be reached, or if an error occured during the analysis of
+     *         the method.
+     */
+    public Frame<V>[] getFrames() {
+        return frames;
+    }
+
+    /**
+     * Returns the exception handlers for the given instruction.
+     * 
+     * @param insn
+     *            the index of an instruction of the last recently analyzed
+     *            method.
+     * @return a list of {@link TryCatchBlockNode} objects.
+     */
+    public List<TryCatchBlockNode> getHandlers(final int insn) {
+        return handlers[insn];
+    }
+
+    /**
+     * Initializes this analyzer. This method is called just before the
+     * execution of control flow analysis loop in #analyze. The default
+     * implementation of this method does nothing.
+     * 
+     * @param owner
+     *            the internal name of the class to which the method belongs.
+     * @param m
+     *            the method to be analyzed.
+     * @throws AnalyzerException
+     *             if a problem occurs.
+     */
+    protected void init(String owner, MethodNode m) throws AnalyzerException {
+    }
+
+    /**
+     * Constructs a new frame with the given size.
+     * 
+     * @param nLocals
+     *            the maximum number of local variables of the frame.
+     * @param nStack
+     *            the maximum stack size of the frame.
+     * @return the created frame.
+     */
+    protected Frame<V> newFrame(final int nLocals, final int nStack) {
+        return new Frame<V>(nLocals, nStack);
+    }
+
+    /**
+     * Constructs a new frame that is identical to the given frame.
+     * 
+     * @param src
+     *            a frame.
+     * @return the created frame.
+     */
+    protected Frame<V> newFrame(final Frame<? extends V> src) {
+        return new Frame<V>(src);
+    }
+
+    /**
+     * Creates a control flow graph edge. The default implementation of this
+     * method does nothing. It can be overriden in order to construct the
+     * control flow graph of a method (this method is called by the
+     * {@link #analyze analyze} method during its visit of the method's code).
+     * 
+     * @param insn
+     *            an instruction index.
+     * @param successor
+     *            index of a successor instruction.
+     */
+    protected void newControlFlowEdge(final int insn, final int successor) {
+    }
+
+    /**
+     * Creates a control flow graph edge corresponding to an exception handler.
+     * The default implementation of this method does nothing. It can be
+     * overridden in order to construct the control flow graph of a method (this
+     * method is called by the {@link #analyze analyze} method during its visit
+     * of the method's code).
+     * 
+     * @param insn
+     *            an instruction index.
+     * @param successor
+     *            index of a successor instruction.
+     * @return true if this edge must be considered in the data flow analysis
+     *         performed by this analyzer, or false otherwise. The default
+     *         implementation of this method always returns true.
+     */
+    protected boolean newControlFlowExceptionEdge(final int insn,
+            final int successor) {
+        return true;
+    }
+
+    /**
+     * Creates a control flow graph edge corresponding to an exception handler.
+     * The default implementation of this method delegates to
+     * {@link #newControlFlowExceptionEdge(int, int)
+     * newControlFlowExceptionEdge(int, int)}. It can be overridden in order to
+     * construct the control flow graph of a method (this method is called by
+     * the {@link #analyze analyze} method during its visit of the method's
+     * code).
+     * 
+     * @param insn
+     *            an instruction index.
+     * @param tcb
+     *            TryCatchBlockNode corresponding to this edge.
+     * @return true if this edge must be considered in the data flow analysis
+     *         performed by this analyzer, or false otherwise. The default
+     *         implementation of this method delegates to
+     *         {@link #newControlFlowExceptionEdge(int, int)
+     *         newControlFlowExceptionEdge(int, int)}.
+     */
+    protected boolean newControlFlowExceptionEdge(final int insn,
+            final TryCatchBlockNode tcb) {
+        return newControlFlowExceptionEdge(insn, insns.indexOf(tcb.handler));
+    }
+
+    // -------------------------------------------------------------------------
+
+    private void merge(final int insn, final Frame<V> frame,
+            final Subroutine subroutine) throws AnalyzerException {
+        Frame<V> oldFrame = frames[insn];
+        Subroutine oldSubroutine = subroutines[insn];
+        boolean changes;
+
+        if (oldFrame == null) {
+            frames[insn] = newFrame(frame);
+            changes = true;
+        } else {
+            changes = oldFrame.merge(frame, interpreter);
+        }
+
+        if (oldSubroutine == null) {
+            if (subroutine != null) {
+                subroutines[insn] = subroutine.copy();
+                changes = true;
+            }
+        } else {
+            if (subroutine != null) {
+                changes |= oldSubroutine.merge(subroutine);
+            }
+        }
+        if (changes && !queued[insn]) {
+            queued[insn] = true;
+            queue[top++] = insn;
+        }
+    }
+
+    private void merge(final int insn, final Frame<V> beforeJSR,
+            final Frame<V> afterRET, final Subroutine subroutineBeforeJSR,
+            final boolean[] access) throws AnalyzerException {
+        Frame<V> oldFrame = frames[insn];
+        Subroutine oldSubroutine = subroutines[insn];
+        boolean changes;
+
+        afterRET.merge(beforeJSR, access);
+
+        if (oldFrame == null) {
+            frames[insn] = newFrame(afterRET);
+            changes = true;
+        } else {
+            changes = oldFrame.merge(afterRET, interpreter);
+        }
+
+        if (oldSubroutine != null && subroutineBeforeJSR != null) {
+            changes |= oldSubroutine.merge(subroutineBeforeJSR);
+        }
+        if (changes && !queued[insn]) {
+            queued[insn] = true;
+            queue[top++] = insn;
+        }
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/analysis/AnalyzerException.java b/src/main/asm/org/objectweb/asm/tree/analysis/AnalyzerException.java
new file mode 100644
index 0000000..5be70da
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/analysis/AnalyzerException.java
@@ -0,0 +1,61 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree.analysis;
+
+import org.objectweb.asm.tree.AbstractInsnNode;
+
+/**
+ * Thrown if a problem occurs during the analysis of a method.
+ * 
+ * @author Bing Ran
+ * @author Eric Bruneton
+ */
+public class AnalyzerException extends Exception {
+
+    public final AbstractInsnNode node;
+
+    public AnalyzerException(final AbstractInsnNode node, final String msg) {
+        super(msg);
+        this.node = node;
+    }
+
+    public AnalyzerException(final AbstractInsnNode node, final String msg,
+            final Throwable exception) {
+        super(msg, exception);
+        this.node = node;
+    }
+
+    public AnalyzerException(final AbstractInsnNode node, final String msg,
+            final Object expected, final Value encountered) {
+        super((msg == null ? "Expected " : msg + ": expected ") + expected
+                + ", but found " + encountered);
+        this.node = node;
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/analysis/BasicInterpreter.java b/src/main/asm/org/objectweb/asm/tree/analysis/BasicInterpreter.java
new file mode 100644
index 0000000..119bec2
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/analysis/BasicInterpreter.java
@@ -0,0 +1,358 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree.analysis;
+
+import java.util.List;
+
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.FieldInsnNode;
+import org.objectweb.asm.tree.IntInsnNode;
+import org.objectweb.asm.tree.InvokeDynamicInsnNode;
+import org.objectweb.asm.tree.LdcInsnNode;
+import org.objectweb.asm.tree.MethodInsnNode;
+import org.objectweb.asm.tree.MultiANewArrayInsnNode;
+import org.objectweb.asm.tree.TypeInsnNode;
+
+/**
+ * An {@link Interpreter} for {@link BasicValue} values.
+ * 
+ * @author Eric Bruneton
+ * @author Bing Ran
+ */
+public class BasicInterpreter extends Interpreter<BasicValue> implements
+        Opcodes {
+
+    public BasicInterpreter() {
+        super(ASM4);
+    }
+
+    protected BasicInterpreter(final int api) {
+        super(api);
+    }
+
+    @Override
+    public BasicValue newValue(final Type type) {
+        if (type == null) {
+            return BasicValue.UNINITIALIZED_VALUE;
+        }
+        switch (type.getSort()) {
+        case Type.VOID:
+            return null;
+        case Type.BOOLEAN:
+        case Type.CHAR:
+        case Type.BYTE:
+        case Type.SHORT:
+        case Type.INT:
+            return BasicValue.INT_VALUE;
+        case Type.FLOAT:
+            return BasicValue.FLOAT_VALUE;
+        case Type.LONG:
+            return BasicValue.LONG_VALUE;
+        case Type.DOUBLE:
+            return BasicValue.DOUBLE_VALUE;
+        case Type.ARRAY:
+        case Type.OBJECT:
+            return BasicValue.REFERENCE_VALUE;
+        default:
+            throw new Error("Internal error");
+        }
+    }
+
+    @Override
+    public BasicValue newOperation(final AbstractInsnNode insn)
+            throws AnalyzerException {
+        switch (insn.getOpcode()) {
+        case ACONST_NULL:
+            return newValue(Type.getObjectType("null"));
+        case ICONST_M1:
+        case ICONST_0:
+        case ICONST_1:
+        case ICONST_2:
+        case ICONST_3:
+        case ICONST_4:
+        case ICONST_5:
+            return BasicValue.INT_VALUE;
+        case LCONST_0:
+        case LCONST_1:
+            return BasicValue.LONG_VALUE;
+        case FCONST_0:
+        case FCONST_1:
+        case FCONST_2:
+            return BasicValue.FLOAT_VALUE;
+        case DCONST_0:
+        case DCONST_1:
+            return BasicValue.DOUBLE_VALUE;
+        case BIPUSH:
+        case SIPUSH:
+            return BasicValue.INT_VALUE;
+        case LDC:
+            Object cst = ((LdcInsnNode) insn).cst;
+            if (cst instanceof Integer) {
+                return BasicValue.INT_VALUE;
+            } else if (cst instanceof Float) {
+                return BasicValue.FLOAT_VALUE;
+            } else if (cst instanceof Long) {
+                return BasicValue.LONG_VALUE;
+            } else if (cst instanceof Double) {
+                return BasicValue.DOUBLE_VALUE;
+            } else if (cst instanceof String) {
+                return newValue(Type.getObjectType("java/lang/String"));
+            } else if (cst instanceof Type) {
+                int sort = ((Type) cst).getSort();
+                if (sort == Type.OBJECT || sort == Type.ARRAY) {
+                    return newValue(Type.getObjectType("java/lang/Class"));
+                } else if (sort == Type.METHOD) {
+                    return newValue(Type
+                            .getObjectType("java/lang/invoke/MethodType"));
+                } else {
+                    throw new IllegalArgumentException("Illegal LDC constant "
+                            + cst);
+                }
+            } else if (cst instanceof Handle) {
+                return newValue(Type
+                        .getObjectType("java/lang/invoke/MethodHandle"));
+            } else {
+                throw new IllegalArgumentException("Illegal LDC constant "
+                        + cst);
+            }
+        case JSR:
+            return BasicValue.RETURNADDRESS_VALUE;
+        case GETSTATIC:
+            return newValue(Type.getType(((FieldInsnNode) insn).desc));
+        case NEW:
+            return newValue(Type.getObjectType(((TypeInsnNode) insn).desc));
+        default:
+            throw new Error("Internal error.");
+        }
+    }
+
+    @Override
+    public BasicValue copyOperation(final AbstractInsnNode insn,
+            final BasicValue value) throws AnalyzerException {
+        return value;
+    }
+
+    @Override
+    public BasicValue unaryOperation(final AbstractInsnNode insn,
+            final BasicValue value) throws AnalyzerException {
+        switch (insn.getOpcode()) {
+        case INEG:
+        case IINC:
+        case L2I:
+        case F2I:
+        case D2I:
+        case I2B:
+        case I2C:
+        case I2S:
+            return BasicValue.INT_VALUE;
+        case FNEG:
+        case I2F:
+        case L2F:
+        case D2F:
+            return BasicValue.FLOAT_VALUE;
+        case LNEG:
+        case I2L:
+        case F2L:
+        case D2L:
+            return BasicValue.LONG_VALUE;
+        case DNEG:
+        case I2D:
+        case L2D:
+        case F2D:
+            return BasicValue.DOUBLE_VALUE;
+        case IFEQ:
+        case IFNE:
+        case IFLT:
+        case IFGE:
+        case IFGT:
+        case IFLE:
+        case TABLESWITCH:
+        case LOOKUPSWITCH:
+        case IRETURN:
+        case LRETURN:
+        case FRETURN:
+        case DRETURN:
+        case ARETURN:
+        case PUTSTATIC:
+            return null;
+        case GETFIELD:
+            return newValue(Type.getType(((FieldInsnNode) insn).desc));
+        case NEWARRAY:
+            switch (((IntInsnNode) insn).operand) {
+            case T_BOOLEAN:
+                return newValue(Type.getType("[Z"));
+            case T_CHAR:
+                return newValue(Type.getType("[C"));
+            case T_BYTE:
+                return newValue(Type.getType("[B"));
+            case T_SHORT:
+                return newValue(Type.getType("[S"));
+            case T_INT:
+                return newValue(Type.getType("[I"));
+            case T_FLOAT:
+                return newValue(Type.getType("[F"));
+            case T_DOUBLE:
+                return newValue(Type.getType("[D"));
+            case T_LONG:
+                return newValue(Type.getType("[J"));
+            default:
+                throw new AnalyzerException(insn, "Invalid array type");
+            }
+        case ANEWARRAY:
+            String desc = ((TypeInsnNode) insn).desc;
+            return newValue(Type.getType("[" + Type.getObjectType(desc)));
+        case ARRAYLENGTH:
+            return BasicValue.INT_VALUE;
+        case ATHROW:
+            return null;
+        case CHECKCAST:
+            desc = ((TypeInsnNode) insn).desc;
+            return newValue(Type.getObjectType(desc));
+        case INSTANCEOF:
+            return BasicValue.INT_VALUE;
+        case MONITORENTER:
+        case MONITOREXIT:
+        case IFNULL:
+        case IFNONNULL:
+            return null;
+        default:
+            throw new Error("Internal error.");
+        }
+    }
+
+    @Override
+    public BasicValue binaryOperation(final AbstractInsnNode insn,
+            final BasicValue value1, final BasicValue value2)
+            throws AnalyzerException {
+        switch (insn.getOpcode()) {
+        case IALOAD:
+        case BALOAD:
+        case CALOAD:
+        case SALOAD:
+        case IADD:
+        case ISUB:
+        case IMUL:
+        case IDIV:
+        case IREM:
+        case ISHL:
+        case ISHR:
+        case IUSHR:
+        case IAND:
+        case IOR:
+        case IXOR:
+            return BasicValue.INT_VALUE;
+        case FALOAD:
+        case FADD:
+        case FSUB:
+        case FMUL:
+        case FDIV:
+        case FREM:
+            return BasicValue.FLOAT_VALUE;
+        case LALOAD:
+        case LADD:
+        case LSUB:
+        case LMUL:
+        case LDIV:
+        case LREM:
+        case LSHL:
+        case LSHR:
+        case LUSHR:
+        case LAND:
+        case LOR:
+        case LXOR:
+            return BasicValue.LONG_VALUE;
+        case DALOAD:
+        case DADD:
+        case DSUB:
+        case DMUL:
+        case DDIV:
+        case DREM:
+            return BasicValue.DOUBLE_VALUE;
+        case AALOAD:
+            return BasicValue.REFERENCE_VALUE;
+        case LCMP:
+        case FCMPL:
+        case FCMPG:
+        case DCMPL:
+        case DCMPG:
+            return BasicValue.INT_VALUE;
+        case IF_ICMPEQ:
+        case IF_ICMPNE:
+        case IF_ICMPLT:
+        case IF_ICMPGE:
+        case IF_ICMPGT:
+        case IF_ICMPLE:
+        case IF_ACMPEQ:
+        case IF_ACMPNE:
+        case PUTFIELD:
+            return null;
+        default:
+            throw new Error("Internal error.");
+        }
+    }
+
+    @Override
+    public BasicValue ternaryOperation(final AbstractInsnNode insn,
+            final BasicValue value1, final BasicValue value2,
+            final BasicValue value3) throws AnalyzerException {
+        return null;
+    }
+
+    @Override
+    public BasicValue naryOperation(final AbstractInsnNode insn,
+            final List<? extends BasicValue> values) throws AnalyzerException {
+        int opcode = insn.getOpcode();
+        if (opcode == MULTIANEWARRAY) {
+            return newValue(Type.getType(((MultiANewArrayInsnNode) insn).desc));
+        } else if (opcode == INVOKEDYNAMIC) {
+            return newValue(Type
+                    .getReturnType(((InvokeDynamicInsnNode) insn).desc));
+        } else {
+            return newValue(Type.getReturnType(((MethodInsnNode) insn).desc));
+        }
+    }
+
+    @Override
+    public void returnOperation(final AbstractInsnNode insn,
+            final BasicValue value, final BasicValue expected)
+            throws AnalyzerException {
+    }
+
+    @Override
+    public BasicValue merge(final BasicValue v, final BasicValue w) {
+        if (!v.equals(w)) {
+            return BasicValue.UNINITIALIZED_VALUE;
+        }
+        return v;
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/analysis/BasicValue.java b/src/main/asm/org/objectweb/asm/tree/analysis/BasicValue.java
new file mode 100644
index 0000000..78316ae
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/analysis/BasicValue.java
@@ -0,0 +1,111 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree.analysis;
+
+import org.objectweb.asm.Type;
+
+/**
+ * A {@link Value} that is represented by its type in a seven types type system.
+ * This type system distinguishes the UNINITIALZED, INT, FLOAT, LONG, DOUBLE,
+ * REFERENCE and RETURNADDRESS types.
+ * 
+ * @author Eric Bruneton
+ */
+public class BasicValue implements Value {
+
+    public static final BasicValue UNINITIALIZED_VALUE = new BasicValue(null);
+
+    public static final BasicValue INT_VALUE = new BasicValue(Type.INT_TYPE);
+
+    public static final BasicValue FLOAT_VALUE = new BasicValue(Type.FLOAT_TYPE);
+
+    public static final BasicValue LONG_VALUE = new BasicValue(Type.LONG_TYPE);
+
+    public static final BasicValue DOUBLE_VALUE = new BasicValue(
+            Type.DOUBLE_TYPE);
+
+    public static final BasicValue REFERENCE_VALUE = new BasicValue(
+            Type.getObjectType("java/lang/Object"));
+
+    public static final BasicValue RETURNADDRESS_VALUE = new BasicValue(
+            Type.VOID_TYPE);
+
+    private final Type type;
+
+    public BasicValue(final Type type) {
+        this.type = type;
+    }
+
+    public Type getType() {
+        return type;
+    }
+
+    public int getSize() {
+        return type == Type.LONG_TYPE || type == Type.DOUBLE_TYPE ? 2 : 1;
+    }
+
+    public boolean isReference() {
+        return type != null
+                && (type.getSort() == Type.OBJECT || type.getSort() == Type.ARRAY);
+    }
+
+    @Override
+    public boolean equals(final Object value) {
+        if (value == this) {
+            return true;
+        } else if (value instanceof BasicValue) {
+            if (type == null) {
+                return ((BasicValue) value).type == null;
+            } else {
+                return type.equals(((BasicValue) value).type);
+            }
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public int hashCode() {
+        return type == null ? 0 : type.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        if (this == UNINITIALIZED_VALUE) {
+            return ".";
+        } else if (this == RETURNADDRESS_VALUE) {
+            return "A";
+        } else if (this == REFERENCE_VALUE) {
+            return "R";
+        } else {
+            return type.getDescriptor();
+        }
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/analysis/BasicVerifier.java b/src/main/asm/org/objectweb/asm/tree/analysis/BasicVerifier.java
new file mode 100644
index 0000000..68ab2f5
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/analysis/BasicVerifier.java
@@ -0,0 +1,433 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree.analysis;
+
+import java.util.List;
+
+import org.objectweb.asm.Type;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.FieldInsnNode;
+import org.objectweb.asm.tree.InvokeDynamicInsnNode;
+import org.objectweb.asm.tree.MethodInsnNode;
+
+/**
+ * An extended {@link BasicInterpreter} that checks that bytecode instructions
+ * are correctly used.
+ * 
+ * @author Eric Bruneton
+ * @author Bing Ran
+ */
+public class BasicVerifier extends BasicInterpreter {
+
+    public BasicVerifier() {
+        super(ASM4);
+    }
+
+    protected BasicVerifier(final int api) {
+        super(api);
+    }
+
+    @Override
+    public BasicValue copyOperation(final AbstractInsnNode insn,
+            final BasicValue value) throws AnalyzerException {
+        Value expected;
+        switch (insn.getOpcode()) {
+        case ILOAD:
+        case ISTORE:
+            expected = BasicValue.INT_VALUE;
+            break;
+        case FLOAD:
+        case FSTORE:
+            expected = BasicValue.FLOAT_VALUE;
+            break;
+        case LLOAD:
+        case LSTORE:
+            expected = BasicValue.LONG_VALUE;
+            break;
+        case DLOAD:
+        case DSTORE:
+            expected = BasicValue.DOUBLE_VALUE;
+            break;
+        case ALOAD:
+            if (!value.isReference()) {
+                throw new AnalyzerException(insn, null, "an object reference",
+                        value);
+            }
+            return value;
+        case ASTORE:
+            if (!value.isReference()
+                    && !BasicValue.RETURNADDRESS_VALUE.equals(value)) {
+                throw new AnalyzerException(insn, null,
+                        "an object reference or a return address", value);
+            }
+            return value;
+        default:
+            return value;
+        }
+        if (!expected.equals(value)) {
+            throw new AnalyzerException(insn, null, expected, value);
+        }
+        return value;
+    }
+
+    @Override
+    public BasicValue unaryOperation(final AbstractInsnNode insn,
+            final BasicValue value) throws AnalyzerException {
+        BasicValue expected;
+        switch (insn.getOpcode()) {
+        case INEG:
+        case IINC:
+        case I2F:
+        case I2L:
+        case I2D:
+        case I2B:
+        case I2C:
+        case I2S:
+        case IFEQ:
+        case IFNE:
+        case IFLT:
+        case IFGE:
+        case IFGT:
+        case IFLE:
+        case TABLESWITCH:
+        case LOOKUPSWITCH:
+        case IRETURN:
+        case NEWARRAY:
+        case ANEWARRAY:
+            expected = BasicValue.INT_VALUE;
+            break;
+        case FNEG:
+        case F2I:
+        case F2L:
+        case F2D:
+        case FRETURN:
+            expected = BasicValue.FLOAT_VALUE;
+            break;
+        case LNEG:
+        case L2I:
+        case L2F:
+        case L2D:
+        case LRETURN:
+            expected = BasicValue.LONG_VALUE;
+            break;
+        case DNEG:
+        case D2I:
+        case D2F:
+        case D2L:
+        case DRETURN:
+            expected = BasicValue.DOUBLE_VALUE;
+            break;
+        case GETFIELD:
+            expected = newValue(Type
+                    .getObjectType(((FieldInsnNode) insn).owner));
+            break;
+        case CHECKCAST:
+            if (!value.isReference()) {
+                throw new AnalyzerException(insn, null, "an object reference",
+                        value);
+            }
+            return super.unaryOperation(insn, value);
+        case ARRAYLENGTH:
+            if (!isArrayValue(value)) {
+                throw new AnalyzerException(insn, null, "an array reference",
+                        value);
+            }
+            return super.unaryOperation(insn, value);
+        case ARETURN:
+        case ATHROW:
+        case INSTANCEOF:
+        case MONITORENTER:
+        case MONITOREXIT:
+        case IFNULL:
+        case IFNONNULL:
+            if (!value.isReference()) {
+                throw new AnalyzerException(insn, null, "an object reference",
+                        value);
+            }
+            return super.unaryOperation(insn, value);
+        case PUTSTATIC:
+            expected = newValue(Type.getType(((FieldInsnNode) insn).desc));
+            break;
+        default:
+            throw new Error("Internal error.");
+        }
+        if (!isSubTypeOf(value, expected)) {
+            throw new AnalyzerException(insn, null, expected, value);
+        }
+        return super.unaryOperation(insn, value);
+    }
+
+    @Override
+    public BasicValue binaryOperation(final AbstractInsnNode insn,
+            final BasicValue value1, final BasicValue value2)
+            throws AnalyzerException {
+        BasicValue expected1;
+        BasicValue expected2;
+        switch (insn.getOpcode()) {
+        case IALOAD:
+            expected1 = newValue(Type.getType("[I"));
+            expected2 = BasicValue.INT_VALUE;
+            break;
+        case BALOAD:
+            if (isSubTypeOf(value1, newValue(Type.getType("[Z")))) {
+                expected1 = newValue(Type.getType("[Z"));
+            } else {
+                expected1 = newValue(Type.getType("[B"));
+            }
+            expected2 = BasicValue.INT_VALUE;
+            break;
+        case CALOAD:
+            expected1 = newValue(Type.getType("[C"));
+            expected2 = BasicValue.INT_VALUE;
+            break;
+        case SALOAD:
+            expected1 = newValue(Type.getType("[S"));
+            expected2 = BasicValue.INT_VALUE;
+            break;
+        case LALOAD:
+            expected1 = newValue(Type.getType("[J"));
+            expected2 = BasicValue.INT_VALUE;
+            break;
+        case FALOAD:
+            expected1 = newValue(Type.getType("[F"));
+            expected2 = BasicValue.INT_VALUE;
+            break;
+        case DALOAD:
+            expected1 = newValue(Type.getType("[D"));
+            expected2 = BasicValue.INT_VALUE;
+            break;
+        case AALOAD:
+            expected1 = newValue(Type.getType("[Ljava/lang/Object;"));
+            expected2 = BasicValue.INT_VALUE;
+            break;
+        case IADD:
+        case ISUB:
+        case IMUL:
+        case IDIV:
+        case IREM:
+        case ISHL:
+        case ISHR:
+        case IUSHR:
+        case IAND:
+        case IOR:
+        case IXOR:
+        case IF_ICMPEQ:
+        case IF_ICMPNE:
+        case IF_ICMPLT:
+        case IF_ICMPGE:
+        case IF_ICMPGT:
+        case IF_ICMPLE:
+            expected1 = BasicValue.INT_VALUE;
+            expected2 = BasicValue.INT_VALUE;
+            break;
+        case FADD:
+        case FSUB:
+        case FMUL:
+        case FDIV:
+        case FREM:
+        case FCMPL:
+        case FCMPG:
+            expected1 = BasicValue.FLOAT_VALUE;
+            expected2 = BasicValue.FLOAT_VALUE;
+            break;
+        case LADD:
+        case LSUB:
+        case LMUL:
+        case LDIV:
+        case LREM:
+        case LAND:
+        case LOR:
+        case LXOR:
+        case LCMP:
+            expected1 = BasicValue.LONG_VALUE;
+            expected2 = BasicValue.LONG_VALUE;
+            break;
+        case LSHL:
+        case LSHR:
+        case LUSHR:
+            expected1 = BasicValue.LONG_VALUE;
+            expected2 = BasicValue.INT_VALUE;
+            break;
+        case DADD:
+        case DSUB:
+        case DMUL:
+        case DDIV:
+        case DREM:
+        case DCMPL:
+        case DCMPG:
+            expected1 = BasicValue.DOUBLE_VALUE;
+            expected2 = BasicValue.DOUBLE_VALUE;
+            break;
+        case IF_ACMPEQ:
+        case IF_ACMPNE:
+            expected1 = BasicValue.REFERENCE_VALUE;
+            expected2 = BasicValue.REFERENCE_VALUE;
+            break;
+        case PUTFIELD:
+            FieldInsnNode fin = (FieldInsnNode) insn;
+            expected1 = newValue(Type.getObjectType(fin.owner));
+            expected2 = newValue(Type.getType(fin.desc));
+            break;
+        default:
+            throw new Error("Internal error.");
+        }
+        if (!isSubTypeOf(value1, expected1)) {
+            throw new AnalyzerException(insn, "First argument", expected1,
+                    value1);
+        } else if (!isSubTypeOf(value2, expected2)) {
+            throw new AnalyzerException(insn, "Second argument", expected2,
+                    value2);
+        }
+        if (insn.getOpcode() == AALOAD) {
+            return getElementValue(value1);
+        } else {
+            return super.binaryOperation(insn, value1, value2);
+        }
+    }
+
+    @Override
+    public BasicValue ternaryOperation(final AbstractInsnNode insn,
+            final BasicValue value1, final BasicValue value2,
+            final BasicValue value3) throws AnalyzerException {
+        BasicValue expected1;
+        BasicValue expected3;
+        switch (insn.getOpcode()) {
+        case IASTORE:
+            expected1 = newValue(Type.getType("[I"));
+            expected3 = BasicValue.INT_VALUE;
+            break;
+        case BASTORE:
+            if (isSubTypeOf(value1, newValue(Type.getType("[Z")))) {
+                expected1 = newValue(Type.getType("[Z"));
+            } else {
+                expected1 = newValue(Type.getType("[B"));
+            }
+            expected3 = BasicValue.INT_VALUE;
+            break;
+        case CASTORE:
+            expected1 = newValue(Type.getType("[C"));
+            expected3 = BasicValue.INT_VALUE;
+            break;
+        case SASTORE:
+            expected1 = newValue(Type.getType("[S"));
+            expected3 = BasicValue.INT_VALUE;
+            break;
+        case LASTORE:
+            expected1 = newValue(Type.getType("[J"));
+            expected3 = BasicValue.LONG_VALUE;
+            break;
+        case FASTORE:
+            expected1 = newValue(Type.getType("[F"));
+            expected3 = BasicValue.FLOAT_VALUE;
+            break;
+        case DASTORE:
+            expected1 = newValue(Type.getType("[D"));
+            expected3 = BasicValue.DOUBLE_VALUE;
+            break;
+        case AASTORE:
+            expected1 = value1;
+            expected3 = BasicValue.REFERENCE_VALUE;
+            break;
+        default:
+            throw new Error("Internal error.");
+        }
+        if (!isSubTypeOf(value1, expected1)) {
+            throw new AnalyzerException(insn, "First argument", "a "
+                    + expected1 + " array reference", value1);
+        } else if (!BasicValue.INT_VALUE.equals(value2)) {
+            throw new AnalyzerException(insn, "Second argument",
+                    BasicValue.INT_VALUE, value2);
+        } else if (!isSubTypeOf(value3, expected3)) {
+            throw new AnalyzerException(insn, "Third argument", expected3,
+                    value3);
+        }
+        return null;
+    }
+
+    @Override
+    public BasicValue naryOperation(final AbstractInsnNode insn,
+            final List<? extends BasicValue> values) throws AnalyzerException {
+        int opcode = insn.getOpcode();
+        if (opcode == MULTIANEWARRAY) {
+            for (int i = 0; i < values.size(); ++i) {
+                if (!BasicValue.INT_VALUE.equals(values.get(i))) {
+                    throw new AnalyzerException(insn, null,
+                            BasicValue.INT_VALUE, values.get(i));
+                }
+            }
+        } else {
+            int i = 0;
+            int j = 0;
+            if (opcode != INVOKESTATIC && opcode != INVOKEDYNAMIC) {
+                Type owner = Type.getObjectType(((MethodInsnNode) insn).owner);
+                if (!isSubTypeOf(values.get(i++), newValue(owner))) {
+                    throw new AnalyzerException(insn, "Method owner",
+                            newValue(owner), values.get(0));
+                }
+            }
+            String desc = (opcode == INVOKEDYNAMIC) ? ((InvokeDynamicInsnNode) insn).desc
+                    : ((MethodInsnNode) insn).desc;
+            Type[] args = Type.getArgumentTypes(desc);
+            while (i < values.size()) {
+                BasicValue expected = newValue(args[j++]);
+                BasicValue encountered = values.get(i++);
+                if (!isSubTypeOf(encountered, expected)) {
+                    throw new AnalyzerException(insn, "Argument " + j,
+                            expected, encountered);
+                }
+            }
+        }
+        return super.naryOperation(insn, values);
+    }
+
+    @Override
+    public void returnOperation(final AbstractInsnNode insn,
+            final BasicValue value, final BasicValue expected)
+            throws AnalyzerException {
+        if (!isSubTypeOf(value, expected)) {
+            throw new AnalyzerException(insn, "Incompatible return type",
+                    expected, value);
+        }
+    }
+
+    protected boolean isArrayValue(final BasicValue value) {
+        return value.isReference();
+    }
+
+    protected BasicValue getElementValue(final BasicValue objectArrayValue)
+            throws AnalyzerException {
+        return BasicValue.REFERENCE_VALUE;
+    }
+
+    protected boolean isSubTypeOf(final BasicValue value,
+            final BasicValue expected) {
+        return value.equals(expected);
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/analysis/Frame.java b/src/main/asm/org/objectweb/asm/tree/analysis/Frame.java
new file mode 100644
index 0000000..4428933
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/analysis/Frame.java
@@ -0,0 +1,704 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree.analysis;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.IincInsnNode;
+import org.objectweb.asm.tree.InvokeDynamicInsnNode;
+import org.objectweb.asm.tree.MethodInsnNode;
+import org.objectweb.asm.tree.MultiANewArrayInsnNode;
+import org.objectweb.asm.tree.VarInsnNode;
+
+/**
+ * A symbolic execution stack frame. A stack frame contains a set of local
+ * variable slots, and an operand stack. Warning: long and double values are
+ * represented by <i>two</i> slots in local variables, and by <i>one</i> slot in
+ * the operand stack.
+ * 
+ * @param <V> type of the Value used for the analysis.
+ * 
+ * @author Eric Bruneton
+ */
+public class Frame<V extends Value> {
+
+	/**
+	 * The expected return type of the analyzed method, or <tt>null</tt> if the
+	 * method returns void.
+	 */
+	private V returnValue;
+
+	/**
+	 * The local variables and operand stack of this frame.
+	 */
+	private V[] values;
+
+	/**
+	 * The number of local variables of this frame.
+	 */
+	private int locals;
+
+	/**
+	 * The number of elements in the operand stack.
+	 */
+	private int top;
+
+	/**
+	 * Constructs a new frame with the given size.
+	 * 
+	 * @param nLocals the maximum number of local variables of the frame.
+	 * @param nStack  the maximum stack size of the frame.
+	 */
+	public Frame(final int nLocals, final int nStack) {
+		this.values = (V[]) new Value[nLocals + nStack];
+		this.locals = nLocals;
+	}
+
+	/**
+	 * Constructs a new frame that is identical to the given frame.
+	 * 
+	 * @param src a frame.
+	 */
+	public Frame(final Frame<? extends V> src) {
+		this(src.locals, src.values.length - src.locals);
+		init(src);
+	}
+
+	/**
+	 * Copies the state of the given frame into this frame.
+	 * 
+	 * @param src a frame.
+	 * @return this frame.
+	 */
+	public Frame<V> init(final Frame<? extends V> src) {
+		returnValue = src.returnValue;
+		System.arraycopy(src.values, 0, values, 0, values.length);
+		top = src.top;
+		return this;
+	}
+
+	/**
+	 * Sets the expected return type of the analyzed method.
+	 * 
+	 * @param v the expected return type of the analyzed method, or <tt>null</tt> if
+	 *          the method returns void.
+	 */
+	public void setReturn(final V v) {
+		returnValue = v;
+	}
+
+	/**
+	 * Returns the maximum number of local variables of this frame.
+	 * 
+	 * @return the maximum number of local variables of this frame.
+	 */
+	public int getLocals() {
+		return locals;
+	}
+
+	/**
+	 * Returns the value of the given local variable.
+	 * 
+	 * @param i a local variable index.
+	 * @return the value of the given local variable.
+	 * @throws IndexOutOfBoundsException if the variable does not exist.
+	 */
+	public V getLocal(final int i) throws IndexOutOfBoundsException {
+		if (i >= locals) {
+			throw new IndexOutOfBoundsException("Trying to access an inexistant local variable");
+		}
+		return values[i];
+	}
+
+	/**
+	 * Sets the value of the given local variable.
+	 * 
+	 * @param i     a local variable index.
+	 * @param value the new value of this local variable.
+	 * @throws IndexOutOfBoundsException if the variable does not exist.
+	 */
+	public void setLocal(final int i, final V value) throws IndexOutOfBoundsException {
+		if (i >= locals) {
+			throw new IndexOutOfBoundsException("Trying to access an inexistant local variable " + i);
+		}
+		values[i] = value;
+	}
+
+	/**
+	 * Returns the number of values in the operand stack of this frame. Long and
+	 * double values are treated as single values.
+	 * 
+	 * @return the number of values in the operand stack of this frame.
+	 */
+	public int getStackSize() {
+		return top;
+	}
+
+	/**
+	 * Returns the value of the given operand stack slot.
+	 * 
+	 * @param i the index of an operand stack slot.
+	 * @return the value of the given operand stack slot.
+	 * @throws IndexOutOfBoundsException if the operand stack slot does not exist.
+	 */
+	public V getStack(final int i) throws IndexOutOfBoundsException {
+		return values[i + locals];
+	}
+
+	public void setStack(final int i, V v) throws IndexOutOfBoundsException {
+		values[i + locals] = v;
+	}
+
+	/**
+	 * Clears the operand stack of this frame.
+	 */
+	public void clearStack() {
+		top = 0;
+	}
+
+	/**
+	 * Pops a value from the operand stack of this frame.
+	 * 
+	 * @return the value that has been popped from the stack.
+	 * @throws IndexOutOfBoundsException if the operand stack is empty.
+	 */
+	public V pop() throws IndexOutOfBoundsException {
+		if (top == 0) {
+			throw new IndexOutOfBoundsException("Cannot pop operand off an empty stack.");
+		}
+		return values[--top + locals];
+	}
+
+	/**
+	 * Pushes a value into the operand stack of this frame.
+	 * 
+	 * @param value the value that must be pushed into the stack.
+	 * @throws IndexOutOfBoundsException if the operand stack is full.
+	 */
+	public void push(final V value) throws IndexOutOfBoundsException {
+		if (top + locals >= values.length) {
+			throw new IndexOutOfBoundsException("Insufficient maximum stack size.");
+		}
+		values[top++ + locals] = value;
+	}
+
+	public void execute(final AbstractInsnNode insn, final Interpreter<V> interpreter) throws AnalyzerException {
+		V value1, value2, value3, value4;
+		List<V> values;
+		int var;
+
+		switch (insn.getOpcode()) {
+		case Opcodes.NOP:
+			break;
+		case Opcodes.ACONST_NULL:
+		case Opcodes.ICONST_M1:
+		case Opcodes.ICONST_0:
+		case Opcodes.ICONST_1:
+		case Opcodes.ICONST_2:
+		case Opcodes.ICONST_3:
+		case Opcodes.ICONST_4:
+		case Opcodes.ICONST_5:
+		case Opcodes.LCONST_0:
+		case Opcodes.LCONST_1:
+		case Opcodes.FCONST_0:
+		case Opcodes.FCONST_1:
+		case Opcodes.FCONST_2:
+		case Opcodes.DCONST_0:
+		case Opcodes.DCONST_1:
+		case Opcodes.BIPUSH:
+		case Opcodes.SIPUSH:
+		case Opcodes.LDC:
+			push(interpreter.newOperation(insn));
+			break;
+		case Opcodes.ILOAD:
+		case Opcodes.LLOAD:
+		case Opcodes.FLOAD:
+		case Opcodes.DLOAD:
+		case Opcodes.ALOAD:
+			push(interpreter.copyOperation(insn, getLocal(((VarInsnNode) insn).var)));
+			break;
+		case Opcodes.IALOAD:
+		case Opcodes.LALOAD:
+		case Opcodes.FALOAD:
+		case Opcodes.DALOAD:
+		case Opcodes.AALOAD:
+		case Opcodes.BALOAD:
+		case Opcodes.CALOAD:
+		case Opcodes.SALOAD:
+			value2 = pop();
+			value1 = pop();
+			push(interpreter.binaryOperation(insn, value1, value2));
+			break;
+		case Opcodes.ISTORE:
+		case Opcodes.LSTORE:
+		case Opcodes.FSTORE:
+		case Opcodes.DSTORE:
+		case Opcodes.ASTORE:
+			value1 = interpreter.copyOperation(insn, pop());
+			var = ((VarInsnNode) insn).var;
+			setLocal(var, value1);
+			if (value1.getSize() == 2) {
+				setLocal(var + 1, interpreter.newValue(null));
+			}
+			if (var > 0) {
+				Value local = getLocal(var - 1);
+				if (local != null && local.getSize() == 2) {
+					setLocal(var - 1, interpreter.newValue(null));
+				}
+			}
+			break;
+		case Opcodes.IASTORE:
+		case Opcodes.LASTORE:
+		case Opcodes.FASTORE:
+		case Opcodes.DASTORE:
+		case Opcodes.AASTORE:
+		case Opcodes.BASTORE:
+		case Opcodes.CASTORE:
+		case Opcodes.SASTORE:
+			value3 = pop();
+			value2 = pop();
+			value1 = pop();
+			interpreter.ternaryOperation(insn, value1, value2, value3);
+			break;
+		case Opcodes.POP:
+			if (pop().getSize() == 2) {
+				throw new AnalyzerException(insn, "Illegal use of POP");
+			}
+			break;
+		case Opcodes.POP2:
+			if (pop().getSize() == 1) {
+				if (pop().getSize() != 1) {
+					throw new AnalyzerException(insn, "Illegal use of POP2");
+				}
+			}
+			break;
+		case Opcodes.DUP:
+			value1 = pop();
+			if (value1.getSize() != 1) {
+				throw new AnalyzerException(insn, "Illegal use of DUP");
+			}
+			push(value1);
+			push(interpreter.copyOperation(insn, value1));
+			break;
+		case Opcodes.DUP_X1:
+			value1 = pop();
+			value2 = pop();
+			if (value1.getSize() != 1 || value2.getSize() != 1) {
+				throw new AnalyzerException(insn, "Illegal use of DUP_X1");
+			}
+			push(interpreter.copyOperation(insn, value1));
+			push(value2);
+			push(value1);
+			break;
+		case Opcodes.DUP_X2:
+			value1 = pop();
+			if (value1.getSize() == 1) {
+				value2 = pop();
+				if (value2.getSize() == 1) {
+					value3 = pop();
+					if (value3.getSize() == 1) {
+						push(interpreter.copyOperation(insn, value1));
+						push(value3);
+						push(value2);
+						push(value1);
+						break;
+					}
+				} else {
+					push(interpreter.copyOperation(insn, value1));
+					push(value2);
+					push(value1);
+					break;
+				}
+			}
+			throw new AnalyzerException(insn, "Illegal use of DUP_X2");
+		case Opcodes.DUP2:
+			value1 = pop();
+			if (value1.getSize() == 1) {
+				value2 = pop();
+				if (value2.getSize() == 1) {
+					push(value2);
+					push(value1);
+					push(interpreter.copyOperation(insn, value2));
+					push(interpreter.copyOperation(insn, value1));
+					break;
+				}
+			} else {
+				push(value1);
+				push(interpreter.copyOperation(insn, value1));
+				break;
+			}
+			throw new AnalyzerException(insn, "Illegal use of DUP2");
+		case Opcodes.DUP2_X1:
+			value1 = pop();
+			if (value1.getSize() == 1) {
+				value2 = pop();
+				if (value2.getSize() == 1) {
+					value3 = pop();
+					if (value3.getSize() == 1) {
+						push(interpreter.copyOperation(insn, value2));
+						push(interpreter.copyOperation(insn, value1));
+						push(value3);
+						push(value2);
+						push(value1);
+						break;
+					}
+				}
+			} else {
+				value2 = pop();
+				if (value2.getSize() == 1) {
+					push(interpreter.copyOperation(insn, value1));
+					push(value2);
+					push(value1);
+					break;
+				}
+			}
+			throw new AnalyzerException(insn, "Illegal use of DUP2_X1");
+		case Opcodes.DUP2_X2:
+			value1 = pop();
+			if (value1.getSize() == 1) {
+				value2 = pop();
+				if (value2.getSize() == 1) {
+					value3 = pop();
+					if (value3.getSize() == 1) {
+						value4 = pop();
+						if (value4.getSize() == 1) {
+							push(interpreter.copyOperation(insn, value2));
+							push(interpreter.copyOperation(insn, value1));
+							push(value4);
+							push(value3);
+							push(value2);
+							push(value1);
+							break;
+						}
+					} else {
+						push(interpreter.copyOperation(insn, value2));
+						push(interpreter.copyOperation(insn, value1));
+						push(value3);
+						push(value2);
+						push(value1);
+						break;
+					}
+				}
+			} else {
+				value2 = pop();
+				if (value2.getSize() == 1) {
+					value3 = pop();
+					if (value3.getSize() == 1) {
+						push(interpreter.copyOperation(insn, value1));
+						push(value3);
+						push(value2);
+						push(value1);
+						break;
+					}
+				} else {
+					push(interpreter.copyOperation(insn, value1));
+					push(value2);
+					push(value1);
+					break;
+				}
+			}
+			throw new AnalyzerException(insn, "Illegal use of DUP2_X2");
+		case Opcodes.SWAP:
+			value2 = pop();
+			value1 = pop();
+			if (value1.getSize() != 1 || value2.getSize() != 1) {
+				throw new AnalyzerException(insn, "Illegal use of SWAP");
+			}
+			push(interpreter.copyOperation(insn, value2));
+			push(interpreter.copyOperation(insn, value1));
+			break;
+		case Opcodes.IADD:
+		case Opcodes.LADD:
+		case Opcodes.FADD:
+		case Opcodes.DADD:
+		case Opcodes.ISUB:
+		case Opcodes.LSUB:
+		case Opcodes.FSUB:
+		case Opcodes.DSUB:
+		case Opcodes.IMUL:
+		case Opcodes.LMUL:
+		case Opcodes.FMUL:
+		case Opcodes.DMUL:
+		case Opcodes.IDIV:
+		case Opcodes.LDIV:
+		case Opcodes.FDIV:
+		case Opcodes.DDIV:
+		case Opcodes.IREM:
+		case Opcodes.LREM:
+		case Opcodes.FREM:
+		case Opcodes.DREM:
+			value2 = pop();
+			value1 = pop();
+			push(interpreter.binaryOperation(insn, value1, value2));
+			break;
+		case Opcodes.INEG:
+		case Opcodes.LNEG:
+		case Opcodes.FNEG:
+		case Opcodes.DNEG:
+			push(interpreter.unaryOperation(insn, pop()));
+			break;
+		case Opcodes.ISHL:
+		case Opcodes.LSHL:
+		case Opcodes.ISHR:
+		case Opcodes.LSHR:
+		case Opcodes.IUSHR:
+		case Opcodes.LUSHR:
+		case Opcodes.IAND:
+		case Opcodes.LAND:
+		case Opcodes.IOR:
+		case Opcodes.LOR:
+		case Opcodes.IXOR:
+		case Opcodes.LXOR:
+			value2 = pop();
+			value1 = pop();
+			push(interpreter.binaryOperation(insn, value1, value2));
+			break;
+		case Opcodes.IINC:
+			var = ((IincInsnNode) insn).var;
+			setLocal(var, interpreter.unaryOperation(insn, getLocal(var)));
+			break;
+		case Opcodes.I2L:
+		case Opcodes.I2F:
+		case Opcodes.I2D:
+		case Opcodes.L2I:
+		case Opcodes.L2F:
+		case Opcodes.L2D:
+		case Opcodes.F2I:
+		case Opcodes.F2L:
+		case Opcodes.F2D:
+		case Opcodes.D2I:
+		case Opcodes.D2L:
+		case Opcodes.D2F:
+		case Opcodes.I2B:
+		case Opcodes.I2C:
+		case Opcodes.I2S:
+			push(interpreter.unaryOperation(insn, pop()));
+			break;
+		case Opcodes.LCMP:
+		case Opcodes.FCMPL:
+		case Opcodes.FCMPG:
+		case Opcodes.DCMPL:
+		case Opcodes.DCMPG:
+			value2 = pop();
+			value1 = pop();
+			push(interpreter.binaryOperation(insn, value1, value2));
+			break;
+		case Opcodes.IFEQ:
+		case Opcodes.IFNE:
+		case Opcodes.IFLT:
+		case Opcodes.IFGE:
+		case Opcodes.IFGT:
+		case Opcodes.IFLE:
+			interpreter.unaryOperation(insn, pop());
+			break;
+		case Opcodes.IF_ICMPEQ:
+		case Opcodes.IF_ICMPNE:
+		case Opcodes.IF_ICMPLT:
+		case Opcodes.IF_ICMPGE:
+		case Opcodes.IF_ICMPGT:
+		case Opcodes.IF_ICMPLE:
+		case Opcodes.IF_ACMPEQ:
+		case Opcodes.IF_ACMPNE:
+			value2 = pop();
+			value1 = pop();
+			interpreter.binaryOperation(insn, value1, value2);
+			break;
+		case Opcodes.GOTO:
+			break;
+		case Opcodes.JSR:
+			push(interpreter.newOperation(insn));
+			break;
+		case Opcodes.RET:
+			break;
+		case Opcodes.TABLESWITCH:
+		case Opcodes.LOOKUPSWITCH:
+			interpreter.unaryOperation(insn, pop());
+			break;
+		case Opcodes.IRETURN:
+		case Opcodes.LRETURN:
+		case Opcodes.FRETURN:
+		case Opcodes.DRETURN:
+		case Opcodes.ARETURN:
+			value1 = pop();
+			interpreter.unaryOperation(insn, value1);
+			interpreter.returnOperation(insn, value1, returnValue);
+			break;
+		case Opcodes.RETURN:
+			if (returnValue != null) {
+				throw new AnalyzerException(insn, "Incompatible return type");
+			}
+			break;
+		case Opcodes.GETSTATIC:
+			push(interpreter.newOperation(insn));
+			break;
+		case Opcodes.PUTSTATIC:
+			interpreter.unaryOperation(insn, pop());
+			break;
+		case Opcodes.GETFIELD:
+			push(interpreter.unaryOperation(insn, pop()));
+			break;
+		case Opcodes.PUTFIELD:
+			value2 = pop();
+			value1 = pop();
+			interpreter.binaryOperation(insn, value1, value2);
+			break;
+		case Opcodes.INVOKEVIRTUAL:
+		case Opcodes.INVOKESPECIAL:
+		case Opcodes.INVOKESTATIC:
+		case Opcodes.INVOKEINTERFACE: {
+			values = new ArrayList<V>();
+			String desc = ((MethodInsnNode) insn).desc;
+			for (int i = Type.getArgumentTypes(desc).length; i > 0; --i) {
+				values.add(0, pop());
+			}
+			if (insn.getOpcode() != Opcodes.INVOKESTATIC) {
+				values.add(0, pop());
+			}
+			if (Type.getReturnType(desc) == Type.VOID_TYPE) {
+				interpreter.naryOperation(insn, values);
+			} else {
+				push(interpreter.naryOperation(insn, values));
+			}
+			break;
+		}
+		case Opcodes.INVOKEDYNAMIC: {
+			values = new ArrayList<V>();
+			String desc = ((InvokeDynamicInsnNode) insn).desc;
+			for (int i = Type.getArgumentTypes(desc).length; i > 0; --i) {
+				values.add(0, pop());
+			}
+			if (Type.getReturnType(desc) == Type.VOID_TYPE) {
+				interpreter.naryOperation(insn, values);
+			} else {
+				push(interpreter.naryOperation(insn, values));
+			}
+			break;
+		}
+		case Opcodes.NEW:
+			push(interpreter.newOperation(insn));
+			break;
+		case Opcodes.NEWARRAY:
+		case Opcodes.ANEWARRAY:
+		case Opcodes.ARRAYLENGTH:
+			push(interpreter.unaryOperation(insn, pop()));
+			break;
+		case Opcodes.ATHROW:
+			interpreter.unaryOperation(insn, pop());
+			break;
+		case Opcodes.CHECKCAST:
+		case Opcodes.INSTANCEOF:
+			push(interpreter.unaryOperation(insn, pop()));
+			break;
+		case Opcodes.MONITORENTER:
+		case Opcodes.MONITOREXIT:
+			interpreter.unaryOperation(insn, pop());
+			break;
+		case Opcodes.MULTIANEWARRAY:
+			values = new ArrayList<V>();
+			for (int i = ((MultiANewArrayInsnNode) insn).dims; i > 0; --i) {
+				values.add(0, pop());
+			}
+			push(interpreter.naryOperation(insn, values));
+			break;
+		case Opcodes.IFNULL:
+		case Opcodes.IFNONNULL:
+			interpreter.unaryOperation(insn, pop());
+			break;
+		default:
+			throw new RuntimeException("Illegal opcode " + insn.getOpcode());
+		}
+	}
+
+	/**
+	 * Merges this frame with the given frame.
+	 * 
+	 * @param frame       a frame.
+	 * @param interpreter the interpreter used to merge values.
+	 * @return <tt>true</tt> if this frame has been changed as a result of the merge
+	 *         operation, or <tt>false</tt> otherwise.
+	 * @throws AnalyzerException if the frames have incompatible sizes.
+	 */
+	public boolean merge(final Frame<? extends V> frame, final Interpreter<V> interpreter) throws AnalyzerException {
+		if (top != frame.top) {
+			throw new AnalyzerException(null, "Incompatible stack heights");
+		}
+		boolean changes = false;
+		for (int i = 0; i < locals + top; ++i) {
+			V v = interpreter.merge(values[i], frame.values[i]);
+			if (!v.equals(values[i])) {
+				values[i] = v;
+				changes = true;
+			}
+		}
+		return changes;
+	}
+
+	/**
+	 * Merges this frame with the given frame (case of a RET instruction).
+	 * 
+	 * @param frame  a frame
+	 * @param access the local variables that have been accessed by the subroutine
+	 *               to which the RET instruction corresponds.
+	 * @return <tt>true</tt> if this frame has been changed as a result of the merge
+	 *         operation, or <tt>false</tt> otherwise.
+	 */
+	public boolean merge(final Frame<? extends V> frame, final boolean[] access) {
+		boolean changes = false;
+		for (int i = 0; i < locals; ++i) {
+			if (!access[i] && !values[i].equals(frame.values[i])) {
+				values[i] = frame.values[i];
+				changes = true;
+			}
+		}
+		return changes;
+	}
+
+	/**
+	 * Returns a string representation of this frame.
+	 * 
+	 * @return a string representation of this frame.
+	 */
+	@Override
+	public String toString() {
+		StringBuffer b = new StringBuffer();
+		for (int i = 0; i < getLocals(); ++i) {
+			b.append(getLocal(i));
+		}
+		b.append(' ');
+		for (int i = 0; i < getStackSize(); ++i) {
+			b.append(getLocal(i));
+		}
+		return b.toString();
+	}
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/analysis/Interpreter.java b/src/main/asm/org/objectweb/asm/tree/analysis/Interpreter.java
new file mode 100644
index 0000000..94e08ea
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/analysis/Interpreter.java
@@ -0,0 +1,226 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree.analysis;
+
+import java.util.List;
+
+import org.objectweb.asm.Type;
+import org.objectweb.asm.tree.AbstractInsnNode;
+
+/**
+ * A semantic bytecode interpreter. More precisely, this interpreter only
+ * manages the computation of values from other values: it does not manage the
+ * transfer of values to or from the stack, and to or from the local variables.
+ * This separation allows a generic bytecode {@link Analyzer} to work with
+ * various semantic interpreters, without needing to duplicate the code to
+ * simulate the transfer of values.
+ * 
+ * @param <V>
+ *            type of the Value used for the analysis.
+ * 
+ * @author Eric Bruneton
+ */
+public abstract class Interpreter<V extends Value> {
+
+    protected final int api;
+
+    protected Interpreter(final int api) {
+        this.api = api;
+    }
+
+    /**
+     * Creates a new value that represents the given type.
+     * 
+     * Called for method parameters (including <code>this</code>), exception
+     * handler variable and with <code>null</code> type for variables reserved
+     * by long and double types.
+     * 
+     * @param type
+     *            a primitive or reference type, or <tt>null</tt> to represent
+     *            an uninitialized value.
+     * @return a value that represents the given type. The size of the returned
+     *         value must be equal to the size of the given type.
+     */
+    public abstract V newValue(Type type);
+
+    /**
+     * Interprets a bytecode instruction without arguments. This method is
+     * called for the following opcodes:
+     * 
+     * ACONST_NULL, ICONST_M1, ICONST_0, ICONST_1, ICONST_2, ICONST_3, ICONST_4,
+     * ICONST_5, LCONST_0, LCONST_1, FCONST_0, FCONST_1, FCONST_2, DCONST_0,
+     * DCONST_1, BIPUSH, SIPUSH, LDC, JSR, GETSTATIC, NEW
+     * 
+     * @param insn
+     *            the bytecode instruction to be interpreted.
+     * @return the result of the interpretation of the given instruction.
+     * @throws AnalyzerException
+     *             if an error occured during the interpretation.
+     */
+    public abstract V newOperation(AbstractInsnNode insn)
+            throws AnalyzerException;
+
+    /**
+     * Interprets a bytecode instruction that moves a value on the stack or to
+     * or from local variables. This method is called for the following opcodes:
+     * 
+     * ILOAD, LLOAD, FLOAD, DLOAD, ALOAD, ISTORE, LSTORE, FSTORE, DSTORE,
+     * ASTORE, DUP, DUP_X1, DUP_X2, DUP2, DUP2_X1, DUP2_X2, SWAP
+     * 
+     * @param insn
+     *            the bytecode instruction to be interpreted.
+     * @param value
+     *            the value that must be moved by the instruction.
+     * @return the result of the interpretation of the given instruction. The
+     *         returned value must be <tt>equal</tt> to the given value.
+     * @throws AnalyzerException
+     *             if an error occured during the interpretation.
+     */
+    public abstract V copyOperation(AbstractInsnNode insn, V value)
+            throws AnalyzerException;
+
+    /**
+     * Interprets a bytecode instruction with a single argument. This method is
+     * called for the following opcodes:
+     * 
+     * INEG, LNEG, FNEG, DNEG, IINC, I2L, I2F, I2D, L2I, L2F, L2D, F2I, F2L,
+     * F2D, D2I, D2L, D2F, I2B, I2C, I2S, IFEQ, IFNE, IFLT, IFGE, IFGT, IFLE,
+     * TABLESWITCH, LOOKUPSWITCH, IRETURN, LRETURN, FRETURN, DRETURN, ARETURN,
+     * PUTSTATIC, GETFIELD, NEWARRAY, ANEWARRAY, ARRAYLENGTH, ATHROW, CHECKCAST,
+     * INSTANCEOF, MONITORENTER, MONITOREXIT, IFNULL, IFNONNULL
+     * 
+     * @param insn
+     *            the bytecode instruction to be interpreted.
+     * @param value
+     *            the argument of the instruction to be interpreted.
+     * @return the result of the interpretation of the given instruction.
+     * @throws AnalyzerException
+     *             if an error occured during the interpretation.
+     */
+    public abstract V unaryOperation(AbstractInsnNode insn, V value)
+            throws AnalyzerException;
+
+    /**
+     * Interprets a bytecode instruction with two arguments. This method is
+     * called for the following opcodes:
+     * 
+     * IALOAD, LALOAD, FALOAD, DALOAD, AALOAD, BALOAD, CALOAD, SALOAD, IADD,
+     * LADD, FADD, DADD, ISUB, LSUB, FSUB, DSUB, IMUL, LMUL, FMUL, DMUL, IDIV,
+     * LDIV, FDIV, DDIV, IREM, LREM, FREM, DREM, ISHL, LSHL, ISHR, LSHR, IUSHR,
+     * LUSHR, IAND, LAND, IOR, LOR, IXOR, LXOR, LCMP, FCMPL, FCMPG, DCMPL,
+     * DCMPG, IF_ICMPEQ, IF_ICMPNE, IF_ICMPLT, IF_ICMPGE, IF_ICMPGT, IF_ICMPLE,
+     * IF_ACMPEQ, IF_ACMPNE, PUTFIELD
+     * 
+     * @param insn
+     *            the bytecode instruction to be interpreted.
+     * @param value1
+     *            the first argument of the instruction to be interpreted.
+     * @param value2
+     *            the second argument of the instruction to be interpreted.
+     * @return the result of the interpretation of the given instruction.
+     * @throws AnalyzerException
+     *             if an error occured during the interpretation.
+     */
+    public abstract V binaryOperation(AbstractInsnNode insn, V value1, V value2)
+            throws AnalyzerException;
+
+    /**
+     * Interprets a bytecode instruction with three arguments. This method is
+     * called for the following opcodes:
+     * 
+     * IASTORE, LASTORE, FASTORE, DASTORE, AASTORE, BASTORE, CASTORE, SASTORE
+     * 
+     * @param insn
+     *            the bytecode instruction to be interpreted.
+     * @param value1
+     *            the first argument of the instruction to be interpreted.
+     * @param value2
+     *            the second argument of the instruction to be interpreted.
+     * @param value3
+     *            the third argument of the instruction to be interpreted.
+     * @return the result of the interpretation of the given instruction.
+     * @throws AnalyzerException
+     *             if an error occured during the interpretation.
+     */
+    public abstract V ternaryOperation(AbstractInsnNode insn, V value1,
+            V value2, V value3) throws AnalyzerException;
+
+    /**
+     * Interprets a bytecode instruction with a variable number of arguments.
+     * This method is called for the following opcodes:
+     * 
+     * INVOKEVIRTUAL, INVOKESPECIAL, INVOKESTATIC, INVOKEINTERFACE,
+     * MULTIANEWARRAY and INVOKEDYNAMIC
+     * 
+     * @param insn
+     *            the bytecode instruction to be interpreted.
+     * @param values
+     *            the arguments of the instruction to be interpreted.
+     * @return the result of the interpretation of the given instruction.
+     * @throws AnalyzerException
+     *             if an error occured during the interpretation.
+     */
+    public abstract V naryOperation(AbstractInsnNode insn,
+            List<? extends V> values) throws AnalyzerException;
+
+    /**
+     * Interprets a bytecode return instruction. This method is called for the
+     * following opcodes:
+     * 
+     * IRETURN, LRETURN, FRETURN, DRETURN, ARETURN
+     * 
+     * @param insn
+     *            the bytecode instruction to be interpreted.
+     * @param value
+     *            the argument of the instruction to be interpreted.
+     * @param expected
+     *            the expected return type of the analyzed method.
+     * @throws AnalyzerException
+     *             if an error occured during the interpretation.
+     */
+    public abstract void returnOperation(AbstractInsnNode insn, V value,
+            V expected) throws AnalyzerException;
+
+    /**
+     * Merges two values. The merge operation must return a value that
+     * represents both values (for instance, if the two values are two types,
+     * the merged value must be a common super type of the two types. If the two
+     * values are integer intervals, the merged value must be an interval that
+     * contains the previous ones. Likewise for other types of values).
+     * 
+     * @param v
+     *            a value.
+     * @param w
+     *            another value.
+     * @return the merged value. If the merged value is equal to <tt>v</tt>,
+     *         this method <i>must</i> return <tt>v</tt>.
+     */
+    public abstract V merge(V v, V w);
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/analysis/SimpleVerifier.java b/src/main/asm/org/objectweb/asm/tree/analysis/SimpleVerifier.java
new file mode 100644
index 0000000..a127c17
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/analysis/SimpleVerifier.java
@@ -0,0 +1,320 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree.analysis;
+
+import java.util.List;
+
+import org.objectweb.asm.Type;
+
+/**
+ * An extended {@link BasicVerifier} that performs more precise verifications.
+ * This verifier computes exact class types, instead of using a single "object
+ * reference" type (as done in the {@link BasicVerifier}).
+ * 
+ * @author Eric Bruneton
+ * @author Bing Ran
+ */
+public class SimpleVerifier extends BasicVerifier {
+
+    /**
+     * The class that is verified.
+     */
+    private final Type currentClass;
+
+    /**
+     * The super class of the class that is verified.
+     */
+    private final Type currentSuperClass;
+
+    /**
+     * The interfaces implemented by the class that is verified.
+     */
+    private final List<Type> currentClassInterfaces;
+
+    /**
+     * If the class that is verified is an interface.
+     */
+    private final boolean isInterface;
+
+    /**
+     * The loader to use for referenced classes.
+     */
+    private ClassLoader loader = getClass().getClassLoader();
+
+    /**
+     * Constructs a new {@link SimpleVerifier}.
+     */
+    public SimpleVerifier() {
+        this(null, null, false);
+    }
+
+    /**
+     * Constructs a new {@link SimpleVerifier} to verify a specific class. This
+     * class will not be loaded into the JVM since it may be incorrect.
+     * 
+     * @param currentClass
+     *            the class that is verified.
+     * @param currentSuperClass
+     *            the super class of the class that is verified.
+     * @param isInterface
+     *            if the class that is verified is an interface.
+     */
+    public SimpleVerifier(final Type currentClass,
+            final Type currentSuperClass, final boolean isInterface) {
+        this(currentClass, currentSuperClass, null, isInterface);
+    }
+
+    /**
+     * Constructs a new {@link SimpleVerifier} to verify a specific class. This
+     * class will not be loaded into the JVM since it may be incorrect.
+     * 
+     * @param currentClass
+     *            the class that is verified.
+     * @param currentSuperClass
+     *            the super class of the class that is verified.
+     * @param currentClassInterfaces
+     *            the interfaces implemented by the class that is verified.
+     * @param isInterface
+     *            if the class that is verified is an interface.
+     */
+    public SimpleVerifier(final Type currentClass,
+            final Type currentSuperClass,
+            final List<Type> currentClassInterfaces, final boolean isInterface) {
+        this(ASM4, currentClass, currentSuperClass, currentClassInterfaces,
+                isInterface);
+    }
+
+    protected SimpleVerifier(final int api, final Type currentClass,
+            final Type currentSuperClass,
+            final List<Type> currentClassInterfaces, final boolean isInterface) {
+        super(api);
+        this.currentClass = currentClass;
+        this.currentSuperClass = currentSuperClass;
+        this.currentClassInterfaces = currentClassInterfaces;
+        this.isInterface = isInterface;
+    }
+
+    /**
+     * Set the <code>ClassLoader</code> which will be used to load referenced
+     * classes. This is useful if you are verifying multiple interdependent
+     * classes.
+     * 
+     * @param loader
+     *            a <code>ClassLoader</code> to use
+     */
+    public void setClassLoader(final ClassLoader loader) {
+        this.loader = loader;
+    }
+
+    @Override
+    public BasicValue newValue(final Type type) {
+        if (type == null) {
+            return BasicValue.UNINITIALIZED_VALUE;
+        }
+
+        boolean isArray = type.getSort() == Type.ARRAY;
+        if (isArray) {
+            switch (type.getElementType().getSort()) {
+            case Type.BOOLEAN:
+            case Type.CHAR:
+            case Type.BYTE:
+            case Type.SHORT:
+                return new BasicValue(type);
+            }
+        }
+
+        BasicValue v = super.newValue(type);
+        if (BasicValue.REFERENCE_VALUE.equals(v)) {
+            if (isArray) {
+                v = newValue(type.getElementType());
+                String desc = v.getType().getDescriptor();
+                for (int i = 0; i < type.getDimensions(); ++i) {
+                    desc = '[' + desc;
+                }
+                v = new BasicValue(Type.getType(desc));
+            } else {
+                v = new BasicValue(type);
+            }
+        }
+        return v;
+    }
+
+    @Override
+    protected boolean isArrayValue(final BasicValue value) {
+        Type t = value.getType();
+        return t != null
+                && ("Lnull;".equals(t.getDescriptor()) || t.getSort() == Type.ARRAY);
+    }
+
+    @Override
+    protected BasicValue getElementValue(final BasicValue objectArrayValue)
+            throws AnalyzerException {
+        Type arrayType = objectArrayValue.getType();
+        if (arrayType != null) {
+            if (arrayType.getSort() == Type.ARRAY) {
+                return newValue(Type.getType(arrayType.getDescriptor()
+                        .substring(1)));
+            } else if ("Lnull;".equals(arrayType.getDescriptor())) {
+                return objectArrayValue;
+            }
+        }
+        throw new Error("Internal error");
+    }
+
+    @Override
+    protected boolean isSubTypeOf(final BasicValue value,
+            final BasicValue expected) {
+        Type expectedType = expected.getType();
+        Type type = value.getType();
+        switch (expectedType.getSort()) {
+        case Type.INT:
+        case Type.FLOAT:
+        case Type.LONG:
+        case Type.DOUBLE:
+            return type.equals(expectedType);
+        case Type.ARRAY:
+        case Type.OBJECT:
+            if ("Lnull;".equals(type.getDescriptor())) {
+                return true;
+            } else if (type.getSort() == Type.OBJECT
+                    || type.getSort() == Type.ARRAY) {
+                return isAssignableFrom(expectedType, type);
+            } else {
+                return false;
+            }
+        default:
+            throw new Error("Internal error");
+        }
+    }
+
+    @Override
+    public BasicValue merge(final BasicValue v, final BasicValue w) {
+        if (!v.equals(w)) {
+            Type t = v.getType();
+            Type u = w.getType();
+            if (t != null
+                    && (t.getSort() == Type.OBJECT || t.getSort() == Type.ARRAY)) {
+                if (u != null
+                        && (u.getSort() == Type.OBJECT || u.getSort() == Type.ARRAY)) {
+                    if ("Lnull;".equals(t.getDescriptor())) {
+                        return w;
+                    }
+                    if ("Lnull;".equals(u.getDescriptor())) {
+                        return v;
+                    }
+                    if (isAssignableFrom(t, u)) {
+                        return v;
+                    }
+                    if (isAssignableFrom(u, t)) {
+                        return w;
+                    }
+                    // TODO case of array classes of the same dimension
+                    // TODO should we look also for a common super interface?
+                    // problem: there may be several possible common super
+                    // interfaces
+                    do {
+                        if (t == null || isInterface(t)) {
+                            return BasicValue.REFERENCE_VALUE;
+                        }
+                        t = getSuperClass(t);
+                        if (isAssignableFrom(t, u)) {
+                            return newValue(t);
+                        }
+                    } while (true);
+                }
+            }
+            return BasicValue.UNINITIALIZED_VALUE;
+        }
+        return v;
+    }
+
+    protected boolean isInterface(final Type t) {
+        if (currentClass != null && t.equals(currentClass)) {
+            return isInterface;
+        }
+        return getClass(t).isInterface();
+    }
+
+    protected Type getSuperClass(final Type t) {
+        if (currentClass != null && t.equals(currentClass)) {
+            return currentSuperClass;
+        }
+        Class<?> c = getClass(t).getSuperclass();
+        return c == null ? null : Type.getType(c);
+    }
+
+    protected boolean isAssignableFrom(final Type t, final Type u) {
+        if (t.equals(u)) {
+            return true;
+        }
+        if (currentClass != null && t.equals(currentClass)) {
+            if (getSuperClass(u) == null) {
+                return false;
+            } else {
+                if (isInterface) {
+                    return u.getSort() == Type.OBJECT
+                            || u.getSort() == Type.ARRAY;
+                }
+                return isAssignableFrom(t, getSuperClass(u));
+            }
+        }
+        if (currentClass != null && u.equals(currentClass)) {
+            if (isAssignableFrom(t, currentSuperClass)) {
+                return true;
+            }
+            if (currentClassInterfaces != null) {
+                for (int i = 0; i < currentClassInterfaces.size(); ++i) {
+                    Type v = currentClassInterfaces.get(i);
+                    if (isAssignableFrom(t, v)) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+        Class<?> tc = getClass(t);
+        if (tc.isInterface()) {
+            tc = Object.class;
+        }
+        return tc.isAssignableFrom(getClass(u));
+    }
+
+    protected Class<?> getClass(final Type t) {
+        try {
+            if (t.getSort() == Type.ARRAY) {
+                return Class.forName(t.getDescriptor().replace('/', '.'),
+                        false, loader);
+            }
+            return Class.forName(t.getClassName(), false, loader);
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e.toString());
+        }
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/analysis/SmallSet.java b/src/main/asm/org/objectweb/asm/tree/analysis/SmallSet.java
new file mode 100644
index 0000000..0cf6ccf
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/analysis/SmallSet.java
@@ -0,0 +1,134 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree.analysis;
+
+import java.util.AbstractSet;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+/**
+ * A set of at most two elements.
+ * 
+ * @author Eric Bruneton
+ */
+class SmallSet<E> extends AbstractSet<E> implements Iterator<E> {
+
+    // if e1 is null, e2 must be null; otherwise e2 must be different from e1
+
+    E e1, e2;
+
+    static final <T> Set<T> emptySet() {
+        return new SmallSet<T>(null, null);
+    }
+
+    SmallSet(final E e1, final E e2) {
+        this.e1 = e1;
+        this.e2 = e2;
+    }
+
+    // -------------------------------------------------------------------------
+    // Implementation of inherited abstract methods
+    // -------------------------------------------------------------------------
+
+    @Override
+    public Iterator<E> iterator() {
+        return new SmallSet<E>(e1, e2);
+    }
+
+    @Override
+    public int size() {
+        return e1 == null ? 0 : (e2 == null ? 1 : 2);
+    }
+
+    // -------------------------------------------------------------------------
+    // Implementation of the Iterator interface
+    // -------------------------------------------------------------------------
+
+    public boolean hasNext() {
+        return e1 != null;
+    }
+
+    public E next() {
+        if (e1 == null) {
+            throw new NoSuchElementException();
+        }
+        E e = e1;
+        e1 = e2;
+        e2 = null;
+        return e;
+    }
+
+    public void remove() {
+    }
+
+    // -------------------------------------------------------------------------
+    // Utility methods
+    // -------------------------------------------------------------------------
+
+    Set<E> union(final SmallSet<E> s) {
+        if ((s.e1 == e1 && s.e2 == e2) || (s.e1 == e2 && s.e2 == e1)) {
+            return this; // if the two sets are equal, return this
+        }
+        if (s.e1 == null) {
+            return this; // if s is empty, return this
+        }
+        if (e1 == null) {
+            return s; // if this is empty, return s
+        }
+        if (s.e2 == null) { // s contains exactly one element
+            if (e2 == null) {
+                return new SmallSet<E>(e1, s.e1); // necessarily e1 != s.e1
+            } else if (s.e1 == e1 || s.e1 == e2) { // s is included in this
+                return this;
+            }
+        }
+        if (e2 == null) { // this contains exactly one element
+            // if (s.e2 == null) { // cannot happen
+            // return new SmallSet(e1, s.e1); // necessarily e1 != s.e1
+            // } else
+            if (e1 == s.e1 || e1 == s.e2) { // this in included in s
+                return s;
+            }
+        }
+        // here we know that there are at least 3 distinct elements
+        HashSet<E> r = new HashSet<E>(4);
+        r.add(e1);
+        if (e2 != null) {
+            r.add(e2);
+        }
+        r.add(s.e1);
+        if (s.e2 != null) {
+            r.add(s.e2);
+        }
+        return r;
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/analysis/SourceInterpreter.java b/src/main/asm/org/objectweb/asm/tree/analysis/SourceInterpreter.java
new file mode 100644
index 0000000..60969b3
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/analysis/SourceInterpreter.java
@@ -0,0 +1,198 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree.analysis;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.FieldInsnNode;
+import org.objectweb.asm.tree.InvokeDynamicInsnNode;
+import org.objectweb.asm.tree.LdcInsnNode;
+import org.objectweb.asm.tree.MethodInsnNode;
+
+/**
+ * An {@link Interpreter} for {@link SourceValue} values.
+ * 
+ * @author Eric Bruneton
+ */
+public class SourceInterpreter extends Interpreter<SourceValue> implements
+        Opcodes {
+
+    public SourceInterpreter() {
+        super(ASM4);
+    }
+
+    protected SourceInterpreter(final int api) {
+        super(api);
+    }
+
+    @Override
+    public SourceValue newValue(final Type type) {
+        if (type == Type.VOID_TYPE) {
+            return null;
+        }
+        return new SourceValue(type == null ? 1 : type.getSize());
+    }
+
+    @Override
+    public SourceValue newOperation(final AbstractInsnNode insn) {
+        int size;
+        switch (insn.getOpcode()) {
+        case LCONST_0:
+        case LCONST_1:
+        case DCONST_0:
+        case DCONST_1:
+            size = 2;
+            break;
+        case LDC:
+            Object cst = ((LdcInsnNode) insn).cst;
+            size = cst instanceof Long || cst instanceof Double ? 2 : 1;
+            break;
+        case GETSTATIC:
+            size = Type.getType(((FieldInsnNode) insn).desc).getSize();
+            break;
+        default:
+            size = 1;
+        }
+        return new SourceValue(size, insn);
+    }
+
+    @Override
+    public SourceValue copyOperation(final AbstractInsnNode insn,
+            final SourceValue value) {
+        return new SourceValue(value.getSize(), insn);
+    }
+
+    @Override
+    public SourceValue unaryOperation(final AbstractInsnNode insn,
+            final SourceValue value) {
+        int size;
+        switch (insn.getOpcode()) {
+        case LNEG:
+        case DNEG:
+        case I2L:
+        case I2D:
+        case L2D:
+        case F2L:
+        case F2D:
+        case D2L:
+            size = 2;
+            break;
+        case GETFIELD:
+            size = Type.getType(((FieldInsnNode) insn).desc).getSize();
+            break;
+        default:
+            size = 1;
+        }
+        return new SourceValue(size, insn);
+    }
+
+    @Override
+    public SourceValue binaryOperation(final AbstractInsnNode insn,
+            final SourceValue value1, final SourceValue value2) {
+        int size;
+        switch (insn.getOpcode()) {
+        case LALOAD:
+        case DALOAD:
+        case LADD:
+        case DADD:
+        case LSUB:
+        case DSUB:
+        case LMUL:
+        case DMUL:
+        case LDIV:
+        case DDIV:
+        case LREM:
+        case DREM:
+        case LSHL:
+        case LSHR:
+        case LUSHR:
+        case LAND:
+        case LOR:
+        case LXOR:
+            size = 2;
+            break;
+        default:
+            size = 1;
+        }
+        return new SourceValue(size, insn);
+    }
+
+    @Override
+    public SourceValue ternaryOperation(final AbstractInsnNode insn,
+            final SourceValue value1, final SourceValue value2,
+            final SourceValue value3) {
+        return new SourceValue(1, insn);
+    }
+
+    @Override
+    public SourceValue naryOperation(final AbstractInsnNode insn,
+            final List<? extends SourceValue> values) {
+        int size;
+        int opcode = insn.getOpcode();
+        if (opcode == MULTIANEWARRAY) {
+            size = 1;
+        } else {
+            String desc = (opcode == INVOKEDYNAMIC) ? ((InvokeDynamicInsnNode) insn).desc
+                    : ((MethodInsnNode) insn).desc;
+            size = Type.getReturnType(desc).getSize();
+        }
+        return new SourceValue(size, insn);
+    }
+
+    @Override
+    public void returnOperation(final AbstractInsnNode insn,
+            final SourceValue value, final SourceValue expected) {
+    }
+
+    @Override
+    public SourceValue merge(final SourceValue d, final SourceValue w) {
+        if (d.insns instanceof SmallSet && w.insns instanceof SmallSet) {
+            Set<AbstractInsnNode> s = ((SmallSet<AbstractInsnNode>) d.insns)
+                    .union((SmallSet<AbstractInsnNode>) w.insns);
+            if (s == d.insns && d.size == w.size) {
+                return d;
+            } else {
+                return new SourceValue(Math.min(d.size, w.size), s);
+            }
+        }
+        if (d.size != w.size || !d.insns.containsAll(w.insns)) {
+            HashSet<AbstractInsnNode> s = new HashSet<AbstractInsnNode>();
+            s.addAll(d.insns);
+            s.addAll(w.insns);
+            return new SourceValue(Math.min(d.size, w.size), s);
+        }
+        return d;
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/analysis/SourceValue.java b/src/main/asm/org/objectweb/asm/tree/analysis/SourceValue.java
new file mode 100644
index 0000000..f87fc9e
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/analysis/SourceValue.java
@@ -0,0 +1,97 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree.analysis;
+
+import java.util.Set;
+
+import org.objectweb.asm.tree.AbstractInsnNode;
+
+/**
+ * A {@link Value} that is represented by its type in a two types type system.
+ * This type system distinguishes the ONEWORD and TWOWORDS types.
+ * 
+ * @author Eric Bruneton
+ */
+public class SourceValue implements Value {
+
+    /**
+     * The size of this value.
+     */
+    public final int size;
+
+    /**
+     * The instructions that can produce this value. For example, for the Java
+     * code below, the instructions that can produce the value of <tt>i</tt> at
+     * line 5 are the txo ISTORE instructions at line 1 and 3:
+     * 
+     * <pre>
+     * 1: i = 0;
+     * 2: if (...) {
+     * 3:   i = 1;
+     * 4: }
+     * 5: return i;
+     * </pre>
+     * 
+     * This field is a set of {@link AbstractInsnNode} objects.
+     */
+    public final Set<AbstractInsnNode> insns;
+
+    public SourceValue(final int size) {
+        this(size, SmallSet.<AbstractInsnNode> emptySet());
+    }
+
+    public SourceValue(final int size, final AbstractInsnNode insn) {
+        this.size = size;
+        this.insns = new SmallSet<AbstractInsnNode>(insn, null);
+    }
+
+    public SourceValue(final int size, final Set<AbstractInsnNode> insns) {
+        this.size = size;
+        this.insns = insns;
+    }
+
+    public int getSize() {
+        return size;
+    }
+
+    @Override
+    public boolean equals(final Object value) {
+        if (!(value instanceof SourceValue)) {
+            return false;
+        }
+        SourceValue v = (SourceValue) value;
+        return size == v.size && insns.equals(v.insns);
+    }
+
+    @Override
+    public int hashCode() {
+        return insns.hashCode();
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/analysis/Subroutine.java b/src/main/asm/org/objectweb/asm/tree/analysis/Subroutine.java
new file mode 100644
index 0000000..2739671
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/analysis/Subroutine.java
@@ -0,0 +1,90 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree.analysis;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.objectweb.asm.tree.JumpInsnNode;
+import org.objectweb.asm.tree.LabelNode;
+
+/**
+ * A method subroutine (corresponds to a JSR instruction).
+ * 
+ * @author Eric Bruneton
+ */
+class Subroutine {
+
+    LabelNode start;
+
+    boolean[] access;
+
+    List<JumpInsnNode> callers;
+
+    private Subroutine() {
+    }
+
+    Subroutine(final LabelNode start, final int maxLocals,
+            final JumpInsnNode caller) {
+        this.start = start;
+        this.access = new boolean[maxLocals];
+        this.callers = new ArrayList<JumpInsnNode>();
+        callers.add(caller);
+    }
+
+    public Subroutine copy() {
+        Subroutine result = new Subroutine();
+        result.start = start;
+        result.access = new boolean[access.length];
+        System.arraycopy(access, 0, result.access, 0, access.length);
+        result.callers = new ArrayList<JumpInsnNode>(callers);
+        return result;
+    }
+
+    public boolean merge(final Subroutine subroutine) throws AnalyzerException {
+        boolean changes = false;
+        for (int i = 0; i < access.length; ++i) {
+            if (subroutine.access[i] && !access[i]) {
+                access[i] = true;
+                changes = true;
+            }
+        }
+        if (subroutine.start == start) {
+            for (int i = 0; i < subroutine.callers.size(); ++i) {
+                JumpInsnNode caller = subroutine.callers.get(i);
+                if (!callers.contains(caller)) {
+                    callers.add(caller);
+                    changes = true;
+                }
+            }
+        }
+        return changes;
+    }
+}
\ No newline at end of file
diff --git a/src/main/asm/org/objectweb/asm/tree/analysis/Value.java b/src/main/asm/org/objectweb/asm/tree/analysis/Value.java
new file mode 100644
index 0000000..7545dce
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/analysis/Value.java
@@ -0,0 +1,45 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.tree.analysis;
+
+/**
+ * An immutable symbolic value for semantic interpretation of bytecode.
+ * 
+ * @author Eric Bruneton
+ */
+public interface Value {
+
+    /**
+     * Returns the size of this value in words.
+     * 
+     * @return either 1 or 2.
+     */
+    int getSize();
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/analysis/package.html b/src/main/asm/org/objectweb/asm/tree/analysis/package.html
new file mode 100644
index 0000000..228da02
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/analysis/package.html
@@ -0,0 +1,67 @@
+<html>
+<!--
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<body>
+
+<p>
+Provides a framework for static code analysis based on the asm.tree package.
+</p>
+
+<p>
+Basic usage:
+</p>
+
+<pre>
+ClassReader cr = new ClassReader(bytecode);
+ClassNode cn = new ClassNode();
+cr.accept(cn, ClassReader.SKIP_DEBUG);
+
+List methods = cn.methods;
+for (int i = 0; i < methods.size(); ++i) {
+    MethodNode method = (MethodNode) methods.get(i);
+    if (method.instructions.size() > 0) {
+        Analyzer a = new Analyzer(new BasicInterpreter());
+        a.analyze(cn.name, method);
+        Frame[] frames = a.getFrames();
+        // Elements of the frames arrray now contains info for each instruction
+        // from the analyzed method. BasicInterpreter creates BasicValue, that
+        // is using simplified type system that distinguishes the UNINITIALZED,
+        // INT, FLOAT, LONG, DOUBLE, REFERENCE and RETURNADDRESS types.
+        ...
+    }
+}
+</pre>
+
+<p>
+@since ASM 1.4.3
+</p>
+
+</body>
+</html>
diff --git a/src/main/asm/org/objectweb/asm/tree/package.html b/src/main/asm/org/objectweb/asm/tree/package.html
new file mode 100644
index 0000000..940b876
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/tree/package.html
@@ -0,0 +1,192 @@
+<html>
+<!--
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<body>
+
+<p>
+Provides an ASM visitor that constructs a tree representation of the
+classes it visits. This class adapter can be useful to implement "complex"
+class manipulation operations, i.e., operations that would be very hard to
+implement without using a tree representation (such as optimizing the number
+of local variables used by a method).
+</p>
+
+<p>
+However, this class adapter has a cost: it makes ASM bigger and slower. Indeed
+it requires more than twenty new classes, and multiplies the time needed to
+transform a class by almost two (it is almost two times faster to read, "modify"
+and write a class with a ClassVisitor than with a ClassNode). This is why
+this package is bundled in an optional <tt>asm-tree.jar</tt> library that
+is separated from (but requires) the <tt>asm.jar</tt> library, which contains
+the core ASM framework. This is also why <i><font color="red">it is recommended
+not to use this class adapter when it is possible</font></i>.
+</p>
+
+<p>
+The root class is the ClassNode, that can be created from existing bytecode. For example:
+</p>
+
+<pre>
+  ClassReader cr = new ClassReader(source);
+  ClassNode cn = new ClassNode();
+  cr.accept(cn, true);
+</pre>
+
+<p>
+Now the content of ClassNode can be modified and then
+serialized back into bytecode:
+</p>
+
+<pre>
+  ClassWriter cw = new ClassWriter(true);
+  cn.accept(cw);
+</pre>
+
+<p>
+Using a simple ClassVisitor it is possible to create MethodNode instances per-method.
+In this example MethodNode is acting as a buffer that is flushed out at visitEnd() call:
+</p>
+
+<pre>
+  ClassReader cr = new ClassReader(source);
+  ClassWriter cw = new ClassWriter();
+  ClassVisitor cv = new ClassVisitor(cw) {
+    public MethodVisitor visitMethod(int access, String name,
+        String desc, String signature, String[] exceptions) {
+      final MethodVisitor mv = super.visitMethod(access, name, desc, signature, exceptions);
+      MethodNode mn = new MethodNode(access, name, desc, signature, exceptions) {
+        public void visitEnd() {
+          // transform or analyze method code using tree API
+          accept(mv);
+        }
+      };
+    }
+  };
+  cr.accept(cv, true);
+</pre>
+
+<p>
+Several strategies can be used to construct method code from scratch. The first
+option is to create a MethodNode, and then create XxxInsnNode instances and
+add them to the instructions list:
+</p>
+
+<pre>
+MethodNode m = new MethodNode(...);
+m.instructions.add(new VarInsnNode(ALOAD, 0));
+...
+</pre>
+
+<p>
+Alternatively, you can use the fact that MethodNode is a MethodVisitor, and use
+that to create the XxxInsnNode and add them to the instructions list through
+the standard MethodVisitor methods:
+</p>
+
+<pre>
+MethodNode m = new MethodNode(...);
+m.visitVarInsn(ALOAD, 0);
+...
+</pre>
+
+<p>
+If you cannot generate all the instructions in sequential order, i.e. if you
+need to save some pointer in the instruction list and then insert instructions
+at that place after other instructions have been generated, you can use InsnList
+methods insert() and insertBefore() to insert instructions at a saved pointer.
+</p>
+
+<pre>
+MethodNode m = new MethodNode(...);
+m.visitVarInsn(ALOAD, 0);
+AbstractInsnNode ptr = m.instructions.getLast();
+m.visitVarInsn(ALOAD, 1);
+// inserts an instruction between ALOAD 0 and ALOAD 1
+m.instructions.insert(ptr, new VarInsnNode(ALOAD, 0));
+...
+</pre>
+
+<p>
+If you need to insert instructions while iterating over an existing instruction
+list, you can also use several strategies. The first one is to use a
+ListIterator over the instruction list:
+</p>
+
+<pre>
+ListIterator it = m.instructions.iterator();
+while (it.hasNext()) {
+    AbstractInsnNode n = (AbstractInsnNode) it.next();
+    if (...) {
+        it.add(new VarInsnNode(ALOAD, 0));
+    }
+}
+</pre>
+
+<p>
+It is also possible to convert an instruction list into an array and iterate trough
+array elements:
+</p>
+
+<pre>
+AbstractInsnNode[] insns = m.instructions.toArray();
+for(int i = 0; i&lt;insns.length; i++) {
+    AbstractInsnNode n = insns[i];
+    if (...) {
+        m.instructions.insert(n, new VarInsnNode(ALOAD, 0));
+    }
+}
+</pre>
+
+<p>
+If you want to insert these instructions through the MethodVisitor methods,
+you can use another instance of MethodNode as a MethodVisitor and then
+insert instructions collected by that instance into the instruction list.
+For example:
+</p>
+
+<pre>
+AbstractInsnNode[] insns = m.instructions.toArray();
+for(int i = 0; i&lt;insns.length; i++) {
+    AbstractInsnNode n = insns[i];
+    if (...) {
+        MethodNode mn = new MethodNode();
+        mn.visitVarInsn(ALOAD, 0);
+        mn.visitVarInsn(ALOAD, 1);
+        m.instructions.insert(n, mn.instructions);
+    }
+}
+</pre>
+
+<p>
+@since ASM 1.3.3
+</p>
+
+</body>
+</html>
diff --git a/src/main/asm/org/objectweb/asm/util/ASMifiable.java b/src/main/asm/org/objectweb/asm/util/ASMifiable.java
new file mode 100644
index 0000000..dcefe67
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/util/ASMifiable.java
@@ -0,0 +1,56 @@
+/**
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.util;
+
+import java.util.Map;
+
+import org.objectweb.asm.Label;
+
+/**
+ * An {@link org.objectweb.asm.Attribute Attribute} that can print the ASM code
+ * to create an equivalent attribute.
+ * 
+ * @author Eugene Kuleshov
+ */
+public interface ASMifiable {
+
+    /**
+     * Prints the ASM code to create an attribute equal to this attribute.
+     * 
+     * @param buf
+     *            a buffer used for printing Java code.
+     * @param varName
+     *            name of the variable in a printed code used to store attribute
+     *            instance.
+     * @param labelNames
+     *            map of label instances to their names.
+     */
+    void asmify(StringBuffer buf, String varName, Map<Label, String> labelNames);
+}
diff --git a/src/main/asm/org/objectweb/asm/util/ASMifier.java b/src/main/asm/org/objectweb/asm/util/ASMifier.java
new file mode 100644
index 0000000..e08db92
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/util/ASMifier.java
@@ -0,0 +1,1128 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.util;
+
+import org.objectweb.asm.*;
+
+import java.io.FileInputStream;
+import java.io.PrintWriter;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A {@link Printer} that prints the ASM code to generate the classes if visits.
+ *
+ * @author Eric Bruneton
+ */
+public class ASMifier extends Printer {
+    /**
+     * Pseudo access flag used to distinguish class access flags.
+     */
+    private static final int ACCESS_CLASS = 262144;
+    /**
+     * Pseudo access flag used to distinguish field access flags.
+     */
+    private static final int ACCESS_FIELD = 524288;
+    /**
+     * Pseudo access flag used to distinguish inner class flags.
+     */
+    private static final int ACCESS_INNER = 1048576;
+    /**
+     * The name of the visitor variable in the produced code.
+     */
+    protected final String name;
+    /**
+     * Identifier of the annotation visitor variable in the produced code.
+     */
+    protected final int id;
+    /**
+     * The label names. This map associates String values to Label keys. It is
+     * used only in ASMifierMethodVisitor.
+     */
+    protected Map<Label, String> labelNames;
+
+    /**
+     * Constructs a new {@link ASMifier}. <i>Subclasses must not use this
+     * constructor</i>. Instead, they must use the
+     * {@link #ASMifier(int, String, int)} version.
+     */
+    public ASMifier() {
+        this(Opcodes.ASM4, "cw", 0);
+    }
+
+    /**
+     * Constructs a new {@link ASMifier}.
+     *
+     * @param api  the ASM API version implemented by this class. Must be one of
+     *             {@link Opcodes#ASM4}.
+     * @param name the name of the visitor variable in the produced code.
+     * @param id   identifier of the annotation visitor variable in the produced
+     *             code.
+     */
+    protected ASMifier(final int api, final String name, final int id) {
+        super(api);
+        this.name = name;
+        this.id = id;
+    }
+
+    /**
+     * Prints the ASM source code to generate the given class to the standard
+     * output.
+     * <p>
+     * Usage: ASMifier [-debug] &lt;binary class name or class file name&gt;
+     *
+     * @param args the command line arguments.
+     * @throws Exception if the class cannot be found, or if an IO exception occurs.
+     */
+    public static void main(final String[] args) throws Exception {
+        int i = 0;
+        int flags = ClassReader.SKIP_DEBUG;
+
+        boolean ok = true;
+        if (args.length < 1 || args.length > 2) {
+            ok = false;
+        }
+        if (ok && "-debug".equals(args[0])) {
+            i = 1;
+            flags = 0;
+            if (args.length != 2) {
+                ok = false;
+            }
+        }
+        if (!ok) {
+            System.err
+                    .println("Prints the ASM code to generate the given class.");
+            System.err.println("Usage: ASMifier [-debug] "
+                    + "<fully qualified class name or class file name>");
+            return;
+        }
+        ClassReader cr;
+        if (args[i].endsWith(".class") || args[i].indexOf('\\') > -1
+                || args[i].indexOf('/') > -1) {
+            cr = new ClassReader(new FileInputStream(args[i]));
+        } else {
+            cr = new ClassReader(args[i]);
+        }
+        cr.accept(new TraceClassVisitor(null, new ASMifier(), new PrintWriter(
+                System.out)), flags);
+    }
+
+    // ------------------------------------------------------------------------
+    // Classes
+    // ------------------------------------------------------------------------
+
+    /**
+     * Appends a string representation of the given constant to the given
+     * buffer.
+     *
+     * @param buf a string buffer.
+     * @param cst an {@link Integer}, {@link Float}, {@link Long},
+     *            {@link Double} or {@link String} object. May be <tt>null</tt>.
+     */
+    static void appendConstant(final StringBuffer buf, final Object cst) {
+        if (cst == null) {
+            buf.append("null");
+        } else if (cst instanceof String) {
+            appendString(buf, (String) cst);
+        } else if (cst instanceof Type) {
+            buf.append("Type.getType(\"");
+            buf.append(((Type) cst).getDescriptor());
+            buf.append("\")");
+        } else if (cst instanceof Handle) {
+            buf.append("new Handle(");
+            Handle h = (Handle) cst;
+            buf.append("Opcodes.").append(HANDLE_TAG[h.getTag()])
+                    .append(", \"");
+            buf.append(h.getOwner()).append("\", \"");
+            buf.append(h.getName()).append("\", \"");
+            buf.append(h.getDesc()).append("\")");
+        } else if (cst instanceof Byte) {
+            buf.append("new Byte((byte)").append(cst).append(')');
+        } else if (cst instanceof Boolean) {
+            buf.append(((Boolean) cst).booleanValue() ? "Boolean.TRUE"
+                    : "Boolean.FALSE");
+        } else if (cst instanceof Short) {
+            buf.append("new Short((short)").append(cst).append(')');
+        } else if (cst instanceof Character) {
+            int c = ((Character) cst).charValue();
+            buf.append("new Character((char)").append(c).append(')');
+        } else if (cst instanceof Integer) {
+            buf.append("new Integer(").append(cst).append(')');
+        } else if (cst instanceof Float) {
+            buf.append("new Float(\"").append(cst).append("\")");
+        } else if (cst instanceof Long) {
+            buf.append("new Long(").append(cst).append("L)");
+        } else if (cst instanceof Double) {
+            buf.append("new Double(\"").append(cst).append("\")");
+        } else if (cst instanceof byte[]) {
+            byte[] v = (byte[]) cst;
+            buf.append("new byte[] {");
+            for (int i = 0; i < v.length; i++) {
+                buf.append(i == 0 ? "" : ",").append(v[i]);
+            }
+            buf.append('}');
+        } else if (cst instanceof boolean[]) {
+            boolean[] v = (boolean[]) cst;
+            buf.append("new boolean[] {");
+            for (int i = 0; i < v.length; i++) {
+                buf.append(i == 0 ? "" : ",").append(v[i]);
+            }
+            buf.append('}');
+        } else if (cst instanceof short[]) {
+            short[] v = (short[]) cst;
+            buf.append("new short[] {");
+            for (int i = 0; i < v.length; i++) {
+                buf.append(i == 0 ? "" : ",").append("(short)").append(v[i]);
+            }
+            buf.append('}');
+        } else if (cst instanceof char[]) {
+            char[] v = (char[]) cst;
+            buf.append("new char[] {");
+            for (int i = 0; i < v.length; i++) {
+                buf.append(i == 0 ? "" : ",").append("(char)")
+                        .append((int) v[i]);
+            }
+            buf.append('}');
+        } else if (cst instanceof int[]) {
+            int[] v = (int[]) cst;
+            buf.append("new int[] {");
+            for (int i = 0; i < v.length; i++) {
+                buf.append(i == 0 ? "" : ",").append(v[i]);
+            }
+            buf.append('}');
+        } else if (cst instanceof long[]) {
+            long[] v = (long[]) cst;
+            buf.append("new long[] {");
+            for (int i = 0; i < v.length; i++) {
+                buf.append(i == 0 ? "" : ",").append(v[i]).append('L');
+            }
+            buf.append('}');
+        } else if (cst instanceof float[]) {
+            float[] v = (float[]) cst;
+            buf.append("new float[] {");
+            for (int i = 0; i < v.length; i++) {
+                buf.append(i == 0 ? "" : ",").append(v[i]).append('f');
+            }
+            buf.append('}');
+        } else if (cst instanceof double[]) {
+            double[] v = (double[]) cst;
+            buf.append("new double[] {");
+            for (int i = 0; i < v.length; i++) {
+                buf.append(i == 0 ? "" : ",").append(v[i]).append('d');
+            }
+            buf.append('}');
+        }
+    }
+
+    @Override
+    public void visit(final int version, final int access, final String name,
+                      final String signature, final String superName,
+                      final String[] interfaces) {
+        String simpleName;
+        int n = name.lastIndexOf('/');
+        if (n == -1) {
+            simpleName = name;
+        } else {
+            text.add("package asm." + name.substring(0, n).replace('/', '.')
+                    + ";\n");
+            simpleName = name.substring(n + 1);
+        }
+        text.add("import java.util.*;\n");
+        text.add("import org.objectweb.asm.*;\n");
+        text.add("import org.objectweb.asm.attrs.*;\n");
+        text.add("public class " + simpleName + "Dump implements Opcodes {\n\n");
+        text.add("public static byte[] dump () throws Exception {\n\n");
+        text.add("ClassWriter cw = new ClassWriter(0);\n");
+        text.add("FieldVisitor fv;\n");
+        text.add("MethodVisitor mv;\n");
+        text.add("AnnotationVisitor av0;\n\n");
+
+        buf.setLength(0);
+        buf.append("cw.visit(");
+        switch (version) {
+            case Opcodes.V1_1:
+                buf.append("V1_1");
+                break;
+            case Opcodes.V1_2:
+                buf.append("V1_2");
+                break;
+            case Opcodes.V1_3:
+                buf.append("V1_3");
+                break;
+            case Opcodes.V1_4:
+                buf.append("V1_4");
+                break;
+            case Opcodes.V1_5:
+                buf.append("V1_5");
+                break;
+            case Opcodes.V1_6:
+                buf.append("V1_6");
+                break;
+            case Opcodes.V1_7:
+                buf.append("V1_7");
+                break;
+            default:
+                buf.append(version);
+                break;
+        }
+        buf.append(", ");
+        appendAccess(access | ACCESS_CLASS);
+        buf.append(", ");
+        appendConstant(name);
+        buf.append(", ");
+        appendConstant(signature);
+        buf.append(", ");
+        appendConstant(superName);
+        buf.append(", ");
+        if (interfaces != null && interfaces.length > 0) {
+            buf.append("new String[] {");
+            for (int i = 0; i < interfaces.length; ++i) {
+                buf.append(i == 0 ? " " : ", ");
+                appendConstant(interfaces[i]);
+            }
+            buf.append(" }");
+        } else {
+            buf.append("null");
+        }
+        buf.append(");\n\n");
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitSource(final String file, final String debug) {
+        buf.setLength(0);
+        buf.append("cw.visitSource(");
+        appendConstant(file);
+        buf.append(", ");
+        appendConstant(debug);
+        buf.append(");\n\n");
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitOuterClass(final String owner, final String name,
+                                final String desc) {
+        buf.setLength(0);
+        buf.append("cw.visitOuterClass(");
+        appendConstant(owner);
+        buf.append(", ");
+        appendConstant(name);
+        buf.append(", ");
+        appendConstant(desc);
+        buf.append(");\n\n");
+        text.add(buf.toString());
+    }
+
+    @Override
+    public ASMifier visitClassAnnotation(final String desc,
+                                         final boolean visible) {
+        return visitAnnotation(desc, visible);
+    }
+
+    @Override
+    public void visitClassAttribute(final Attribute attr) {
+        visitAttribute(attr);
+    }
+
+    @Override
+    public void visitInnerClass(final String name, final String outerName,
+                                final String innerName, final int access) {
+        buf.setLength(0);
+        buf.append("cw.visitInnerClass(");
+        appendConstant(name);
+        buf.append(", ");
+        appendConstant(outerName);
+        buf.append(", ");
+        appendConstant(innerName);
+        buf.append(", ");
+        appendAccess(access | ACCESS_INNER);
+        buf.append(");\n\n");
+        text.add(buf.toString());
+    }
+
+    @Override
+    public ASMifier visitField(final int access, final String name,
+                               final String desc, final String signature, final Object value) {
+        buf.setLength(0);
+        buf.append("{\n");
+        buf.append("fv = cw.visitField(");
+        appendAccess(access | ACCESS_FIELD);
+        buf.append(", ");
+        appendConstant(name);
+        buf.append(", ");
+        appendConstant(desc);
+        buf.append(", ");
+        appendConstant(signature);
+        buf.append(", ");
+        appendConstant(value);
+        buf.append(");\n");
+        text.add(buf.toString());
+        ASMifier a = createASMifier("fv", 0);
+        text.add(a.getText());
+        text.add("}\n");
+        return a;
+    }
+
+    @Override
+    public ASMifier visitMethod(final int access, final String name,
+                                final String desc, final String signature, final String[] exceptions) {
+        buf.setLength(0);
+        buf.append("{\n");
+        buf.append("mv = cw.visitMethod(");
+        appendAccess(access);
+        buf.append(", ");
+        appendConstant(name);
+        buf.append(", ");
+        appendConstant(desc);
+        buf.append(", ");
+        appendConstant(signature);
+        buf.append(", ");
+        if (exceptions != null && exceptions.length > 0) {
+            buf.append("new String[] {");
+            for (int i = 0; i < exceptions.length; ++i) {
+                buf.append(i == 0 ? " " : ", ");
+                appendConstant(exceptions[i]);
+            }
+            buf.append(" }");
+        } else {
+            buf.append("null");
+        }
+        buf.append(");\n");
+        text.add(buf.toString());
+        ASMifier a = createASMifier("mv", 0);
+        text.add(a.getText());
+        text.add("}\n");
+        return a;
+    }
+
+    // ------------------------------------------------------------------------
+    // Annotations
+    // ------------------------------------------------------------------------
+
+    @Override
+    public void visitClassEnd() {
+        text.add("cw.visitEnd();\n\n");
+        text.add("return cw.toByteArray();\n");
+        text.add("}\n");
+        text.add("}\n");
+    }
+
+    @Override
+    public void visit(final String name, final Object value) {
+        buf.setLength(0);
+        buf.append("av").append(id).append(".visit(");
+        appendConstant(buf, name);
+        buf.append(", ");
+        appendConstant(buf, value);
+        buf.append(");\n");
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitEnum(final String name, final String desc,
+                          final String value) {
+        buf.setLength(0);
+        buf.append("av").append(id).append(".visitEnum(");
+        appendConstant(buf, name);
+        buf.append(", ");
+        appendConstant(buf, desc);
+        buf.append(", ");
+        appendConstant(buf, value);
+        buf.append(");\n");
+        text.add(buf.toString());
+    }
+
+    @Override
+    public ASMifier visitAnnotation(final String name, final String desc) {
+        buf.setLength(0);
+        buf.append("{\n");
+        buf.append("AnnotationVisitor av").append(id + 1).append(" = av");
+        buf.append(id).append(".visitAnnotation(");
+        appendConstant(buf, name);
+        buf.append(", ");
+        appendConstant(buf, desc);
+        buf.append(");\n");
+        text.add(buf.toString());
+        ASMifier a = createASMifier("av", id + 1);
+        text.add(a.getText());
+        text.add("}\n");
+        return a;
+    }
+
+    @Override
+    public ASMifier visitArray(final String name) {
+        buf.setLength(0);
+        buf.append("{\n");
+        buf.append("AnnotationVisitor av").append(id + 1).append(" = av");
+        buf.append(id).append(".visitArray(");
+        appendConstant(buf, name);
+        buf.append(");\n");
+        text.add(buf.toString());
+        ASMifier a = createASMifier("av", id + 1);
+        text.add(a.getText());
+        text.add("}\n");
+        return a;
+    }
+
+    // ------------------------------------------------------------------------
+    // Fields
+    // ------------------------------------------------------------------------
+
+    @Override
+    public void visitAnnotationEnd() {
+        buf.setLength(0);
+        buf.append("av").append(id).append(".visitEnd();\n");
+        text.add(buf.toString());
+    }
+
+    @Override
+    public ASMifier visitFieldAnnotation(final String desc,
+                                         final boolean visible) {
+        return visitAnnotation(desc, visible);
+    }
+
+    @Override
+    public void visitFieldAttribute(final Attribute attr) {
+        visitAttribute(attr);
+    }
+
+    // ------------------------------------------------------------------------
+    // Methods
+    // ------------------------------------------------------------------------
+
+    @Override
+    public void visitFieldEnd() {
+        buf.setLength(0);
+        buf.append(name).append(".visitEnd();\n");
+        text.add(buf.toString());
+    }
+
+    @Override
+    public ASMifier visitAnnotationDefault() {
+        buf.setLength(0);
+        buf.append("{\n").append("av0 = ").append(name)
+                .append(".visitAnnotationDefault();\n");
+        text.add(buf.toString());
+        ASMifier a = createASMifier("av", 0);
+        text.add(a.getText());
+        text.add("}\n");
+        return a;
+    }
+
+    @Override
+    public ASMifier visitMethodAnnotation(final String desc,
+                                          final boolean visible) {
+        return visitAnnotation(desc, visible);
+    }
+
+    @Override
+    public ASMifier visitParameterAnnotation(final int parameter,
+                                             final String desc, final boolean visible) {
+        buf.setLength(0);
+        buf.append("{\n").append("av0 = ").append(name)
+                .append(".visitParameterAnnotation(").append(parameter)
+                .append(", ");
+        appendConstant(desc);
+        buf.append(", ").append(visible).append(");\n");
+        text.add(buf.toString());
+        ASMifier a = createASMifier("av", 0);
+        text.add(a.getText());
+        text.add("}\n");
+        return a;
+    }
+
+    @Override
+    public void visitMethodAttribute(final Attribute attr) {
+        visitAttribute(attr);
+    }
+
+    @Override
+    public void visitCode() {
+        text.add(name + ".visitCode();\n");
+    }
+
+    @Override
+    public void visitFrame(final int type, final int nLocal,
+                           final Object[] local, final int nStack, final Object[] stack) {
+        buf.setLength(0);
+        switch (type) {
+            case Opcodes.F_NEW:
+            case Opcodes.F_FULL:
+                declareFrameTypes(nLocal, local);
+                declareFrameTypes(nStack, stack);
+                if (type == Opcodes.F_NEW) {
+                    buf.append(name).append(".visitFrame(Opcodes.F_NEW, ");
+                } else {
+                    buf.append(name).append(".visitFrame(Opcodes.F_FULL, ");
+                }
+                buf.append(nLocal).append(", new Object[] {");
+                appendFrameTypes(nLocal, local);
+                buf.append("}, ").append(nStack).append(", new Object[] {");
+                appendFrameTypes(nStack, stack);
+                buf.append('}');
+                break;
+            case Opcodes.F_APPEND:
+                declareFrameTypes(nLocal, local);
+                buf.append(name).append(".visitFrame(Opcodes.F_APPEND,")
+                        .append(nLocal).append(", new Object[] {");
+                appendFrameTypes(nLocal, local);
+                buf.append("}, 0, null");
+                break;
+            case Opcodes.F_CHOP:
+                buf.append(name).append(".visitFrame(Opcodes.F_CHOP,")
+                        .append(nLocal).append(", null, 0, null");
+                break;
+            case Opcodes.F_SAME:
+                buf.append(name).append(
+                        ".visitFrame(Opcodes.F_SAME, 0, null, 0, null");
+                break;
+            case Opcodes.F_SAME1:
+                declareFrameTypes(1, stack);
+                buf.append(name).append(
+                        ".visitFrame(Opcodes.F_SAME1, 0, null, 1, new Object[] {");
+                appendFrameTypes(1, stack);
+                buf.append('}');
+                break;
+        }
+        buf.append(");\n");
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitInsn(final int opcode) {
+        buf.setLength(0);
+        buf.append(name).append(".visitInsn(").append(OPCODES[opcode])
+                .append(");\n");
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitIntInsn(final int opcode, final int operand) {
+        buf.setLength(0);
+        buf.append(name)
+                .append(".visitIntInsn(")
+                .append(OPCODES[opcode])
+                .append(", ")
+                .append(opcode == Opcodes.NEWARRAY ? TYPES[operand] : Integer
+                        .toString(operand)).append(");\n");
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitVarInsn(final int opcode, final int var) {
+        buf.setLength(0);
+        buf.append(name).append(".visitVarInsn(").append(OPCODES[opcode])
+                .append(", ").append(var).append(");\n");
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitTypeInsn(final int opcode, final String type) {
+        buf.setLength(0);
+        buf.append(name).append(".visitTypeInsn(").append(OPCODES[opcode])
+                .append(", ");
+        appendConstant(type);
+        buf.append(");\n");
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitFieldInsn(final int opcode, final String owner,
+                               final String name, final String desc) {
+        buf.setLength(0);
+        buf.append(this.name).append(".visitFieldInsn(")
+                .append(OPCODES[opcode]).append(", ");
+        appendConstant(owner);
+        buf.append(", ");
+        appendConstant(name);
+        buf.append(", ");
+        appendConstant(desc);
+        buf.append(");\n");
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitMethodInsn(final int opcode, final String owner,
+                                final String name, final String desc) {
+        buf.setLength(0);
+        buf.append(this.name).append(".visitMethodInsn(")
+                .append(OPCODES[opcode]).append(", ");
+        appendConstant(owner);
+        buf.append(", ");
+        appendConstant(name);
+        buf.append(", ");
+        appendConstant(desc);
+        buf.append(");\n");
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitInvokeDynamicInsn(String name, String desc, Handle bsm,
+                                       Object... bsmArgs) {
+        buf.setLength(0);
+        buf.append(this.name).append(".visitInvokeDynamicInsn(");
+        appendConstant(name);
+        buf.append(", ");
+        appendConstant(desc);
+        buf.append(", ");
+        appendConstant(bsm);
+        buf.append(", new Object[]{");
+        for (int i = 0; i < bsmArgs.length; ++i) {
+            appendConstant(bsmArgs[i]);
+            if (i != bsmArgs.length - 1) {
+                buf.append(", ");
+            }
+        }
+        buf.append("});\n");
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitJumpInsn(final int opcode, final Label label) {
+        buf.setLength(0);
+        declareLabel(label);
+        buf.append(name).append(".visitJumpInsn(").append(OPCODES[opcode])
+                .append(", ");
+        appendLabel(label);
+        buf.append(");\n");
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitLabel(final Label label) {
+        buf.setLength(0);
+        declareLabel(label);
+        buf.append(name).append(".visitLabel(");
+        appendLabel(label);
+        buf.append(");\n");
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitLdcInsn(final Object cst) {
+        buf.setLength(0);
+        buf.append(name).append(".visitLdcInsn(");
+        appendConstant(cst);
+        buf.append(");\n");
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitIincInsn(final int var, final int increment) {
+        buf.setLength(0);
+        buf.append(name).append(".visitIincInsn(").append(var).append(", ")
+                .append(increment).append(");\n");
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitTableSwitchInsn(final int min, final int max,
+                                     final Label dflt, final Label... labels) {
+        buf.setLength(0);
+        for (int i = 0; i < labels.length; ++i) {
+            declareLabel(labels[i]);
+        }
+        declareLabel(dflt);
+
+        buf.append(name).append(".visitTableSwitchInsn(").append(min)
+                .append(", ").append(max).append(", ");
+        appendLabel(dflt);
+        buf.append(", new Label[] {");
+        for (int i = 0; i < labels.length; ++i) {
+            buf.append(i == 0 ? " " : ", ");
+            appendLabel(labels[i]);
+        }
+        buf.append(" });\n");
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitLookupSwitchInsn(final Label dflt, final int[] keys,
+                                      final Label[] labels) {
+        buf.setLength(0);
+        for (int i = 0; i < labels.length; ++i) {
+            declareLabel(labels[i]);
+        }
+        declareLabel(dflt);
+
+        buf.append(name).append(".visitLookupSwitchInsn(");
+        appendLabel(dflt);
+        buf.append(", new int[] {");
+        for (int i = 0; i < keys.length; ++i) {
+            buf.append(i == 0 ? " " : ", ").append(keys[i]);
+        }
+        buf.append(" }, new Label[] {");
+        for (int i = 0; i < labels.length; ++i) {
+            buf.append(i == 0 ? " " : ", ");
+            appendLabel(labels[i]);
+        }
+        buf.append(" });\n");
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitMultiANewArrayInsn(final String desc, final int dims) {
+        buf.setLength(0);
+        buf.append(name).append(".visitMultiANewArrayInsn(");
+        appendConstant(desc);
+        buf.append(", ").append(dims).append(");\n");
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitTryCatchBlock(final Label start, final Label end,
+                                   final Label handler, final String type) {
+        buf.setLength(0);
+        declareLabel(start);
+        declareLabel(end);
+        declareLabel(handler);
+        buf.append(name).append(".visitTryCatchBlock(");
+        appendLabel(start);
+        buf.append(", ");
+        appendLabel(end);
+        buf.append(", ");
+        appendLabel(handler);
+        buf.append(", ");
+        appendConstant(type);
+        buf.append(");\n");
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitLocalVariable(final String name, final String desc,
+                                   final String signature, final Label start, final Label end,
+                                   final int index) {
+        buf.setLength(0);
+        buf.append(this.name).append(".visitLocalVariable(");
+        appendConstant(name);
+        buf.append(", ");
+        appendConstant(desc);
+        buf.append(", ");
+        appendConstant(signature);
+        buf.append(", ");
+        appendLabel(start);
+        buf.append(", ");
+        appendLabel(end);
+        buf.append(", ").append(index).append(");\n");
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitLineNumber(final int line, final Label start) {
+        buf.setLength(0);
+        buf.append(name).append(".visitLineNumber(").append(line).append(", ");
+        appendLabel(start);
+        buf.append(");\n");
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitMaxs(final int maxStack, final int maxLocals) {
+        buf.setLength(0);
+        buf.append(name).append(".visitMaxs(").append(maxStack).append(", ")
+                .append(maxLocals).append(");\n");
+        text.add(buf.toString());
+    }
+
+    // ------------------------------------------------------------------------
+    // Common methods
+    // ------------------------------------------------------------------------
+
+    @Override
+    public void visitMethodEnd() {
+        buf.setLength(0);
+        buf.append(name).append(".visitEnd();\n");
+        text.add(buf.toString());
+    }
+
+    public ASMifier visitAnnotation(final String desc, final boolean visible) {
+        buf.setLength(0);
+        buf.append("{\n").append("av0 = ").append(name)
+                .append(".visitAnnotation(");
+        appendConstant(desc);
+        buf.append(", ").append(visible).append(");\n");
+        text.add(buf.toString());
+        ASMifier a = createASMifier("av", 0);
+        text.add(a.getText());
+        text.add("}\n");
+        return a;
+    }
+
+    // ------------------------------------------------------------------------
+    // Utility methods
+    // ------------------------------------------------------------------------
+
+    public void visitAttribute(final Attribute attr) {
+        buf.setLength(0);
+        buf.append("// ATTRIBUTE ").append(attr.type).append('\n');
+        if (attr instanceof ASMifiable) {
+            if (labelNames == null) {
+                labelNames = new HashMap<Label, String>();
+            }
+            buf.append("{\n");
+            ((ASMifiable) attr).asmify(buf, "attr", labelNames);
+            buf.append(name).append(".visitAttribute(attr);\n");
+            buf.append("}\n");
+        }
+        text.add(buf.toString());
+    }
+
+    protected ASMifier createASMifier(final String name, final int id) {
+        return new ASMifier(Opcodes.ASM4, name, id);
+    }
+
+    /**
+     * Appends a string representation of the given access modifiers to
+     * {@link #buf buf}.
+     *
+     * @param access some access modifiers.
+     */
+    void appendAccess(final int access) {
+        boolean first = true;
+        if ((access & Opcodes.ACC_PUBLIC) != 0) {
+            buf.append("ACC_PUBLIC");
+            first = false;
+        }
+        if ((access & Opcodes.ACC_PRIVATE) != 0) {
+            buf.append("ACC_PRIVATE");
+            first = false;
+        }
+        if ((access & Opcodes.ACC_PROTECTED) != 0) {
+            buf.append("ACC_PROTECTED");
+            first = false;
+        }
+        if ((access & Opcodes.ACC_FINAL) != 0) {
+            if (!first) {
+                buf.append(" + ");
+            }
+            buf.append("ACC_FINAL");
+            first = false;
+        }
+        if ((access & Opcodes.ACC_STATIC) != 0) {
+            if (!first) {
+                buf.append(" + ");
+            }
+            buf.append("ACC_STATIC");
+            first = false;
+        }
+        if ((access & Opcodes.ACC_SYNCHRONIZED) != 0) {
+            if (!first) {
+                buf.append(" + ");
+            }
+            if ((access & ACCESS_CLASS) == 0) {
+                buf.append("ACC_SYNCHRONIZED");
+            } else {
+                buf.append("ACC_SUPER");
+            }
+            first = false;
+        }
+        if ((access & Opcodes.ACC_VOLATILE) != 0
+                && (access & ACCESS_FIELD) != 0) {
+            if (!first) {
+                buf.append(" + ");
+            }
+            buf.append("ACC_VOLATILE");
+            first = false;
+        }
+        if ((access & Opcodes.ACC_BRIDGE) != 0 && (access & ACCESS_CLASS) == 0
+                && (access & ACCESS_FIELD) == 0) {
+            if (!first) {
+                buf.append(" + ");
+            }
+            buf.append("ACC_BRIDGE");
+            first = false;
+        }
+        if ((access & Opcodes.ACC_VARARGS) != 0 && (access & ACCESS_CLASS) == 0
+                && (access & ACCESS_FIELD) == 0) {
+            if (!first) {
+                buf.append(" + ");
+            }
+            buf.append("ACC_VARARGS");
+            first = false;
+        }
+        if ((access & Opcodes.ACC_TRANSIENT) != 0
+                && (access & ACCESS_FIELD) != 0) {
+            if (!first) {
+                buf.append(" + ");
+            }
+            buf.append("ACC_TRANSIENT");
+            first = false;
+        }
+        if ((access & Opcodes.ACC_NATIVE) != 0 && (access & ACCESS_CLASS) == 0
+                && (access & ACCESS_FIELD) == 0) {
+            if (!first) {
+                buf.append(" + ");
+            }
+            buf.append("ACC_NATIVE");
+            first = false;
+        }
+        if ((access & Opcodes.ACC_ENUM) != 0
+                && ((access & ACCESS_CLASS) != 0
+                || (access & ACCESS_FIELD) != 0 || (access & ACCESS_INNER) != 0)) {
+            if (!first) {
+                buf.append(" + ");
+            }
+            buf.append("ACC_ENUM");
+            first = false;
+        }
+        if ((access & Opcodes.ACC_ANNOTATION) != 0
+                && ((access & ACCESS_CLASS) != 0 || (access & ACCESS_INNER) != 0)) {
+            if (!first) {
+                buf.append(" + ");
+            }
+            buf.append("ACC_ANNOTATION");
+            first = false;
+        }
+        if ((access & Opcodes.ACC_ABSTRACT) != 0) {
+            if (!first) {
+                buf.append(" + ");
+            }
+            buf.append("ACC_ABSTRACT");
+            first = false;
+        }
+        if ((access & Opcodes.ACC_INTERFACE) != 0) {
+            if (!first) {
+                buf.append(" + ");
+            }
+            buf.append("ACC_INTERFACE");
+            first = false;
+        }
+        if ((access & Opcodes.ACC_STRICT) != 0) {
+            if (!first) {
+                buf.append(" + ");
+            }
+            buf.append("ACC_STRICT");
+            first = false;
+        }
+        if ((access & Opcodes.ACC_SYNTHETIC) != 0) {
+            if (!first) {
+                buf.append(" + ");
+            }
+            buf.append("ACC_SYNTHETIC");
+            first = false;
+        }
+        if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+            if (!first) {
+                buf.append(" + ");
+            }
+            buf.append("ACC_DEPRECATED");
+            first = false;
+        }
+        if (first) {
+            buf.append('0');
+        }
+    }
+
+    /**
+     * Appends a string representation of the given constant to the given
+     * buffer.
+     *
+     * @param cst an {@link Integer}, {@link Float}, {@link Long},
+     *            {@link Double} or {@link String} object. May be <tt>null</tt>.
+     */
+    protected void appendConstant(final Object cst) {
+        appendConstant(buf, cst);
+    }
+
+    private void declareFrameTypes(final int n, final Object[] o) {
+        for (int i = 0; i < n; ++i) {
+            if (o[i] instanceof Label) {
+                declareLabel((Label) o[i]);
+            }
+        }
+    }
+
+    private void appendFrameTypes(final int n, final Object[] o) {
+        for (int i = 0; i < n; ++i) {
+            if (i > 0) {
+                buf.append(", ");
+            }
+            if (o[i] instanceof String) {
+                appendConstant(o[i]);
+            } else if (o[i] instanceof Integer) {
+                switch (((Integer) o[i]).intValue()) {
+                    case 0:
+                        buf.append("Opcodes.TOP");
+                        break;
+                    case 1:
+                        buf.append("Opcodes.INTEGER");
+                        break;
+                    case 2:
+                        buf.append("Opcodes.FLOAT");
+                        break;
+                    case 3:
+                        buf.append("Opcodes.DOUBLE");
+                        break;
+                    case 4:
+                        buf.append("Opcodes.LONG");
+                        break;
+                    case 5:
+                        buf.append("Opcodes.NULL");
+                        break;
+                    case 6:
+                        buf.append("Opcodes.UNINITIALIZED_THIS");
+                        break;
+                }
+            } else {
+                appendLabel((Label) o[i]);
+            }
+        }
+    }
+
+    /**
+     * Appends a declaration of the given label to {@link #buf buf}. This
+     * declaration is of the form "Label lXXX = new Label();". Does nothing if
+     * the given label has already been declared.
+     *
+     * @param l a label.
+     */
+    protected void declareLabel(final Label l) {
+        if (labelNames == null) {
+            labelNames = new HashMap<Label, String>();
+        }
+        String name = labelNames.get(l);
+        if (name == null) {
+            name = "l" + labelNames.size();
+            labelNames.put(l, name);
+            buf.append("Label ").append(name).append(" = new Label();\n");
+        }
+    }
+
+    /**
+     * Appends the name of the given label to {@link #buf buf}. The given label
+     * <i>must</i> already have a name. One way to ensure this is to always call
+     * {@link #declareLabel declared} before calling this method.
+     *
+     * @param l a label.
+     */
+    protected void appendLabel(final Label l) {
+        buf.append(labelNames.get(l));
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/util/CheckAnnotationAdapter.java b/src/main/asm/org/objectweb/asm/util/CheckAnnotationAdapter.java
new file mode 100644
index 0000000..c59ecf2
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/util/CheckAnnotationAdapter.java
@@ -0,0 +1,136 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.util;
+
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+
+/**
+ * An {@link AnnotationVisitor} that checks that its methods are properly used.
+ * 
+ * @author Eric Bruneton
+ */
+public class CheckAnnotationAdapter extends AnnotationVisitor {
+
+    private final boolean named;
+
+    private boolean end;
+
+    public CheckAnnotationAdapter(final AnnotationVisitor av) {
+        this(av, true);
+    }
+
+    CheckAnnotationAdapter(final AnnotationVisitor av, final boolean named) {
+        super(Opcodes.ASM4, av);
+        this.named = named;
+    }
+
+    @Override
+    public void visit(final String name, final Object value) {
+        checkEnd();
+        checkName(name);
+        if (!(value instanceof Byte || value instanceof Boolean
+                || value instanceof Character || value instanceof Short
+                || value instanceof Integer || value instanceof Long
+                || value instanceof Float || value instanceof Double
+                || value instanceof String || value instanceof Type
+                || value instanceof byte[] || value instanceof boolean[]
+                || value instanceof char[] || value instanceof short[]
+                || value instanceof int[] || value instanceof long[]
+                || value instanceof float[] || value instanceof double[])) {
+            throw new IllegalArgumentException("Invalid annotation value");
+        }
+        if (value instanceof Type) {
+            int sort = ((Type) value).getSort();
+            if (sort != Type.OBJECT && sort != Type.ARRAY) {
+                throw new IllegalArgumentException("Invalid annotation value");
+            }
+        }
+        if (av != null) {
+            av.visit(name, value);
+        }
+    }
+
+    @Override
+    public void visitEnum(final String name, final String desc,
+            final String value) {
+        checkEnd();
+        checkName(name);
+        CheckMethodAdapter.checkDesc(desc, false);
+        if (value == null) {
+            throw new IllegalArgumentException("Invalid enum value");
+        }
+        if (av != null) {
+            av.visitEnum(name, desc, value);
+        }
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotation(final String name,
+            final String desc) {
+        checkEnd();
+        checkName(name);
+        CheckMethodAdapter.checkDesc(desc, false);
+        return new CheckAnnotationAdapter(av == null ? null
+                : av.visitAnnotation(name, desc));
+    }
+
+    @Override
+    public AnnotationVisitor visitArray(final String name) {
+        checkEnd();
+        checkName(name);
+        return new CheckAnnotationAdapter(av == null ? null
+                : av.visitArray(name), false);
+    }
+
+    @Override
+    public void visitEnd() {
+        checkEnd();
+        end = true;
+        if (av != null) {
+            av.visitEnd();
+        }
+    }
+
+    private void checkEnd() {
+        if (end) {
+            throw new IllegalStateException(
+                    "Cannot call a visit method after visitEnd has been called");
+        }
+    }
+
+    private void checkName(final String name) {
+        if (named && name == null) {
+            throw new IllegalArgumentException(
+                    "Annotation value name must not be null");
+        }
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/util/CheckClassAdapter.java b/src/main/asm/org/objectweb/asm/util/CheckClassAdapter.java
new file mode 100644
index 0000000..0d0041b
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/util/CheckClassAdapter.java
@@ -0,0 +1,858 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.util;
+
+import org.objectweb.asm.*;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.tree.analysis.Analyzer;
+import org.objectweb.asm.tree.analysis.BasicValue;
+import org.objectweb.asm.tree.analysis.Frame;
+import org.objectweb.asm.tree.analysis.SimpleVerifier;
+
+import java.io.FileInputStream;
+import java.io.PrintWriter;
+import java.util.*;
+
+/**
+ * A {@link ClassVisitor} that checks that its methods are properly used. More
+ * precisely this class adapter checks each method call individually, based
+ * <i>only</i> on its arguments, but does <i>not</i> check the <i>sequence</i>
+ * of method calls. For example, the invalid sequence
+ * <tt>visitField(ACC_PUBLIC, "i", "I", null)</tt> <tt>visitField(ACC_PUBLIC,
+ * "i", "D", null)</tt> will <i>not</i> be detected by this class adapter.
+ *
+ * <p>
+ * <code>CheckClassAdapter</code> can be also used to verify bytecode
+ * transformations in order to make sure transformed bytecode is sane. For
+ * example:
+ *
+ * <pre>
+ *   InputStream is = ...; // get bytes for the source class
+ *   ClassReader cr = new ClassReader(is);
+ *   ClassWriter cw = new ClassWriter(cr, ClassWriter.COMPUTE_MAXS);
+ *   ClassVisitor cv = new <b>MyClassAdapter</b>(new CheckClassAdapter(cw));
+ *   cr.accept(cv, 0);
+ *
+ *   StringWriter sw = new StringWriter();
+ *   PrintWriter pw = new PrintWriter(sw);
+ *   CheckClassAdapter.verify(new ClassReader(cw.toByteArray()), false, pw);
+ *   assertTrue(sw.toString(), sw.toString().length()==0);
+ * </pre>
+ * <p>
+ * Above code runs transformed bytecode trough the
+ * <code>CheckClassAdapter</code>. It won't be exactly the same verification as
+ * JVM does, but it run data flow analysis for the code of each method and
+ * checks that expectations are met for each method instruction.
+ *
+ * <p>
+ * If method bytecode has errors, assertion text will show the erroneous
+ * instruction number and dump of the failed method with information about
+ * locals and stack slot for each instruction. For example (format is -
+ * insnNumber locals : stack):
+ *
+ * <pre>
+ * org.objectweb.asm.tree.analysis.AnalyzerException: Error at instruction 71: Expected I, but found .
+ *   at org.objectweb.asm.tree.analysis.Analyzer.analyze(Analyzer.java:289)
+ *   at org.objectweb.asm.util.CheckClassAdapter.verify(CheckClassAdapter.java:135)
+ * ...
+ * remove()V
+ * 00000 LinkedBlockingQueue$Itr . . . . . . . .  :
+ *   ICONST_0
+ * 00001 LinkedBlockingQueue$Itr . . . . . . . .  : I
+ *   ISTORE 2
+ * 00001 LinkedBlockingQueue$Itr <b>.</b> I . . . . . .  :
+ * ...
+ *
+ * 00071 LinkedBlockingQueue$Itr <b>.</b> I . . . . . .  :
+ *   ILOAD 1
+ * 00072 <b>?</b>
+ *   INVOKESPECIAL java/lang/Integer.<init> (I)V
+ * ...
+ * </pre>
+ * <p>
+ * In the above output you can see that variable 1 loaded by
+ * <code>ILOAD 1</code> instruction at position <code>00071</code> is not
+ * initialized. You can also see that at the beginning of the method (code
+ * inserted by the transformation) variable 2 is initialized.
+ *
+ * <p>
+ * Note that when used like that, <code>CheckClassAdapter.verify()</code> can
+ * trigger additional class loading, because it is using
+ * <code>SimpleVerifier</code>.
+ *
+ * @author Eric Bruneton
+ */
+public class CheckClassAdapter extends ClassVisitor {
+    /**
+     * The class version number.
+     */
+    private int version;
+
+    /**
+     * <tt>true</tt> if the visit method has been called.
+     */
+    private boolean start;
+
+    /**
+     * <tt>true</tt> if the visitSource method has been called.
+     */
+    private boolean source;
+
+    /**
+     * <tt>true</tt> if the visitOuterClass method has been called.
+     */
+    private boolean outer;
+
+    /**
+     * <tt>true</tt> if the visitEnd method has been called.
+     */
+    private boolean end;
+
+    /**
+     * The already visited labels. This map associate Integer values to Label
+     * keys.
+     */
+    private Map<Label, Integer> labels;
+
+    /**
+     * <tt>true</tt> if the method code must be checked with a BasicVerifier.
+     */
+    private boolean checkDataFlow;
+
+    /**
+     * Constructs a new {@link CheckClassAdapter}. <i>Subclasses must not use
+     * this constructor</i>. Instead, they must use the
+     * {@link #CheckClassAdapter(int, ClassVisitor, boolean)} version.
+     *
+     * @param cv the class visitor to which this adapter must delegate calls.
+     */
+    public CheckClassAdapter(final ClassVisitor cv) {
+        this(cv, true);
+    }
+
+    /**
+     * Constructs a new {@link CheckClassAdapter}. <i>Subclasses must not use
+     * this constructor</i>. Instead, they must use the
+     * {@link #CheckClassAdapter(int, ClassVisitor, boolean)} version.
+     *
+     * @param cv            the class visitor to which this adapter must delegate calls.
+     * @param checkDataFlow <tt>true</tt> to perform basic data flow checks, or
+     *                      <tt>false</tt> to not perform any data flow check (see
+     *                      {@link CheckMethodAdapter}). This option requires valid
+     *                      maxLocals and maxStack values.
+     */
+    public CheckClassAdapter(final ClassVisitor cv, final boolean checkDataFlow) {
+        this(Opcodes.ASM4, cv, checkDataFlow);
+    }
+
+    /**
+     * Constructs a new {@link CheckClassAdapter}.
+     *
+     * @param api           the ASM API version implemented by this visitor. Must be one
+     *                      of {@link Opcodes#ASM4}.
+     * @param cv            the class visitor to which this adapter must delegate calls.
+     * @param checkDataFlow <tt>true</tt> to perform basic data flow checks, or
+     *                      <tt>false</tt> to not perform any data flow check (see
+     *                      {@link CheckMethodAdapter}). This option requires valid
+     *                      maxLocals and maxStack values.
+     */
+    protected CheckClassAdapter(final int api, final ClassVisitor cv,
+                                final boolean checkDataFlow) {
+        super(api, cv);
+        this.labels = new HashMap<Label, Integer>();
+        this.checkDataFlow = checkDataFlow;
+    }
+
+    /**
+     * Checks a given class.
+     * <p>
+     * Usage: CheckClassAdapter &lt;binary class name or class file name&gt;
+     *
+     * @param args the command line arguments.
+     * @throws Exception if the class cannot be found, or if an IO exception occurs.
+     */
+    public static void main(final String[] args) throws Exception {
+        if (args.length != 1) {
+            System.err.println("Verifies the given class.");
+            System.err.println("Usage: CheckClassAdapter "
+                    + "<fully qualified class name or class file name>");
+            return;
+        }
+        ClassReader cr;
+        if (args[0].endsWith(".class")) {
+            cr = new ClassReader(new FileInputStream(args[0]));
+        } else {
+            cr = new ClassReader(args[0]);
+        }
+
+        verify(cr, false, new PrintWriter(System.err));
+    }
+
+    /**
+     * Checks a given class.
+     *
+     * @param cr     a <code>ClassReader</code> that contains bytecode for the
+     *               analysis.
+     * @param loader a <code>ClassLoader</code> which will be used to load
+     *               referenced classes. This is useful if you are verifiying
+     *               multiple interdependent classes.
+     * @param dump   true if bytecode should be printed out not only when errors
+     *               are found.
+     * @param pw     write where results going to be printed
+     */
+    public static void verify(final ClassReader cr, final ClassLoader loader,
+                              final boolean dump, final PrintWriter pw) {
+        ClassNode cn = new ClassNode();
+        cr.accept(new CheckClassAdapter(cn, false), ClassReader.SKIP_DEBUG);
+
+        Type syperType = cn.superName == null ? null : Type
+                .getObjectType(cn.superName);
+        List<MethodNode> methods = cn.methods;
+
+        List<Type> interfaces = new ArrayList<Type>();
+        for (Iterator<String> i = cn.interfaces.iterator(); i.hasNext(); ) {
+            interfaces.add(Type.getObjectType(i.next().toString()));
+        }
+
+        for (int i = 0; i < methods.size(); ++i) {
+            MethodNode method = methods.get(i);
+            SimpleVerifier verifier = new SimpleVerifier(
+                    Type.getObjectType(cn.name), syperType, interfaces,
+                    (cn.access & Opcodes.ACC_INTERFACE) != 0);
+            Analyzer<BasicValue> a = new Analyzer<BasicValue>(verifier);
+            if (loader != null) {
+                verifier.setClassLoader(loader);
+            }
+            try {
+                a.analyze(cn.name, method);
+                if (!dump) {
+                    continue;
+                }
+            } catch (Exception e) {
+                e.printStackTrace(pw);
+            }
+            printAnalyzerResult(method, a, pw);
+        }
+        pw.flush();
+    }
+
+    /**
+     * Checks a given class
+     *
+     * @param cr   a <code>ClassReader</code> that contains bytecode for the
+     *             analysis.
+     * @param dump true if bytecode should be printed out not only when errors
+     *             are found.
+     * @param pw   write where results going to be printed
+     */
+    public static void verify(final ClassReader cr, final boolean dump,
+                              final PrintWriter pw) {
+        verify(cr, null, dump, pw);
+    }
+
+    static void printAnalyzerResult(MethodNode method, Analyzer<BasicValue> a,
+                                    final PrintWriter pw) {
+        Frame<BasicValue>[] frames = a.getFrames();
+        Textifier t = new Textifier();
+        TraceMethodVisitor mv = new TraceMethodVisitor(t);
+
+        pw.println(method.name + method.desc);
+        for (int j = 0; j < method.instructions.size(); ++j) {
+            method.instructions.get(j).accept(mv);
+
+            StringBuffer s = new StringBuffer();
+            Frame<BasicValue> f = frames[j];
+            if (f == null) {
+                s.append('?');
+            } else {
+                for (int k = 0; k < f.getLocals(); ++k) {
+                    s.append(getShortName(f.getLocal(k).toString()))
+                            .append(' ');
+                }
+                s.append(" : ");
+                for (int k = 0; k < f.getStackSize(); ++k) {
+                    s.append(getShortName(f.getStack(k).toString()))
+                            .append(' ');
+                }
+            }
+            while (s.length() < method.maxStack + method.maxLocals + 1) {
+                s.append(' ');
+            }
+            pw.print(Integer.toString(j + 100000).substring(1));
+            pw.print(" " + s + " : " + t.text.get(t.text.size() - 1));
+        }
+        for (int j = 0; j < method.tryCatchBlocks.size(); ++j) {
+            method.tryCatchBlocks.get(j).accept(mv);
+            pw.print(" " + t.text.get(t.text.size() - 1));
+        }
+        pw.println();
+    }
+
+    private static String getShortName(final String name) {
+        int n = name.lastIndexOf('/');
+        int k = name.length();
+        if (name.charAt(k - 1) == ';') {
+            k--;
+        }
+        return n == -1 ? name : name.substring(n + 1, k);
+    }
+
+    // ------------------------------------------------------------------------
+    // Implementation of the ClassVisitor interface
+    // ------------------------------------------------------------------------
+
+    /**
+     * Checks that the given access flags do not contain invalid flags. This
+     * method also checks that mutually incompatible flags are not set
+     * simultaneously.
+     *
+     * @param access         the access flags to be checked
+     * @param possibleAccess the valid access flags.
+     */
+    static void checkAccess(final int access, final int possibleAccess) {
+        if ((access & ~possibleAccess) != 0) {
+            throw new IllegalArgumentException("Invalid access flags: "
+                    + access);
+        }
+        int pub = (access & Opcodes.ACC_PUBLIC) == 0 ? 0 : 1;
+        int pri = (access & Opcodes.ACC_PRIVATE) == 0 ? 0 : 1;
+        int pro = (access & Opcodes.ACC_PROTECTED) == 0 ? 0 : 1;
+        if (pub + pri + pro > 1) {
+            throw new IllegalArgumentException(
+                    "public private and protected are mutually exclusive: "
+                            + access);
+        }
+        int fin = (access & Opcodes.ACC_FINAL) == 0 ? 0 : 1;
+        int abs = (access & Opcodes.ACC_ABSTRACT) == 0 ? 0 : 1;
+        if (fin + abs > 1) {
+            throw new IllegalArgumentException(
+                    "final and abstract are mutually exclusive: " + access);
+        }
+    }
+
+    /**
+     * Checks a class signature.
+     *
+     * @param signature a string containing the signature that must be checked.
+     */
+    public static void checkClassSignature(final String signature) {
+        // ClassSignature:
+        // FormalTypeParameters? ClassTypeSignature ClassTypeSignature*
+
+        int pos = 0;
+        if (getChar(signature, 0) == '<') {
+            pos = checkFormalTypeParameters(signature, pos);
+        }
+        pos = checkClassTypeSignature(signature, pos);
+        while (getChar(signature, pos) == 'L') {
+            pos = checkClassTypeSignature(signature, pos);
+        }
+        if (pos != signature.length()) {
+            throw new IllegalArgumentException(signature + ": error at index "
+                    + pos);
+        }
+    }
+
+    /**
+     * Checks a method signature.
+     *
+     * @param signature a string containing the signature that must be checked.
+     */
+    public static void checkMethodSignature(final String signature) {
+        // MethodTypeSignature:
+        // FormalTypeParameters? ( TypeSignature* ) ( TypeSignature | V ) (
+        // ^ClassTypeSignature | ^TypeVariableSignature )*
+
+        int pos = 0;
+        if (getChar(signature, 0) == '<') {
+            pos = checkFormalTypeParameters(signature, pos);
+        }
+        pos = checkChar('(', signature, pos);
+        while ("ZCBSIFJDL[T".indexOf(getChar(signature, pos)) != -1) {
+            pos = checkTypeSignature(signature, pos);
+        }
+        pos = checkChar(')', signature, pos);
+        if (getChar(signature, pos) == 'V') {
+            ++pos;
+        } else {
+            pos = checkTypeSignature(signature, pos);
+        }
+        while (getChar(signature, pos) == '^') {
+            ++pos;
+            if (getChar(signature, pos) == 'L') {
+                pos = checkClassTypeSignature(signature, pos);
+            } else {
+                pos = checkTypeVariableSignature(signature, pos);
+            }
+        }
+        if (pos != signature.length()) {
+            throw new IllegalArgumentException(signature + ": error at index "
+                    + pos);
+        }
+    }
+
+    /**
+     * Checks a field signature.
+     *
+     * @param signature a string containing the signature that must be checked.
+     */
+    public static void checkFieldSignature(final String signature) {
+        int pos = checkFieldTypeSignature(signature, 0);
+        if (pos != signature.length()) {
+            throw new IllegalArgumentException(signature + ": error at index "
+                    + pos);
+        }
+    }
+
+    /**
+     * Checks the formal type parameters of a class or method signature.
+     *
+     * @param signature a string containing the signature that must be checked.
+     * @param pos       index of first character to be checked.
+     * @return the index of the first character after the checked part.
+     */
+    private static int checkFormalTypeParameters(final String signature, int pos) {
+        // FormalTypeParameters:
+        // < FormalTypeParameter+ >
+
+        pos = checkChar('<', signature, pos);
+        pos = checkFormalTypeParameter(signature, pos);
+        while (getChar(signature, pos) != '>') {
+            pos = checkFormalTypeParameter(signature, pos);
+        }
+        return pos + 1;
+    }
+
+    /**
+     * Checks a formal type parameter of a class or method signature.
+     *
+     * @param signature a string containing the signature that must be checked.
+     * @param pos       index of first character to be checked.
+     * @return the index of the first character after the checked part.
+     */
+    private static int checkFormalTypeParameter(final String signature, int pos) {
+        // FormalTypeParameter:
+        // Identifier : FieldTypeSignature? (: FieldTypeSignature)*
+
+        pos = checkIdentifier(signature, pos);
+        pos = checkChar(':', signature, pos);
+        if ("L[T".indexOf(getChar(signature, pos)) != -1) {
+            pos = checkFieldTypeSignature(signature, pos);
+        }
+        while (getChar(signature, pos) == ':') {
+            pos = checkFieldTypeSignature(signature, pos + 1);
+        }
+        return pos;
+    }
+
+    /**
+     * Checks a field type signature.
+     *
+     * @param signature a string containing the signature that must be checked.
+     * @param pos       index of first character to be checked.
+     * @return the index of the first character after the checked part.
+     */
+    private static int checkFieldTypeSignature(final String signature, int pos) {
+        // FieldTypeSignature:
+        // ClassTypeSignature | ArrayTypeSignature | TypeVariableSignature
+        //
+        // ArrayTypeSignature:
+        // [ TypeSignature
+
+        switch (getChar(signature, pos)) {
+            case 'L':
+                return checkClassTypeSignature(signature, pos);
+            case '[':
+                return checkTypeSignature(signature, pos + 1);
+            default:
+                return checkTypeVariableSignature(signature, pos);
+        }
+    }
+
+    /**
+     * Checks a class type signature.
+     *
+     * @param signature a string containing the signature that must be checked.
+     * @param pos       index of first character to be checked.
+     * @return the index of the first character after the checked part.
+     */
+    private static int checkClassTypeSignature(final String signature, int pos) {
+        // ClassTypeSignature:
+        // L Identifier ( / Identifier )* TypeArguments? ( . Identifier
+        // TypeArguments? )* ;
+
+        pos = checkChar('L', signature, pos);
+        pos = checkIdentifier(signature, pos);
+        while (getChar(signature, pos) == '/') {
+            pos = checkIdentifier(signature, pos + 1);
+        }
+        if (getChar(signature, pos) == '<') {
+            pos = checkTypeArguments(signature, pos);
+        }
+        while (getChar(signature, pos) == '.') {
+            pos = checkIdentifier(signature, pos + 1);
+            if (getChar(signature, pos) == '<') {
+                pos = checkTypeArguments(signature, pos);
+            }
+        }
+        return checkChar(';', signature, pos);
+    }
+
+    /**
+     * Checks the type arguments in a class type signature.
+     *
+     * @param signature a string containing the signature that must be checked.
+     * @param pos       index of first character to be checked.
+     * @return the index of the first character after the checked part.
+     */
+    private static int checkTypeArguments(final String signature, int pos) {
+        // TypeArguments:
+        // < TypeArgument+ >
+
+        pos = checkChar('<', signature, pos);
+        pos = checkTypeArgument(signature, pos);
+        while (getChar(signature, pos) != '>') {
+            pos = checkTypeArgument(signature, pos);
+        }
+        return pos + 1;
+    }
+
+    // ------------------------------------------------------------------------
+    // Utility methods
+    // ------------------------------------------------------------------------
+
+    /**
+     * Checks a type argument in a class type signature.
+     *
+     * @param signature a string containing the signature that must be checked.
+     * @param pos       index of first character to be checked.
+     * @return the index of the first character after the checked part.
+     */
+    private static int checkTypeArgument(final String signature, int pos) {
+        // TypeArgument:
+        // * | ( ( + | - )? FieldTypeSignature )
+
+        char c = getChar(signature, pos);
+        if (c == '*') {
+            return pos + 1;
+        } else if (c == '+' || c == '-') {
+            pos++;
+        }
+        return checkFieldTypeSignature(signature, pos);
+    }
+
+    /**
+     * Checks a type variable signature.
+     *
+     * @param signature a string containing the signature that must be checked.
+     * @param pos       index of first character to be checked.
+     * @return the index of the first character after the checked part.
+     */
+    private static int checkTypeVariableSignature(final String signature,
+                                                  int pos) {
+        // TypeVariableSignature:
+        // T Identifier ;
+
+        pos = checkChar('T', signature, pos);
+        pos = checkIdentifier(signature, pos);
+        return checkChar(';', signature, pos);
+    }
+
+    /**
+     * Checks a type signature.
+     *
+     * @param signature a string containing the signature that must be checked.
+     * @param pos       index of first character to be checked.
+     * @return the index of the first character after the checked part.
+     */
+    private static int checkTypeSignature(final String signature, int pos) {
+        // TypeSignature:
+        // Z | C | B | S | I | F | J | D | FieldTypeSignature
+
+        switch (getChar(signature, pos)) {
+            case 'Z':
+            case 'C':
+            case 'B':
+            case 'S':
+            case 'I':
+            case 'F':
+            case 'J':
+            case 'D':
+                return pos + 1;
+            default:
+                return checkFieldTypeSignature(signature, pos);
+        }
+    }
+
+    /**
+     * Checks an identifier.
+     *
+     * @param signature a string containing the signature that must be checked.
+     * @param pos       index of first character to be checked.
+     * @return the index of the first character after the checked part.
+     */
+    private static int checkIdentifier(final String signature, int pos) {
+        if (!Character.isJavaIdentifierStart(getChar(signature, pos))) {
+            throw new IllegalArgumentException(signature
+                    + ": identifier expected at index " + pos);
+        }
+        ++pos;
+        while (Character.isJavaIdentifierPart(getChar(signature, pos))) {
+            ++pos;
+        }
+        return pos;
+    }
+
+    /**
+     * Checks a single character.
+     *
+     * @param signature a string containing the signature that must be checked.
+     * @param pos       index of first character to be checked.
+     * @return the index of the first character after the checked part.
+     */
+    private static int checkChar(final char c, final String signature, int pos) {
+        if (getChar(signature, pos) == c) {
+            return pos + 1;
+        }
+        throw new IllegalArgumentException(signature + ": '" + c
+                + "' expected at index " + pos);
+    }
+
+    /**
+     * Returns the signature car at the given index.
+     *
+     * @param signature a signature.
+     * @param pos       an index in signature.
+     * @return the character at the given index, or 0 if there is no such
+     * character.
+     */
+    private static char getChar(final String signature, int pos) {
+        return pos < signature.length() ? signature.charAt(pos) : (char) 0;
+    }
+
+    @Override
+    public void visit(final int version, final int access, final String name,
+                      final String signature, final String superName,
+                      final String[] interfaces) {
+        if (start) {
+            throw new IllegalStateException("visit must be called only once");
+        }
+        start = true;
+        checkState();
+        checkAccess(access, Opcodes.ACC_PUBLIC + Opcodes.ACC_FINAL
+                + Opcodes.ACC_SUPER + Opcodes.ACC_INTERFACE
+                + Opcodes.ACC_ABSTRACT + Opcodes.ACC_SYNTHETIC
+                + Opcodes.ACC_ANNOTATION + Opcodes.ACC_ENUM
+                + Opcodes.ACC_DEPRECATED + 0x40000); // ClassWriter.ACC_SYNTHETIC_ATTRIBUTE
+        if (name == null || !name.endsWith("package-info")) {
+            CheckMethodAdapter.checkInternalName(name, "class name");
+        }
+        if ("java/lang/Object".equals(name)) {
+            if (superName != null) {
+                throw new IllegalArgumentException(
+                        "The super class name of the Object class must be 'null'");
+            }
+        } else {
+            CheckMethodAdapter.checkInternalName(superName, "super class name");
+        }
+        if (signature != null) {
+            checkClassSignature(signature);
+        }
+        if ((access & Opcodes.ACC_INTERFACE) != 0) {
+            if (!"java/lang/Object".equals(superName)) {
+                throw new IllegalArgumentException(
+                        "The super class name of interfaces must be 'java/lang/Object'");
+            }
+        }
+        if (interfaces != null) {
+            for (int i = 0; i < interfaces.length; ++i) {
+                CheckMethodAdapter.checkInternalName(interfaces[i],
+                        "interface name at index " + i);
+            }
+        }
+        this.version = version;
+        super.visit(version, access, name, signature, superName, interfaces);
+    }
+
+    @Override
+    public void visitSource(final String file, final String debug) {
+        checkState();
+        if (source) {
+            throw new IllegalStateException(
+                    "visitSource can be called only once.");
+        }
+        source = true;
+        super.visitSource(file, debug);
+    }
+
+    @Override
+    public void visitOuterClass(final String owner, final String name,
+                                final String desc) {
+        checkState();
+        if (outer) {
+            throw new IllegalStateException(
+                    "visitOuterClass can be called only once.");
+        }
+        outer = true;
+        if (owner == null) {
+            throw new IllegalArgumentException("Illegal outer class owner");
+        }
+        if (desc != null) {
+            CheckMethodAdapter.checkMethodDesc(desc);
+        }
+        super.visitOuterClass(owner, name, desc);
+    }
+
+    @Override
+    public void visitInnerClass(final String name, final String outerName,
+                                final String innerName, final int access) {
+        checkState();
+        CheckMethodAdapter.checkInternalName(name, "class name");
+        if (outerName != null) {
+            CheckMethodAdapter.checkInternalName(outerName, "outer class name");
+        }
+        if (innerName != null) {
+            int start = 0;
+            while (start < innerName.length()
+                    && Character.isDigit(innerName.charAt(start))) {
+                start++;
+            }
+            if (start == 0 || start < innerName.length()) {
+                CheckMethodAdapter.checkIdentifier(innerName, start, -1,
+                        "inner class name");
+            }
+        }
+        checkAccess(access, Opcodes.ACC_PUBLIC + Opcodes.ACC_PRIVATE
+                + Opcodes.ACC_PROTECTED + Opcodes.ACC_STATIC
+                + Opcodes.ACC_FINAL + Opcodes.ACC_INTERFACE
+                + Opcodes.ACC_ABSTRACT + Opcodes.ACC_SYNTHETIC
+                + Opcodes.ACC_ANNOTATION + Opcodes.ACC_ENUM);
+        super.visitInnerClass(name, outerName, innerName, access);
+    }
+
+    @Override
+    public FieldVisitor visitField(final int access, final String name,
+                                   final String desc, final String signature, final Object value) {
+        checkState();
+        checkAccess(access, Opcodes.ACC_PUBLIC + Opcodes.ACC_PRIVATE
+                + Opcodes.ACC_PROTECTED + Opcodes.ACC_STATIC
+                + Opcodes.ACC_FINAL + Opcodes.ACC_VOLATILE
+                + Opcodes.ACC_TRANSIENT + Opcodes.ACC_SYNTHETIC
+                + Opcodes.ACC_ENUM + Opcodes.ACC_DEPRECATED + 0x40000); // ClassWriter.ACC_SYNTHETIC_ATTRIBUTE
+        CheckMethodAdapter.checkUnqualifiedName(version, name, "field name");
+        CheckMethodAdapter.checkDesc(desc, false);
+        if (signature != null) {
+            checkFieldSignature(signature);
+        }
+        if (value != null) {
+            CheckMethodAdapter.checkConstant(value);
+        }
+        FieldVisitor av = super
+                .visitField(access, name, desc, signature, value);
+        return new CheckFieldAdapter(av);
+    }
+
+    @Override
+    public MethodVisitor visitMethod(final int access, final String name,
+                                     final String desc, final String signature, final String[] exceptions) {
+        checkState();
+        checkAccess(access, Opcodes.ACC_PUBLIC + Opcodes.ACC_PRIVATE
+                + Opcodes.ACC_PROTECTED + Opcodes.ACC_STATIC
+                + Opcodes.ACC_FINAL + Opcodes.ACC_SYNCHRONIZED
+                + Opcodes.ACC_BRIDGE + Opcodes.ACC_VARARGS + Opcodes.ACC_NATIVE
+                + Opcodes.ACC_ABSTRACT + Opcodes.ACC_STRICT
+                + Opcodes.ACC_SYNTHETIC + Opcodes.ACC_DEPRECATED + 0x40000); // ClassWriter.ACC_SYNTHETIC_ATTRIBUTE
+        if (!"<init>".equals(name) && !"<clinit>".equals(name)) {
+            CheckMethodAdapter.checkMethodIdentifier(version, name,
+                    "method name");
+        }
+        CheckMethodAdapter.checkMethodDesc(desc);
+        if (signature != null) {
+            checkMethodSignature(signature);
+        }
+        if (exceptions != null) {
+            for (int i = 0; i < exceptions.length; ++i) {
+                CheckMethodAdapter.checkInternalName(exceptions[i],
+                        "exception name at index " + i);
+            }
+        }
+        CheckMethodAdapter cma;
+        if (checkDataFlow) {
+            cma = new CheckMethodAdapter(access, name, desc, super.visitMethod(
+                    access, name, desc, signature, exceptions), labels);
+        } else {
+            cma = new CheckMethodAdapter(super.visitMethod(access, name, desc,
+                    signature, exceptions), labels);
+        }
+        cma.version = version;
+        return cma;
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotation(final String desc,
+                                             final boolean visible) {
+        checkState();
+        CheckMethodAdapter.checkDesc(desc, false);
+        return new CheckAnnotationAdapter(super.visitAnnotation(desc, visible));
+    }
+
+    @Override
+    public void visitAttribute(final Attribute attr) {
+        checkState();
+        if (attr == null) {
+            throw new IllegalArgumentException(
+                    "Invalid attribute (must not be null)");
+        }
+        super.visitAttribute(attr);
+    }
+
+    @Override
+    public void visitEnd() {
+        checkState();
+        end = true;
+        super.visitEnd();
+    }
+
+    /**
+     * Checks that the visit method has been called and that visitEnd has not
+     * been called.
+     */
+    private void checkState() {
+        if (!start) {
+            throw new IllegalStateException(
+                    "Cannot visit member before visit has been called.");
+        }
+        if (end) {
+            throw new IllegalStateException(
+                    "Cannot visit member after visitEnd has been called.");
+        }
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/util/CheckFieldAdapter.java b/src/main/asm/org/objectweb/asm/util/CheckFieldAdapter.java
new file mode 100644
index 0000000..a7bf81a
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/util/CheckFieldAdapter.java
@@ -0,0 +1,100 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.util;
+
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Attribute;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.Opcodes;
+
+/**
+ * A {@link FieldVisitor} that checks that its methods are properly used.
+ */
+public class CheckFieldAdapter extends FieldVisitor {
+
+    private boolean end;
+
+    /**
+     * Constructs a new {@link CheckFieldAdapter}. <i>Subclasses must not use
+     * this constructor</i>. Instead, they must use the
+     * {@link #CheckFieldAdapter(int, FieldVisitor)} version.
+     * 
+     * @param fv
+     *            the field visitor to which this adapter must delegate calls.
+     */
+    public CheckFieldAdapter(final FieldVisitor fv) {
+        this(Opcodes.ASM4, fv);
+    }
+
+    /**
+     * Constructs a new {@link CheckFieldAdapter}.
+     * 
+     * @param api
+     *            the ASM API version implemented by this visitor. Must be one
+     *            of {@link Opcodes#ASM4}.
+     * @param fv
+     *            the field visitor to which this adapter must delegate calls.
+     */
+    protected CheckFieldAdapter(final int api, final FieldVisitor fv) {
+        super(api, fv);
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotation(final String desc,
+            final boolean visible) {
+        checkEnd();
+        CheckMethodAdapter.checkDesc(desc, false);
+        return new CheckAnnotationAdapter(super.visitAnnotation(desc, visible));
+    }
+
+    @Override
+    public void visitAttribute(final Attribute attr) {
+        checkEnd();
+        if (attr == null) {
+            throw new IllegalArgumentException(
+                    "Invalid attribute (must not be null)");
+        }
+        super.visitAttribute(attr);
+    }
+
+    @Override
+    public void visitEnd() {
+        checkEnd();
+        end = true;
+        super.visitEnd();
+    }
+
+    private void checkEnd() {
+        if (end) {
+            throw new IllegalStateException(
+                    "Cannot call a visit method after visitEnd has been called");
+        }
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/util/CheckMethodAdapter.java b/src/main/asm/org/objectweb/asm/util/CheckMethodAdapter.java
new file mode 100644
index 0000000..9340dc5
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/util/CheckMethodAdapter.java
@@ -0,0 +1,1397 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.util;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Attribute;
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.tree.analysis.Analyzer;
+import org.objectweb.asm.tree.analysis.BasicValue;
+import org.objectweb.asm.tree.analysis.BasicVerifier;
+
+/**
+ * A {@link MethodVisitor} that checks that its methods are properly used. More
+ * precisely this method adapter checks each instruction individually, i.e.,
+ * each visit method checks some preconditions based <i>only</i> on its
+ * arguments - such as the fact that the given opcode is correct for a given
+ * visit method. This adapter can also perform some basic data flow checks (more
+ * precisely those that can be performed without the full class hierarchy - see
+ * {@link org.objectweb.asm.tree.analysis.BasicVerifier}). For instance in a
+ * method whose signature is <tt>void m ()</tt>, the invalid instruction
+ * IRETURN, or the invalid sequence IADD L2I will be detected if the data flow
+ * checks are enabled. These checks are enabled by using the
+ * {@link #CheckMethodAdapter(int,String,String,MethodVisitor,Map)} constructor.
+ * They are not performed if any other constructor is used.
+ * 
+ * @author Eric Bruneton
+ */
+public class CheckMethodAdapter extends MethodVisitor {
+
+    /**
+     * The class version number.
+     */
+    public int version;
+
+    /**
+     * The access flags of the method.
+     */
+    private int access;
+
+    /**
+     * <tt>true</tt> if the visitCode method has been called.
+     */
+    private boolean startCode;
+
+    /**
+     * <tt>true</tt> if the visitMaxs method has been called.
+     */
+    private boolean endCode;
+
+    /**
+     * <tt>true</tt> if the visitEnd method has been called.
+     */
+    private boolean endMethod;
+
+    /**
+     * Number of visited instructions.
+     */
+    private int insnCount;
+
+    /**
+     * The already visited labels. This map associate Integer values to pseudo
+     * code offsets.
+     */
+    private final Map<Label, Integer> labels;
+
+    /**
+     * The labels used in this method. Every used label must be visited with
+     * visitLabel before the end of the method (i.e. should be in #labels).
+     */
+    private Set<Label> usedLabels;
+
+    /**
+     * Number of visited frames in expanded form.
+     */
+    private int expandedFrames;
+
+    /**
+     * Number of visited frames in compressed form.
+     */
+    private int compressedFrames;
+
+    /**
+     * Number of instructions before the last visited frame.
+     */
+    private int lastFrame = -1;
+
+    /**
+     * The exception handler ranges. Each pair of list element contains the
+     * start and end labels of an exception handler block.
+     */
+    private List<Label> handlers;
+
+    /**
+     * Code of the visit method to be used for each opcode.
+     */
+    private static final int[] TYPE;
+
+    /**
+     * The Label.status field.
+     */
+    private static Field labelStatusField;
+
+    static {
+        String s = "BBBBBBBBBBBBBBBBCCIAADDDDDAAAAAAAAAAAAAAAAAAAABBBBBBBBDD"
+                + "DDDAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"
+                + "BBBBBBBBBBBBBBBBBBBJBBBBBBBBBBBBBBBBBBBBHHHHHHHHHHHHHHHHD"
+                + "KLBBBBBBFFFFGGGGAECEBBEEBBAMHHAA";
+        TYPE = new int[s.length()];
+        for (int i = 0; i < TYPE.length; ++i) {
+            TYPE[i] = s.charAt(i) - 'A' - 1;
+        }
+    }
+
+    // code to generate the above string
+    // public static void main (String[] args) {
+    // int[] TYPE = new int[] {
+    // 0, //NOP
+    // 0, //ACONST_NULL
+    // 0, //ICONST_M1
+    // 0, //ICONST_0
+    // 0, //ICONST_1
+    // 0, //ICONST_2
+    // 0, //ICONST_3
+    // 0, //ICONST_4
+    // 0, //ICONST_5
+    // 0, //LCONST_0
+    // 0, //LCONST_1
+    // 0, //FCONST_0
+    // 0, //FCONST_1
+    // 0, //FCONST_2
+    // 0, //DCONST_0
+    // 0, //DCONST_1
+    // 1, //BIPUSH
+    // 1, //SIPUSH
+    // 7, //LDC
+    // -1, //LDC_W
+    // -1, //LDC2_W
+    // 2, //ILOAD
+    // 2, //LLOAD
+    // 2, //FLOAD
+    // 2, //DLOAD
+    // 2, //ALOAD
+    // -1, //ILOAD_0
+    // -1, //ILOAD_1
+    // -1, //ILOAD_2
+    // -1, //ILOAD_3
+    // -1, //LLOAD_0
+    // -1, //LLOAD_1
+    // -1, //LLOAD_2
+    // -1, //LLOAD_3
+    // -1, //FLOAD_0
+    // -1, //FLOAD_1
+    // -1, //FLOAD_2
+    // -1, //FLOAD_3
+    // -1, //DLOAD_0
+    // -1, //DLOAD_1
+    // -1, //DLOAD_2
+    // -1, //DLOAD_3
+    // -1, //ALOAD_0
+    // -1, //ALOAD_1
+    // -1, //ALOAD_2
+    // -1, //ALOAD_3
+    // 0, //IALOAD
+    // 0, //LALOAD
+    // 0, //FALOAD
+    // 0, //DALOAD
+    // 0, //AALOAD
+    // 0, //BALOAD
+    // 0, //CALOAD
+    // 0, //SALOAD
+    // 2, //ISTORE
+    // 2, //LSTORE
+    // 2, //FSTORE
+    // 2, //DSTORE
+    // 2, //ASTORE
+    // -1, //ISTORE_0
+    // -1, //ISTORE_1
+    // -1, //ISTORE_2
+    // -1, //ISTORE_3
+    // -1, //LSTORE_0
+    // -1, //LSTORE_1
+    // -1, //LSTORE_2
+    // -1, //LSTORE_3
+    // -1, //FSTORE_0
+    // -1, //FSTORE_1
+    // -1, //FSTORE_2
+    // -1, //FSTORE_3
+    // -1, //DSTORE_0
+    // -1, //DSTORE_1
+    // -1, //DSTORE_2
+    // -1, //DSTORE_3
+    // -1, //ASTORE_0
+    // -1, //ASTORE_1
+    // -1, //ASTORE_2
+    // -1, //ASTORE_3
+    // 0, //IASTORE
+    // 0, //LASTORE
+    // 0, //FASTORE
+    // 0, //DASTORE
+    // 0, //AASTORE
+    // 0, //BASTORE
+    // 0, //CASTORE
+    // 0, //SASTORE
+    // 0, //POP
+    // 0, //POP2
+    // 0, //DUP
+    // 0, //DUP_X1
+    // 0, //DUP_X2
+    // 0, //DUP2
+    // 0, //DUP2_X1
+    // 0, //DUP2_X2
+    // 0, //SWAP
+    // 0, //IADD
+    // 0, //LADD
+    // 0, //FADD
+    // 0, //DADD
+    // 0, //ISUB
+    // 0, //LSUB
+    // 0, //FSUB
+    // 0, //DSUB
+    // 0, //IMUL
+    // 0, //LMUL
+    // 0, //FMUL
+    // 0, //DMUL
+    // 0, //IDIV
+    // 0, //LDIV
+    // 0, //FDIV
+    // 0, //DDIV
+    // 0, //IREM
+    // 0, //LREM
+    // 0, //FREM
+    // 0, //DREM
+    // 0, //INEG
+    // 0, //LNEG
+    // 0, //FNEG
+    // 0, //DNEG
+    // 0, //ISHL
+    // 0, //LSHL
+    // 0, //ISHR
+    // 0, //LSHR
+    // 0, //IUSHR
+    // 0, //LUSHR
+    // 0, //IAND
+    // 0, //LAND
+    // 0, //IOR
+    // 0, //LOR
+    // 0, //IXOR
+    // 0, //LXOR
+    // 8, //IINC
+    // 0, //I2L
+    // 0, //I2F
+    // 0, //I2D
+    // 0, //L2I
+    // 0, //L2F
+    // 0, //L2D
+    // 0, //F2I
+    // 0, //F2L
+    // 0, //F2D
+    // 0, //D2I
+    // 0, //D2L
+    // 0, //D2F
+    // 0, //I2B
+    // 0, //I2C
+    // 0, //I2S
+    // 0, //LCMP
+    // 0, //FCMPL
+    // 0, //FCMPG
+    // 0, //DCMPL
+    // 0, //DCMPG
+    // 6, //IFEQ
+    // 6, //IFNE
+    // 6, //IFLT
+    // 6, //IFGE
+    // 6, //IFGT
+    // 6, //IFLE
+    // 6, //IF_ICMPEQ
+    // 6, //IF_ICMPNE
+    // 6, //IF_ICMPLT
+    // 6, //IF_ICMPGE
+    // 6, //IF_ICMPGT
+    // 6, //IF_ICMPLE
+    // 6, //IF_ACMPEQ
+    // 6, //IF_ACMPNE
+    // 6, //GOTO
+    // 6, //JSR
+    // 2, //RET
+    // 9, //TABLESWITCH
+    // 10, //LOOKUPSWITCH
+    // 0, //IRETURN
+    // 0, //LRETURN
+    // 0, //FRETURN
+    // 0, //DRETURN
+    // 0, //ARETURN
+    // 0, //RETURN
+    // 4, //GETSTATIC
+    // 4, //PUTSTATIC
+    // 4, //GETFIELD
+    // 4, //PUTFIELD
+    // 5, //INVOKEVIRTUAL
+    // 5, //INVOKESPECIAL
+    // 5, //INVOKESTATIC
+    // 5, //INVOKEINTERFACE
+    // -1, //INVOKEDYNAMIC
+    // 3, //NEW
+    // 1, //NEWARRAY
+    // 3, //ANEWARRAY
+    // 0, //ARRAYLENGTH
+    // 0, //ATHROW
+    // 3, //CHECKCAST
+    // 3, //INSTANCEOF
+    // 0, //MONITORENTER
+    // 0, //MONITOREXIT
+    // -1, //WIDE
+    // 11, //MULTIANEWARRAY
+    // 6, //IFNULL
+    // 6, //IFNONNULL
+    // -1, //GOTO_W
+    // -1 //JSR_W
+    // };
+    // for (int i = 0; i < TYPE.length; ++i) {
+    // System.out.print((char)(TYPE[i] + 1 + 'A'));
+    // }
+    // System.out.println();
+    // }
+
+    /**
+     * Constructs a new {@link CheckMethodAdapter} object. This method adapter
+     * will not perform any data flow check (see
+     * {@link #CheckMethodAdapter(int,String,String,MethodVisitor,Map)}).
+     * <i>Subclasses must not use this constructor</i>. Instead, they must use
+     * the {@link #CheckMethodAdapter(int, MethodVisitor, Map)} version.
+     * 
+     * @param mv
+     *            the method visitor to which this adapter must delegate calls.
+     */
+    public CheckMethodAdapter(final MethodVisitor mv) {
+        this(mv, new HashMap<Label, Integer>());
+    }
+
+    /**
+     * Constructs a new {@link CheckMethodAdapter} object. This method adapter
+     * will not perform any data flow check (see
+     * {@link #CheckMethodAdapter(int,String,String,MethodVisitor,Map)}).
+     * <i>Subclasses must not use this constructor</i>. Instead, they must use
+     * the {@link #CheckMethodAdapter(int, MethodVisitor, Map)} version.
+     * 
+     * @param mv
+     *            the method visitor to which this adapter must delegate calls.
+     * @param labels
+     *            a map of already visited labels (in other methods).
+     */
+    public CheckMethodAdapter(final MethodVisitor mv,
+            final Map<Label, Integer> labels) {
+        this(Opcodes.ASM4, mv, labels);
+    }
+
+    /**
+     * Constructs a new {@link CheckMethodAdapter} object. This method adapter
+     * will not perform any data flow check (see
+     * {@link #CheckMethodAdapter(int,String,String,MethodVisitor,Map)}).
+     * 
+     * @param mv
+     *            the method visitor to which this adapter must delegate calls.
+     * @param labels
+     *            a map of already visited labels (in other methods).
+     */
+    protected CheckMethodAdapter(final int api, final MethodVisitor mv,
+            final Map<Label, Integer> labels) {
+        super(api, mv);
+        this.labels = labels;
+        this.usedLabels = new HashSet<Label>();
+        this.handlers = new ArrayList<Label>();
+    }
+
+    /**
+     * Constructs a new {@link CheckMethodAdapter} object. This method adapter
+     * will perform basic data flow checks. For instance in a method whose
+     * signature is <tt>void m ()</tt>, the invalid instruction IRETURN, or the
+     * invalid sequence IADD L2I will be detected.
+     * 
+     * @param access
+     *            the method's access flags.
+     * @param name
+     *            the method's name.
+     * @param desc
+     *            the method's descriptor (see {@link Type Type}).
+     * @param cmv
+     *            the method visitor to which this adapter must delegate calls.
+     * @param labels
+     *            a map of already visited labels (in other methods).
+     */
+    public CheckMethodAdapter(final int access, final String name,
+            final String desc, final MethodVisitor cmv,
+            final Map<Label, Integer> labels) {
+        this(new MethodNode(access, name, desc, null, null) {
+            @Override
+            public void visitEnd() {
+                Analyzer<BasicValue> a = new Analyzer<BasicValue>(
+                        new BasicVerifier());
+                try {
+                    a.analyze("dummy", this);
+                } catch (Exception e) {
+                    if (e instanceof IndexOutOfBoundsException
+                            && maxLocals == 0 && maxStack == 0) {
+                        throw new RuntimeException(
+                                "Data flow checking option requires valid, non zero maxLocals and maxStack values.");
+                    }
+                    e.printStackTrace();
+                    StringWriter sw = new StringWriter();
+                    PrintWriter pw = new PrintWriter(sw, true);
+                    CheckClassAdapter.printAnalyzerResult(this, a, pw);
+                    pw.close();
+                    throw new RuntimeException(e.getMessage() + ' '
+                            + sw.toString());
+                }
+                accept(cmv);
+            }
+        }, labels);
+        this.access = access;
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotation(final String desc,
+            final boolean visible) {
+        checkEndMethod();
+        checkDesc(desc, false);
+        return new CheckAnnotationAdapter(super.visitAnnotation(desc, visible));
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotationDefault() {
+        checkEndMethod();
+        return new CheckAnnotationAdapter(super.visitAnnotationDefault(), false);
+    }
+
+    @Override
+    public AnnotationVisitor visitParameterAnnotation(final int parameter,
+            final String desc, final boolean visible) {
+        checkEndMethod();
+        checkDesc(desc, false);
+        return new CheckAnnotationAdapter(super.visitParameterAnnotation(
+                parameter, desc, visible));
+    }
+
+    @Override
+    public void visitAttribute(final Attribute attr) {
+        checkEndMethod();
+        if (attr == null) {
+            throw new IllegalArgumentException(
+                    "Invalid attribute (must not be null)");
+        }
+        super.visitAttribute(attr);
+    }
+
+    @Override
+    public void visitCode() {
+        if ((access & Opcodes.ACC_ABSTRACT) != 0) {
+            throw new RuntimeException("Abstract methods cannot have code");
+        }
+        startCode = true;
+        super.visitCode();
+    }
+
+    @Override
+    public void visitFrame(final int type, final int nLocal,
+            final Object[] local, final int nStack, final Object[] stack) {
+        if (insnCount == lastFrame) {
+            throw new IllegalStateException(
+                    "At most one frame can be visited at a given code location.");
+        }
+        lastFrame = insnCount;
+        int mLocal;
+        int mStack;
+        switch (type) {
+        case Opcodes.F_NEW:
+        case Opcodes.F_FULL:
+            mLocal = Integer.MAX_VALUE;
+            mStack = Integer.MAX_VALUE;
+            break;
+
+        case Opcodes.F_SAME:
+            mLocal = 0;
+            mStack = 0;
+            break;
+
+        case Opcodes.F_SAME1:
+            mLocal = 0;
+            mStack = 1;
+            break;
+
+        case Opcodes.F_APPEND:
+        case Opcodes.F_CHOP:
+            mLocal = 3;
+            mStack = 0;
+            break;
+
+        default:
+            throw new IllegalArgumentException("Invalid frame type " + type);
+        }
+
+        if (nLocal > mLocal) {
+            throw new IllegalArgumentException("Invalid nLocal=" + nLocal
+                    + " for frame type " + type);
+        }
+        if (nStack > mStack) {
+            throw new IllegalArgumentException("Invalid nStack=" + nStack
+                    + " for frame type " + type);
+        }
+
+        if (type != Opcodes.F_CHOP) {
+            if (nLocal > 0 && (local == null || local.length < nLocal)) {
+                throw new IllegalArgumentException(
+                        "Array local[] is shorter than nLocal");
+            }
+            for (int i = 0; i < nLocal; ++i) {
+                checkFrameValue(local[i]);
+            }
+        }
+        if (nStack > 0 && (stack == null || stack.length < nStack)) {
+            throw new IllegalArgumentException(
+                    "Array stack[] is shorter than nStack");
+        }
+        for (int i = 0; i < nStack; ++i) {
+            checkFrameValue(stack[i]);
+        }
+        if (type == Opcodes.F_NEW) {
+            ++expandedFrames;
+        } else {
+            ++compressedFrames;
+        }
+        if (expandedFrames > 0 && compressedFrames > 0) {
+            throw new RuntimeException(
+                    "Expanded and compressed frames must not be mixed.");
+        }
+        super.visitFrame(type, nLocal, local, nStack, stack);
+    }
+
+    @Override
+    public void visitInsn(final int opcode) {
+        checkStartCode();
+        checkEndCode();
+        checkOpcode(opcode, 0);
+        super.visitInsn(opcode);
+        ++insnCount;
+    }
+
+    @Override
+    public void visitIntInsn(final int opcode, final int operand) {
+        checkStartCode();
+        checkEndCode();
+        checkOpcode(opcode, 1);
+        switch (opcode) {
+        case Opcodes.BIPUSH:
+            checkSignedByte(operand, "Invalid operand");
+            break;
+        case Opcodes.SIPUSH:
+            checkSignedShort(operand, "Invalid operand");
+            break;
+        // case Constants.NEWARRAY:
+        default:
+            if (operand < Opcodes.T_BOOLEAN || operand > Opcodes.T_LONG) {
+                throw new IllegalArgumentException(
+                        "Invalid operand (must be an array type code T_...): "
+                                + operand);
+            }
+        }
+        super.visitIntInsn(opcode, operand);
+        ++insnCount;
+    }
+
+    @Override
+    public void visitVarInsn(final int opcode, final int var) {
+        checkStartCode();
+        checkEndCode();
+        checkOpcode(opcode, 2);
+        checkUnsignedShort(var, "Invalid variable index");
+        super.visitVarInsn(opcode, var);
+        ++insnCount;
+    }
+
+    @Override
+    public void visitTypeInsn(final int opcode, final String type) {
+        checkStartCode();
+        checkEndCode();
+        checkOpcode(opcode, 3);
+        checkInternalName(type, "type");
+        if (opcode == Opcodes.NEW && type.charAt(0) == '[') {
+            throw new IllegalArgumentException(
+                    "NEW cannot be used to create arrays: " + type);
+        }
+        super.visitTypeInsn(opcode, type);
+        ++insnCount;
+    }
+
+    @Override
+    public void visitFieldInsn(final int opcode, final String owner,
+            final String name, final String desc) {
+        checkStartCode();
+        checkEndCode();
+        checkOpcode(opcode, 4);
+        checkInternalName(owner, "owner");
+        checkUnqualifiedName(version, name, "name");
+        checkDesc(desc, false);
+        super.visitFieldInsn(opcode, owner, name, desc);
+        ++insnCount;
+    }
+
+    @Override
+    public void visitMethodInsn(final int opcode, final String owner,
+            final String name, final String desc) {
+        checkStartCode();
+        checkEndCode();
+        checkOpcode(opcode, 5);
+        if (opcode != Opcodes.INVOKESPECIAL || !"<init>".equals(name)) {
+            checkMethodIdentifier(version, name, "name");
+        }
+        checkInternalName(owner, "owner");
+        checkMethodDesc(desc);
+        super.visitMethodInsn(opcode, owner, name, desc);
+        ++insnCount;
+    }
+
+    @Override
+    public void visitInvokeDynamicInsn(String name, String desc, Handle bsm,
+            Object... bsmArgs) {
+        checkStartCode();
+        checkEndCode();
+        checkMethodIdentifier(version, name, "name");
+        checkMethodDesc(desc);
+        if (bsm.getTag() != Opcodes.H_INVOKESTATIC
+                && bsm.getTag() != Opcodes.H_NEWINVOKESPECIAL) {
+            throw new IllegalArgumentException("invalid handle tag "
+                    + bsm.getTag());
+        }
+        for (int i = 0; i < bsmArgs.length; i++) {
+            checkLDCConstant(bsmArgs[i]);
+        }
+        super.visitInvokeDynamicInsn(name, desc, bsm, bsmArgs);
+        ++insnCount;
+    }
+
+    @Override
+    public void visitJumpInsn(final int opcode, final Label label) {
+        checkStartCode();
+        checkEndCode();
+        checkOpcode(opcode, 6);
+        checkLabel(label, false, "label");
+        checkNonDebugLabel(label);
+        super.visitJumpInsn(opcode, label);
+        usedLabels.add(label);
+        ++insnCount;
+    }
+
+    @Override
+    public void visitLabel(final Label label) {
+        checkStartCode();
+        checkEndCode();
+        checkLabel(label, false, "label");
+        if (labels.get(label) != null) {
+            throw new IllegalArgumentException("Already visited label");
+        }
+        labels.put(label, new Integer(insnCount));
+        super.visitLabel(label);
+    }
+
+    @Override
+    public void visitLdcInsn(final Object cst) {
+        checkStartCode();
+        checkEndCode();
+        checkLDCConstant(cst);
+        super.visitLdcInsn(cst);
+        ++insnCount;
+    }
+
+    @Override
+    public void visitIincInsn(final int var, final int increment) {
+        checkStartCode();
+        checkEndCode();
+        checkUnsignedShort(var, "Invalid variable index");
+        checkSignedShort(increment, "Invalid increment");
+        super.visitIincInsn(var, increment);
+        ++insnCount;
+    }
+
+    @Override
+    public void visitTableSwitchInsn(final int min, final int max,
+            final Label dflt, final Label... labels) {
+        checkStartCode();
+        checkEndCode();
+        if (max < min) {
+            throw new IllegalArgumentException("Max = " + max
+                    + " must be greater than or equal to min = " + min);
+        }
+        checkLabel(dflt, false, "default label");
+        checkNonDebugLabel(dflt);
+        if (labels == null || labels.length != max - min + 1) {
+            throw new IllegalArgumentException(
+                    "There must be max - min + 1 labels");
+        }
+        for (int i = 0; i < labels.length; ++i) {
+            checkLabel(labels[i], false, "label at index " + i);
+            checkNonDebugLabel(labels[i]);
+        }
+        super.visitTableSwitchInsn(min, max, dflt, labels);
+        for (int i = 0; i < labels.length; ++i) {
+            usedLabels.add(labels[i]);
+        }
+        ++insnCount;
+    }
+
+    @Override
+    public void visitLookupSwitchInsn(final Label dflt, final int[] keys,
+            final Label[] labels) {
+        checkEndCode();
+        checkStartCode();
+        checkLabel(dflt, false, "default label");
+        checkNonDebugLabel(dflt);
+        if (keys == null || labels == null || keys.length != labels.length) {
+            throw new IllegalArgumentException(
+                    "There must be the same number of keys and labels");
+        }
+        for (int i = 0; i < labels.length; ++i) {
+            checkLabel(labels[i], false, "label at index " + i);
+            checkNonDebugLabel(labels[i]);
+        }
+        super.visitLookupSwitchInsn(dflt, keys, labels);
+        usedLabels.add(dflt);
+        for (int i = 0; i < labels.length; ++i) {
+            usedLabels.add(labels[i]);
+        }
+        ++insnCount;
+    }
+
+    @Override
+    public void visitMultiANewArrayInsn(final String desc, final int dims) {
+        checkStartCode();
+        checkEndCode();
+        checkDesc(desc, false);
+        if (desc.charAt(0) != '[') {
+            throw new IllegalArgumentException(
+                    "Invalid descriptor (must be an array type descriptor): "
+                            + desc);
+        }
+        if (dims < 1) {
+            throw new IllegalArgumentException(
+                    "Invalid dimensions (must be greater than 0): " + dims);
+        }
+        if (dims > desc.lastIndexOf('[') + 1) {
+            throw new IllegalArgumentException(
+                    "Invalid dimensions (must not be greater than dims(desc)): "
+                            + dims);
+        }
+        super.visitMultiANewArrayInsn(desc, dims);
+        ++insnCount;
+    }
+
+    @Override
+    public void visitTryCatchBlock(final Label start, final Label end,
+            final Label handler, final String type) {
+        checkStartCode();
+        checkEndCode();
+        checkLabel(start, false, "start label");
+        checkLabel(end, false, "end label");
+        checkLabel(handler, false, "handler label");
+        checkNonDebugLabel(start);
+        checkNonDebugLabel(end);
+        checkNonDebugLabel(handler);
+        if (labels.get(start) != null || labels.get(end) != null
+                || labels.get(handler) != null) {
+            throw new IllegalStateException(
+                    "Try catch blocks must be visited before their labels");
+        }
+        if (type != null) {
+            checkInternalName(type, "type");
+        }
+        super.visitTryCatchBlock(start, end, handler, type);
+        handlers.add(start);
+        handlers.add(end);
+    }
+
+    @Override
+    public void visitLocalVariable(final String name, final String desc,
+            final String signature, final Label start, final Label end,
+            final int index) {
+        checkStartCode();
+        checkEndCode();
+        checkUnqualifiedName(version, name, "name");
+        checkDesc(desc, false);
+        checkLabel(start, true, "start label");
+        checkLabel(end, true, "end label");
+        checkUnsignedShort(index, "Invalid variable index");
+        int s = labels.get(start).intValue();
+        int e = labels.get(end).intValue();
+        if (e < s) {
+            throw new IllegalArgumentException(
+                    "Invalid start and end labels (end must be greater than start)");
+        }
+        super.visitLocalVariable(name, desc, signature, start, end, index);
+    }
+
+    @Override
+    public void visitLineNumber(final int line, final Label start) {
+        checkStartCode();
+        checkEndCode();
+        checkUnsignedShort(line, "Invalid line number");
+        checkLabel(start, true, "start label");
+        super.visitLineNumber(line, start);
+    }
+
+    @Override
+    public void visitMaxs(final int maxStack, final int maxLocals) {
+        checkStartCode();
+        checkEndCode();
+        endCode = true;
+        for (Label l : usedLabels) {
+            if (labels.get(l) == null) {
+                throw new IllegalStateException("Undefined label used");
+            }
+        }
+        for (int i = 0; i < handlers.size();) {
+            Integer start = labels.get(handlers.get(i++));
+            Integer end = labels.get(handlers.get(i++));
+            if (start == null || end == null) {
+                throw new IllegalStateException(
+                        "Undefined try catch block labels");
+            }
+            if (end.intValue() <= start.intValue()) {
+                throw new IllegalStateException(
+                        "Emty try catch block handler range");
+            }
+        }
+        checkUnsignedShort(maxStack, "Invalid max stack");
+        checkUnsignedShort(maxLocals, "Invalid max locals");
+        super.visitMaxs(maxStack, maxLocals);
+    }
+
+    @Override
+    public void visitEnd() {
+        checkEndMethod();
+        endMethod = true;
+        super.visitEnd();
+    }
+
+    // -------------------------------------------------------------------------
+
+    /**
+     * Checks that the visitCode method has been called.
+     */
+    void checkStartCode() {
+        if (!startCode) {
+            throw new IllegalStateException(
+                    "Cannot visit instructions before visitCode has been called.");
+        }
+    }
+
+    /**
+     * Checks that the visitMaxs method has not been called.
+     */
+    void checkEndCode() {
+        if (endCode) {
+            throw new IllegalStateException(
+                    "Cannot visit instructions after visitMaxs has been called.");
+        }
+    }
+
+    /**
+     * Checks that the visitEnd method has not been called.
+     */
+    void checkEndMethod() {
+        if (endMethod) {
+            throw new IllegalStateException(
+                    "Cannot visit elements after visitEnd has been called.");
+        }
+    }
+
+    /**
+     * Checks a stack frame value.
+     * 
+     * @param value
+     *            the value to be checked.
+     */
+    void checkFrameValue(final Object value) {
+        if (value == Opcodes.TOP || value == Opcodes.INTEGER
+                || value == Opcodes.FLOAT || value == Opcodes.LONG
+                || value == Opcodes.DOUBLE || value == Opcodes.NULL
+                || value == Opcodes.UNINITIALIZED_THIS) {
+            return;
+        }
+        if (value instanceof String) {
+            checkInternalName((String) value, "Invalid stack frame value");
+            return;
+        }
+        if (!(value instanceof Label)) {
+            throw new IllegalArgumentException("Invalid stack frame value: "
+                    + value);
+        } else {
+            usedLabels.add((Label) value);
+        }
+    }
+
+    /**
+     * Checks that the type of the given opcode is equal to the given type.
+     * 
+     * @param opcode
+     *            the opcode to be checked.
+     * @param type
+     *            the expected opcode type.
+     */
+    static void checkOpcode(final int opcode, final int type) {
+        if (opcode < 0 || opcode > 199 || TYPE[opcode] != type) {
+            throw new IllegalArgumentException("Invalid opcode: " + opcode);
+        }
+    }
+
+    /**
+     * Checks that the given value is a signed byte.
+     * 
+     * @param value
+     *            the value to be checked.
+     * @param msg
+     *            an message to be used in case of error.
+     */
+    static void checkSignedByte(final int value, final String msg) {
+        if (value < Byte.MIN_VALUE || value > Byte.MAX_VALUE) {
+            throw new IllegalArgumentException(msg
+                    + " (must be a signed byte): " + value);
+        }
+    }
+
+    /**
+     * Checks that the given value is a signed short.
+     * 
+     * @param value
+     *            the value to be checked.
+     * @param msg
+     *            an message to be used in case of error.
+     */
+    static void checkSignedShort(final int value, final String msg) {
+        if (value < Short.MIN_VALUE || value > Short.MAX_VALUE) {
+            throw new IllegalArgumentException(msg
+                    + " (must be a signed short): " + value);
+        }
+    }
+
+    /**
+     * Checks that the given value is an unsigned short.
+     * 
+     * @param value
+     *            the value to be checked.
+     * @param msg
+     *            an message to be used in case of error.
+     */
+    static void checkUnsignedShort(final int value, final String msg) {
+        if (value < 0 || value > 65535) {
+            throw new IllegalArgumentException(msg
+                    + " (must be an unsigned short): " + value);
+        }
+    }
+
+    /**
+     * Checks that the given value is an {@link Integer}, a{@link Float}, a
+     * {@link Long}, a {@link Double} or a {@link String}.
+     * 
+     * @param cst
+     *            the value to be checked.
+     */
+    static void checkConstant(final Object cst) {
+        if (!(cst instanceof Integer) && !(cst instanceof Float)
+                && !(cst instanceof Long) && !(cst instanceof Double)
+                && !(cst instanceof String)) {
+            throw new IllegalArgumentException("Invalid constant: " + cst);
+        }
+    }
+
+    void checkLDCConstant(final Object cst) {
+        if (cst instanceof Type) {
+            int s = ((Type) cst).getSort();
+            if (s != Type.OBJECT && s != Type.ARRAY && s != Type.METHOD) {
+                throw new IllegalArgumentException("Illegal LDC constant value");
+            }
+            if (s != Type.METHOD && (version & 0xFFFF) < Opcodes.V1_5) {
+                throw new IllegalArgumentException(
+                        "ldc of a constant class requires at least version 1.5");
+            }
+            if (s == Type.METHOD && (version & 0xFFFF) < Opcodes.V1_7) {
+                throw new IllegalArgumentException(
+                        "ldc of a method type requires at least version 1.7");
+            }
+        } else if (cst instanceof Handle) {
+            if ((version & 0xFFFF) < Opcodes.V1_7) {
+                throw new IllegalArgumentException(
+                        "ldc of a handle requires at least version 1.7");
+            }
+            int tag = ((Handle) cst).getTag();
+            if (tag < Opcodes.H_GETFIELD || tag > Opcodes.H_INVOKEINTERFACE) {
+                throw new IllegalArgumentException("invalid handle tag " + tag);
+            }
+        } else {
+            checkConstant(cst);
+        }
+    }
+
+    /**
+     * Checks that the given string is a valid unqualified name.
+     * 
+     * @param version
+     *            the class version.
+     * @param name
+     *            the string to be checked.
+     * @param msg
+     *            a message to be used in case of error.
+     */
+    static void checkUnqualifiedName(int version, final String name,
+            final String msg) {
+        if ((version & 0xFFFF) < Opcodes.V1_5) {
+            checkIdentifier(name, msg);
+        } else {
+            for (int i = 0; i < name.length(); ++i) {
+                if (".;[/".indexOf(name.charAt(i)) != -1) {
+                    throw new IllegalArgumentException("Invalid " + msg
+                            + " (must be a valid unqualified name): " + name);
+                }
+            }
+        }
+    }
+
+    /**
+     * Checks that the given string is a valid Java identifier.
+     * 
+     * @param name
+     *            the string to be checked.
+     * @param msg
+     *            a message to be used in case of error.
+     */
+    static void checkIdentifier(final String name, final String msg) {
+        checkIdentifier(name, 0, -1, msg);
+    }
+
+    /**
+     * Checks that the given substring is a valid Java identifier.
+     * 
+     * @param name
+     *            the string to be checked.
+     * @param start
+     *            index of the first character of the identifier (inclusive).
+     * @param end
+     *            index of the last character of the identifier (exclusive). -1
+     *            is equivalent to <tt>name.length()</tt> if name is not
+     *            <tt>null</tt>.
+     * @param msg
+     *            a message to be used in case of error.
+     */
+    static void checkIdentifier(final String name, final int start,
+            final int end, final String msg) {
+        if (name == null || (end == -1 ? name.length() <= start : end <= start)) {
+            throw new IllegalArgumentException("Invalid " + msg
+                    + " (must not be null or empty)");
+        }
+        if (!Character.isJavaIdentifierStart(name.charAt(start))) {
+            throw new IllegalArgumentException("Invalid " + msg
+                    + " (must be a valid Java identifier): " + name);
+        }
+        int max = end == -1 ? name.length() : end;
+        for (int i = start + 1; i < max; ++i) {
+            if (!Character.isJavaIdentifierPart(name.charAt(i))) {
+                throw new IllegalArgumentException("Invalid " + msg
+                        + " (must be a valid Java identifier): " + name);
+            }
+        }
+    }
+
+    /**
+     * Checks that the given string is a valid Java identifier.
+     * 
+     * @param version
+     *            the class version.
+     * @param name
+     *            the string to be checked.
+     * @param msg
+     *            a message to be used in case of error.
+     */
+    static void checkMethodIdentifier(int version, final String name,
+            final String msg) {
+        if (name == null || name.length() == 0) {
+            throw new IllegalArgumentException("Invalid " + msg
+                    + " (must not be null or empty)");
+        }
+        if ((version & 0xFFFF) >= Opcodes.V1_5) {
+            for (int i = 0; i < name.length(); ++i) {
+                if (".;[/<>".indexOf(name.charAt(i)) != -1) {
+                    throw new IllegalArgumentException("Invalid " + msg
+                            + " (must be a valid unqualified name): " + name);
+                }
+            }
+            return;
+        }
+        if (!Character.isJavaIdentifierStart(name.charAt(0))) {
+            throw new IllegalArgumentException(
+                    "Invalid "
+                            + msg
+                            + " (must be a '<init>', '<clinit>' or a valid Java identifier): "
+                            + name);
+        }
+        for (int i = 1; i < name.length(); ++i) {
+            if (!Character.isJavaIdentifierPart(name.charAt(i))) {
+                throw new IllegalArgumentException(
+                        "Invalid "
+                                + msg
+                                + " (must be '<init>' or '<clinit>' or a valid Java identifier): "
+                                + name);
+            }
+        }
+    }
+
+    /**
+     * Checks that the given string is a valid internal class name.
+     * 
+     * @param name
+     *            the string to be checked.
+     * @param msg
+     *            a message to be used in case of error.
+     */
+    static void checkInternalName(final String name, final String msg) {
+        if (name == null || name.length() == 0) {
+            throw new IllegalArgumentException("Invalid " + msg
+                    + " (must not be null or empty)");
+        }
+        if (name.charAt(0) == '[') {
+            checkDesc(name, false);
+        } else {
+            checkInternalName(name, 0, -1, msg);
+        }
+    }
+
+    /**
+     * Checks that the given substring is a valid internal class name.
+     * 
+     * @param name
+     *            the string to be checked.
+     * @param start
+     *            index of the first character of the identifier (inclusive).
+     * @param end
+     *            index of the last character of the identifier (exclusive). -1
+     *            is equivalent to <tt>name.length()</tt> if name is not
+     *            <tt>null</tt>.
+     * @param msg
+     *            a message to be used in case of error.
+     */
+    static void checkInternalName(final String name, final int start,
+            final int end, final String msg) {
+        int max = end == -1 ? name.length() : end;
+        try {
+            int begin = start;
+            int slash;
+            do {
+                slash = name.indexOf('/', begin + 1);
+                if (slash == -1 || slash > max) {
+                    slash = max;
+                }
+                checkIdentifier(name, begin, slash, null);
+                begin = slash + 1;
+            } while (slash != max);
+        } catch (IllegalArgumentException e) {
+            throw new IllegalArgumentException(
+                    "Invalid "
+                            + msg
+                            + " (must be a fully qualified class name in internal form): "
+                            + name);
+        }
+    }
+
+    /**
+     * Checks that the given string is a valid type descriptor.
+     * 
+     * @param desc
+     *            the string to be checked.
+     * @param canBeVoid
+     *            <tt>true</tt> if <tt>V</tt> can be considered valid.
+     */
+    static void checkDesc(final String desc, final boolean canBeVoid) {
+        int end = checkDesc(desc, 0, canBeVoid);
+        if (end != desc.length()) {
+            throw new IllegalArgumentException("Invalid descriptor: " + desc);
+        }
+    }
+
+    /**
+     * Checks that a the given substring is a valid type descriptor.
+     * 
+     * @param desc
+     *            the string to be checked.
+     * @param start
+     *            index of the first character of the identifier (inclusive).
+     * @param canBeVoid
+     *            <tt>true</tt> if <tt>V</tt> can be considered valid.
+     * @return the index of the last character of the type decriptor, plus one.
+     */
+    static int checkDesc(final String desc, final int start,
+            final boolean canBeVoid) {
+        if (desc == null || start >= desc.length()) {
+            throw new IllegalArgumentException(
+                    "Invalid type descriptor (must not be null or empty)");
+        }
+        int index;
+        switch (desc.charAt(start)) {
+        case 'V':
+            if (canBeVoid) {
+                return start + 1;
+            } else {
+                throw new IllegalArgumentException("Invalid descriptor: "
+                        + desc);
+            }
+        case 'Z':
+        case 'C':
+        case 'B':
+        case 'S':
+        case 'I':
+        case 'F':
+        case 'J':
+        case 'D':
+            return start + 1;
+        case '[':
+            index = start + 1;
+            while (index < desc.length() && desc.charAt(index) == '[') {
+                ++index;
+            }
+            if (index < desc.length()) {
+                return checkDesc(desc, index, false);
+            } else {
+                throw new IllegalArgumentException("Invalid descriptor: "
+                        + desc);
+            }
+        case 'L':
+            index = desc.indexOf(';', start);
+            if (index == -1 || index - start < 2) {
+                throw new IllegalArgumentException("Invalid descriptor: "
+                        + desc);
+            }
+            try {
+                checkInternalName(desc, start + 1, index, null);
+            } catch (IllegalArgumentException e) {
+                throw new IllegalArgumentException("Invalid descriptor: "
+                        + desc);
+            }
+            return index + 1;
+        default:
+            throw new IllegalArgumentException("Invalid descriptor: " + desc);
+        }
+    }
+
+    /**
+     * Checks that the given string is a valid method descriptor.
+     * 
+     * @param desc
+     *            the string to be checked.
+     */
+    static void checkMethodDesc(final String desc) {
+        if (desc == null || desc.length() == 0) {
+            throw new IllegalArgumentException(
+                    "Invalid method descriptor (must not be null or empty)");
+        }
+        if (desc.charAt(0) != '(' || desc.length() < 3) {
+            throw new IllegalArgumentException("Invalid descriptor: " + desc);
+        }
+        int start = 1;
+        if (desc.charAt(start) != ')') {
+            do {
+                if (desc.charAt(start) == 'V') {
+                    throw new IllegalArgumentException("Invalid descriptor: "
+                            + desc);
+                }
+                start = checkDesc(desc, start, false);
+            } while (start < desc.length() && desc.charAt(start) != ')');
+        }
+        start = checkDesc(desc, start + 1, true);
+        if (start != desc.length()) {
+            throw new IllegalArgumentException("Invalid descriptor: " + desc);
+        }
+    }
+
+    /**
+     * Checks that the given label is not null. This method can also check that
+     * the label has been visited.
+     * 
+     * @param label
+     *            the label to be checked.
+     * @param checkVisited
+     *            <tt>true</tt> to check that the label has been visited.
+     * @param msg
+     *            a message to be used in case of error.
+     */
+    void checkLabel(final Label label, final boolean checkVisited,
+            final String msg) {
+        if (label == null) {
+            throw new IllegalArgumentException("Invalid " + msg
+                    + " (must not be null)");
+        }
+        if (checkVisited && labels.get(label) == null) {
+            throw new IllegalArgumentException("Invalid " + msg
+                    + " (must be visited first)");
+        }
+    }
+
+    /**
+     * Checks that the given label is not a label used only for debug purposes.
+     * 
+     * @param label
+     *            the label to be checked.
+     */
+    private static void checkNonDebugLabel(final Label label) {
+        Field f = getLabelStatusField();
+        int status = 0;
+        try {
+            status = f == null ? 0 : ((Integer) f.get(label)).intValue();
+        } catch (IllegalAccessException e) {
+            throw new Error("Internal error");
+        }
+        if ((status & 0x01) != 0) {
+            throw new IllegalArgumentException(
+                    "Labels used for debug info cannot be reused for control flow");
+        }
+    }
+
+    /**
+     * Returns the Field object corresponding to the Label.status field.
+     * 
+     * @return the Field object corresponding to the Label.status field.
+     */
+    private static Field getLabelStatusField() {
+        if (labelStatusField == null) {
+            labelStatusField = getLabelField("a");
+            if (labelStatusField == null) {
+                labelStatusField = getLabelField("status");
+            }
+        }
+        return labelStatusField;
+    }
+
+    /**
+     * Returns the field of the Label class whose name is given.
+     * 
+     * @param name
+     *            a field name.
+     * @return the field of the Label class whose name is given, or null.
+     */
+    private static Field getLabelField(final String name) {
+        try {
+            Field f = Label.class.getDeclaredField(name);
+            f.setAccessible(true);
+            return f;
+        } catch (NoSuchFieldException e) {
+            return null;
+        }
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/util/CheckSignatureAdapter.java b/src/main/asm/org/objectweb/asm/util/CheckSignatureAdapter.java
new file mode 100644
index 0000000..450d64c
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/util/CheckSignatureAdapter.java
@@ -0,0 +1,330 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.util;
+
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.signature.SignatureVisitor;
+
+/**
+ * A {@link SignatureVisitor} that checks that its methods are properly used.
+ * 
+ * @author Eric Bruneton
+ */
+public class CheckSignatureAdapter extends SignatureVisitor {
+
+    /**
+     * Type to be used to check class signatures. See
+     * {@link #CheckSignatureAdapter(int, SignatureVisitor)
+     * CheckSignatureAdapter}.
+     */
+    public static final int CLASS_SIGNATURE = 0;
+
+    /**
+     * Type to be used to check method signatures. See
+     * {@link #CheckSignatureAdapter(int, SignatureVisitor)
+     * CheckSignatureAdapter}.
+     */
+    public static final int METHOD_SIGNATURE = 1;
+
+    /**
+     * Type to be used to check type signatures.See
+     * {@link #CheckSignatureAdapter(int, SignatureVisitor)
+     * CheckSignatureAdapter}.
+     */
+    public static final int TYPE_SIGNATURE = 2;
+
+    private static final int EMPTY = 1;
+
+    private static final int FORMAL = 2;
+
+    private static final int BOUND = 4;
+
+    private static final int SUPER = 8;
+
+    private static final int PARAM = 16;
+
+    private static final int RETURN = 32;
+
+    private static final int SIMPLE_TYPE = 64;
+
+    private static final int CLASS_TYPE = 128;
+
+    private static final int END = 256;
+
+    /**
+     * Type of the signature to be checked.
+     */
+    private final int type;
+
+    /**
+     * State of the automaton used to check the order of method calls.
+     */
+    private int state;
+
+    /**
+     * <tt>true</tt> if the checked type signature can be 'V'.
+     */
+    private boolean canBeVoid;
+
+    /**
+     * The visitor to which this adapter must delegate calls. May be
+     * <tt>null</tt>.
+     */
+    private final SignatureVisitor sv;
+
+    /**
+     * Creates a new {@link CheckSignatureAdapter} object. <i>Subclasses must
+     * not use this constructor</i>. Instead, they must use the
+     * {@link #CheckSignatureAdapter(int, int, SignatureVisitor)} version.
+     * 
+     * @param type
+     *            the type of signature to be checked. See
+     *            {@link #CLASS_SIGNATURE}, {@link #METHOD_SIGNATURE} and
+     *            {@link #TYPE_SIGNATURE}.
+     * @param sv
+     *            the visitor to which this adapter must delegate calls. May be
+     *            <tt>null</tt>.
+     */
+    public CheckSignatureAdapter(final int type, final SignatureVisitor sv) {
+        this(Opcodes.ASM4, type, sv);
+    }
+
+    /**
+     * Creates a new {@link CheckSignatureAdapter} object.
+     * 
+     * @param api
+     *            the ASM API version implemented by this visitor. Must be one
+     *            of {@link Opcodes#ASM4}.
+     * @param type
+     *            the type of signature to be checked. See
+     *            {@link #CLASS_SIGNATURE}, {@link #METHOD_SIGNATURE} and
+     *            {@link #TYPE_SIGNATURE}.
+     * @param sv
+     *            the visitor to which this adapter must delegate calls. May be
+     *            <tt>null</tt>.
+     */
+    protected CheckSignatureAdapter(final int api, final int type,
+            final SignatureVisitor sv) {
+        super(api);
+        this.type = type;
+        this.state = EMPTY;
+        this.sv = sv;
+    }
+
+    // class and method signatures
+
+    @Override
+    public void visitFormalTypeParameter(final String name) {
+        if (type == TYPE_SIGNATURE
+                || (state != EMPTY && state != FORMAL && state != BOUND)) {
+            throw new IllegalStateException();
+        }
+        CheckMethodAdapter.checkIdentifier(name, "formal type parameter");
+        state = FORMAL;
+        if (sv != null) {
+            sv.visitFormalTypeParameter(name);
+        }
+    }
+
+    @Override
+    public SignatureVisitor visitClassBound() {
+        if (state != FORMAL) {
+            throw new IllegalStateException();
+        }
+        state = BOUND;
+        SignatureVisitor v = sv == null ? null : sv.visitClassBound();
+        return new CheckSignatureAdapter(TYPE_SIGNATURE, v);
+    }
+
+    @Override
+    public SignatureVisitor visitInterfaceBound() {
+        if (state != FORMAL && state != BOUND) {
+            throw new IllegalArgumentException();
+        }
+        SignatureVisitor v = sv == null ? null : sv.visitInterfaceBound();
+        return new CheckSignatureAdapter(TYPE_SIGNATURE, v);
+    }
+
+    // class signatures
+
+    @Override
+    public SignatureVisitor visitSuperclass() {
+        if (type != CLASS_SIGNATURE || (state & (EMPTY | FORMAL | BOUND)) == 0) {
+            throw new IllegalArgumentException();
+        }
+        state = SUPER;
+        SignatureVisitor v = sv == null ? null : sv.visitSuperclass();
+        return new CheckSignatureAdapter(TYPE_SIGNATURE, v);
+    }
+
+    @Override
+    public SignatureVisitor visitInterface() {
+        if (state != SUPER) {
+            throw new IllegalStateException();
+        }
+        SignatureVisitor v = sv == null ? null : sv.visitInterface();
+        return new CheckSignatureAdapter(TYPE_SIGNATURE, v);
+    }
+
+    // method signatures
+
+    @Override
+    public SignatureVisitor visitParameterType() {
+        if (type != METHOD_SIGNATURE
+                || (state & (EMPTY | FORMAL | BOUND | PARAM)) == 0) {
+            throw new IllegalArgumentException();
+        }
+        state = PARAM;
+        SignatureVisitor v = sv == null ? null : sv.visitParameterType();
+        return new CheckSignatureAdapter(TYPE_SIGNATURE, v);
+    }
+
+    @Override
+    public SignatureVisitor visitReturnType() {
+        if (type != METHOD_SIGNATURE
+                || (state & (EMPTY | FORMAL | BOUND | PARAM)) == 0) {
+            throw new IllegalArgumentException();
+        }
+        state = RETURN;
+        SignatureVisitor v = sv == null ? null : sv.visitReturnType();
+        CheckSignatureAdapter cv = new CheckSignatureAdapter(TYPE_SIGNATURE, v);
+        cv.canBeVoid = true;
+        return cv;
+    }
+
+    @Override
+    public SignatureVisitor visitExceptionType() {
+        if (state != RETURN) {
+            throw new IllegalStateException();
+        }
+        SignatureVisitor v = sv == null ? null : sv.visitExceptionType();
+        return new CheckSignatureAdapter(TYPE_SIGNATURE, v);
+    }
+
+    // type signatures
+
+    @Override
+    public void visitBaseType(final char descriptor) {
+        if (type != TYPE_SIGNATURE || state != EMPTY) {
+            throw new IllegalStateException();
+        }
+        if (descriptor == 'V') {
+            if (!canBeVoid) {
+                throw new IllegalArgumentException();
+            }
+        } else {
+            if ("ZCBSIFJD".indexOf(descriptor) == -1) {
+                throw new IllegalArgumentException();
+            }
+        }
+        state = SIMPLE_TYPE;
+        if (sv != null) {
+            sv.visitBaseType(descriptor);
+        }
+    }
+
+    @Override
+    public void visitTypeVariable(final String name) {
+        if (type != TYPE_SIGNATURE || state != EMPTY) {
+            throw new IllegalStateException();
+        }
+        CheckMethodAdapter.checkIdentifier(name, "type variable");
+        state = SIMPLE_TYPE;
+        if (sv != null) {
+            sv.visitTypeVariable(name);
+        }
+    }
+
+    @Override
+    public SignatureVisitor visitArrayType() {
+        if (type != TYPE_SIGNATURE || state != EMPTY) {
+            throw new IllegalStateException();
+        }
+        state = SIMPLE_TYPE;
+        SignatureVisitor v = sv == null ? null : sv.visitArrayType();
+        return new CheckSignatureAdapter(TYPE_SIGNATURE, v);
+    }
+
+    @Override
+    public void visitClassType(final String name) {
+        if (type != TYPE_SIGNATURE || state != EMPTY) {
+            throw new IllegalStateException();
+        }
+        CheckMethodAdapter.checkInternalName(name, "class name");
+        state = CLASS_TYPE;
+        if (sv != null) {
+            sv.visitClassType(name);
+        }
+    }
+
+    @Override
+    public void visitInnerClassType(final String name) {
+        if (state != CLASS_TYPE) {
+            throw new IllegalStateException();
+        }
+        CheckMethodAdapter.checkIdentifier(name, "inner class name");
+        if (sv != null) {
+            sv.visitInnerClassType(name);
+        }
+    }
+
+    @Override
+    public void visitTypeArgument() {
+        if (state != CLASS_TYPE) {
+            throw new IllegalStateException();
+        }
+        if (sv != null) {
+            sv.visitTypeArgument();
+        }
+    }
+
+    @Override
+    public SignatureVisitor visitTypeArgument(final char wildcard) {
+        if (state != CLASS_TYPE) {
+            throw new IllegalStateException();
+        }
+        if ("+-=".indexOf(wildcard) == -1) {
+            throw new IllegalArgumentException();
+        }
+        SignatureVisitor v = sv == null ? null : sv.visitTypeArgument(wildcard);
+        return new CheckSignatureAdapter(TYPE_SIGNATURE, v);
+    }
+
+    @Override
+    public void visitEnd() {
+        if (state != CLASS_TYPE) {
+            throw new IllegalStateException();
+        }
+        state = END;
+        if (sv != null) {
+            sv.visitEnd();
+        }
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/util/Printer.java b/src/main/asm/org/objectweb/asm/util/Printer.java
new file mode 100644
index 0000000..ffc7470
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/util/Printer.java
@@ -0,0 +1,500 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.util;
+
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.objectweb.asm.Attribute;
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.Opcodes;
+
+/**
+ * An abstract converter from visit events to text.
+ * 
+ * @author Eric Bruneton
+ */
+public abstract class Printer {
+
+    /**
+     * The names of the Java Virtual Machine opcodes.
+     */
+    public static final String[] OPCODES;
+
+    /**
+     * The names of the for <code>operand</code> parameter values of the
+     * {@link org.objectweb.asm.MethodVisitor#visitIntInsn} method when
+     * <code>opcode</code> is <code>NEWARRAY</code>.
+     */
+    public static final String[] TYPES;
+
+    /**
+     * The names of the <code>tag</code> field values for
+     * {@link org.objectweb.asm.Handle}.
+     */
+    public static final String[] HANDLE_TAG;
+
+    static {
+        String s = "NOP,ACONST_NULL,ICONST_M1,ICONST_0,ICONST_1,ICONST_2,"
+                + "ICONST_3,ICONST_4,ICONST_5,LCONST_0,LCONST_1,FCONST_0,"
+                + "FCONST_1,FCONST_2,DCONST_0,DCONST_1,BIPUSH,SIPUSH,LDC,,,"
+                + "ILOAD,LLOAD,FLOAD,DLOAD,ALOAD,,,,,,,,,,,,,,,,,,,,,IALOAD,"
+                + "LALOAD,FALOAD,DALOAD,AALOAD,BALOAD,CALOAD,SALOAD,ISTORE,"
+                + "LSTORE,FSTORE,DSTORE,ASTORE,,,,,,,,,,,,,,,,,,,,,IASTORE,"
+                + "LASTORE,FASTORE,DASTORE,AASTORE,BASTORE,CASTORE,SASTORE,POP,"
+                + "POP2,DUP,DUP_X1,DUP_X2,DUP2,DUP2_X1,DUP2_X2,SWAP,IADD,LADD,"
+                + "FADD,DADD,ISUB,LSUB,FSUB,DSUB,IMUL,LMUL,FMUL,DMUL,IDIV,LDIV,"
+                + "FDIV,DDIV,IREM,LREM,FREM,DREM,INEG,LNEG,FNEG,DNEG,ISHL,LSHL,"
+                + "ISHR,LSHR,IUSHR,LUSHR,IAND,LAND,IOR,LOR,IXOR,LXOR,IINC,I2L,"
+                + "I2F,I2D,L2I,L2F,L2D,F2I,F2L,F2D,D2I,D2L,D2F,I2B,I2C,I2S,LCMP,"
+                + "FCMPL,FCMPG,DCMPL,DCMPG,IFEQ,IFNE,IFLT,IFGE,IFGT,IFLE,"
+                + "IF_ICMPEQ,IF_ICMPNE,IF_ICMPLT,IF_ICMPGE,IF_ICMPGT,IF_ICMPLE,"
+                + "IF_ACMPEQ,IF_ACMPNE,GOTO,JSR,RET,TABLESWITCH,LOOKUPSWITCH,"
+                + "IRETURN,LRETURN,FRETURN,DRETURN,ARETURN,RETURN,GETSTATIC,"
+                + "PUTSTATIC,GETFIELD,PUTFIELD,INVOKEVIRTUAL,INVOKESPECIAL,"
+                + "INVOKESTATIC,INVOKEINTERFACE,INVOKEDYNAMIC,NEW,NEWARRAY,"
+                + "ANEWARRAY,ARRAYLENGTH,ATHROW,CHECKCAST,INSTANCEOF,"
+                + "MONITORENTER,MONITOREXIT,,MULTIANEWARRAY,IFNULL,IFNONNULL,";
+        OPCODES = new String[200];
+        int i = 0;
+        int j = 0;
+        int l;
+        while ((l = s.indexOf(',', j)) > 0) {
+            OPCODES[i++] = j + 1 == l ? null : s.substring(j, l);
+            j = l + 1;
+        }
+
+        s = "T_BOOLEAN,T_CHAR,T_FLOAT,T_DOUBLE,T_BYTE,T_SHORT,T_INT,T_LONG,";
+        TYPES = new String[12];
+        j = 0;
+        i = 4;
+        while ((l = s.indexOf(',', j)) > 0) {
+            TYPES[i++] = s.substring(j, l);
+            j = l + 1;
+        }
+
+        s = "H_GETFIELD,H_GETSTATIC,H_PUTFIELD,H_PUTSTATIC,"
+                + "H_INVOKEVIRTUAL,H_INVOKESTATIC,H_INVOKESPECIAL,"
+                + "H_NEWINVOKESPECIAL,H_INVOKEINTERFACE,";
+        HANDLE_TAG = new String[10];
+        j = 0;
+        i = 1;
+        while ((l = s.indexOf(',', j)) > 0) {
+            HANDLE_TAG[i++] = s.substring(j, l);
+            j = l + 1;
+        }
+    }
+
+    /**
+     * The ASM API version implemented by this class. The value of this field
+     * must be one of {@link Opcodes#ASM4}.
+     */
+    protected final int api;
+
+    /**
+     * A buffer that can be used to create strings.
+     */
+    protected final StringBuffer buf;
+
+    /**
+     * The text to be printed. Since the code of methods is not necessarily
+     * visited in sequential order, one method after the other, but can be
+     * interlaced (some instructions from method one, then some instructions
+     * from method two, then some instructions from method one again...), it is
+     * not possible to print the visited instructions directly to a sequential
+     * stream. A class is therefore printed in a two steps process: a string
+     * tree is constructed during the visit, and printed to a sequential stream
+     * at the end of the visit. This string tree is stored in this field, as a
+     * string list that can contain other string lists, which can themselves
+     * contain other string lists, and so on.
+     */
+    public final List<Object> text;
+
+    /**
+     * Constructs a new {@link Printer}.
+     */
+    protected Printer(final int api) {
+        this.api = api;
+        this.buf = new StringBuffer();
+        this.text = new ArrayList<Object>();
+    }
+
+    /**
+     * Class header. See {@link org.objectweb.asm.ClassVisitor#visit}.
+     */
+    public abstract void visit(final int version, final int access,
+            final String name, final String signature, final String superName,
+            final String[] interfaces);
+
+    /**
+     * Class source. See {@link org.objectweb.asm.ClassVisitor#visitSource}.
+     */
+    public abstract void visitSource(final String file, final String debug);
+
+    /**
+     * Class outer class. See
+     * {@link org.objectweb.asm.ClassVisitor#visitOuterClass}.
+     */
+    public abstract void visitOuterClass(final String owner, final String name,
+            final String desc);
+
+    /**
+     * Class annotation. See
+     * {@link org.objectweb.asm.ClassVisitor#visitAnnotation}.
+     */
+    public abstract Printer visitClassAnnotation(final String desc,
+            final boolean visible);
+
+    /**
+     * Class attribute. See
+     * {@link org.objectweb.asm.ClassVisitor#visitAttribute}.
+     */
+    public abstract void visitClassAttribute(final Attribute attr);
+
+    /**
+     * Class inner name. See
+     * {@link org.objectweb.asm.ClassVisitor#visitInnerClass}.
+     */
+    public abstract void visitInnerClass(final String name,
+            final String outerName, final String innerName, final int access);
+
+    /**
+     * Class field. See {@link org.objectweb.asm.ClassVisitor#visitField}.
+     */
+    public abstract Printer visitField(final int access, final String name,
+            final String desc, final String signature, final Object value);
+
+    /**
+     * Class method. See {@link org.objectweb.asm.ClassVisitor#visitMethod}.
+     */
+    public abstract Printer visitMethod(final int access, final String name,
+            final String desc, final String signature, final String[] exceptions);
+
+    /**
+     * Class end. See {@link org.objectweb.asm.ClassVisitor#visitEnd}.
+     */
+    public abstract void visitClassEnd();
+
+    // ------------------------------------------------------------------------
+    // Annotations
+    // ------------------------------------------------------------------------
+
+    /**
+     * Annotation value. See {@link org.objectweb.asm.AnnotationVisitor#visit}.
+     */
+    public abstract void visit(final String name, final Object value);
+
+    /**
+     * Annotation enum value. See
+     * {@link org.objectweb.asm.AnnotationVisitor#visitEnum}.
+     */
+    public abstract void visitEnum(final String name, final String desc,
+            final String value);
+
+    /**
+     * Nested annotation value. See
+     * {@link org.objectweb.asm.AnnotationVisitor#visitAnnotation}.
+     */
+    public abstract Printer visitAnnotation(final String name, final String desc);
+
+    /**
+     * Annotation array value. See
+     * {@link org.objectweb.asm.AnnotationVisitor#visitArray}.
+     */
+    public abstract Printer visitArray(final String name);
+
+    /**
+     * Annotation end. See {@link org.objectweb.asm.AnnotationVisitor#visitEnd}.
+     */
+    public abstract void visitAnnotationEnd();
+
+    // ------------------------------------------------------------------------
+    // Fields
+    // ------------------------------------------------------------------------
+
+    /**
+     * Field annotation. See
+     * {@link org.objectweb.asm.FieldVisitor#visitAnnotation}.
+     */
+    public abstract Printer visitFieldAnnotation(final String desc,
+            final boolean visible);
+
+    /**
+     * Field attribute. See
+     * {@link org.objectweb.asm.FieldVisitor#visitAttribute}.
+     */
+    public abstract void visitFieldAttribute(final Attribute attr);
+
+    /**
+     * Field end. See {@link org.objectweb.asm.FieldVisitor#visitEnd}.
+     */
+    public abstract void visitFieldEnd();
+
+    // ------------------------------------------------------------------------
+    // Methods
+    // ------------------------------------------------------------------------
+
+    /**
+     * Method default annotation. See
+     * {@link org.objectweb.asm.MethodVisitor#visitAnnotationDefault}.
+     */
+    public abstract Printer visitAnnotationDefault();
+
+    /**
+     * Method annotation. See
+     * {@link org.objectweb.asm.MethodVisitor#visitAnnotation}.
+     */
+    public abstract Printer visitMethodAnnotation(final String desc,
+            final boolean visible);
+
+    /**
+     * Method parameter annotation. See
+     * {@link org.objectweb.asm.MethodVisitor#visitParameterAnnotation}.
+     */
+    public abstract Printer visitParameterAnnotation(final int parameter,
+            final String desc, final boolean visible);
+
+    /**
+     * Method attribute. See
+     * {@link org.objectweb.asm.MethodVisitor#visitAttribute}.
+     */
+    public abstract void visitMethodAttribute(final Attribute attr);
+
+    /**
+     * Method start. See {@link org.objectweb.asm.MethodVisitor#visitCode}.
+     */
+    public abstract void visitCode();
+
+    /**
+     * Method stack frame. See
+     * {@link org.objectweb.asm.MethodVisitor#visitFrame}.
+     */
+    public abstract void visitFrame(final int type, final int nLocal,
+            final Object[] local, final int nStack, final Object[] stack);
+
+    /**
+     * Method instruction. See {@link org.objectweb.asm.MethodVisitor#visitInsn}
+     * .
+     */
+    public abstract void visitInsn(final int opcode);
+
+    /**
+     * Method instruction. See
+     * {@link org.objectweb.asm.MethodVisitor#visitIntInsn}.
+     */
+    public abstract void visitIntInsn(final int opcode, final int operand);
+
+    /**
+     * Method instruction. See
+     * {@link org.objectweb.asm.MethodVisitor#visitVarInsn}.
+     */
+    public abstract void visitVarInsn(final int opcode, final int var);
+
+    /**
+     * Method instruction. See
+     * {@link org.objectweb.asm.MethodVisitor#visitTypeInsn}.
+     */
+    public abstract void visitTypeInsn(final int opcode, final String type);
+
+    /**
+     * Method instruction. See
+     * {@link org.objectweb.asm.MethodVisitor#visitFieldInsn}.
+     */
+    public abstract void visitFieldInsn(final int opcode, final String owner,
+            final String name, final String desc);
+
+    /**
+     * Method instruction. See
+     * {@link org.objectweb.asm.MethodVisitor#visitMethodInsn}.
+     */
+    public abstract void visitMethodInsn(final int opcode, final String owner,
+            final String name, final String desc);
+
+    /**
+     * Method instruction. See
+     * {@link org.objectweb.asm.MethodVisitor#visitInvokeDynamicInsn}.
+     */
+    public abstract void visitInvokeDynamicInsn(String name, String desc,
+            Handle bsm, Object... bsmArgs);
+
+    /**
+     * Method instruction. See
+     * {@link org.objectweb.asm.MethodVisitor#visitJumpInsn}.
+     */
+    public abstract void visitJumpInsn(final int opcode, final Label label);
+
+    /**
+     * Method label. See {@link org.objectweb.asm.MethodVisitor#visitLabel}.
+     */
+    public abstract void visitLabel(final Label label);
+
+    /**
+     * Method instruction. See
+     * {@link org.objectweb.asm.MethodVisitor#visitLdcInsn}.
+     */
+    public abstract void visitLdcInsn(final Object cst);
+
+    /**
+     * Method instruction. See
+     * {@link org.objectweb.asm.MethodVisitor#visitIincInsn}.
+     */
+    public abstract void visitIincInsn(final int var, final int increment);
+
+    /**
+     * Method instruction. See
+     * {@link org.objectweb.asm.MethodVisitor#visitTableSwitchInsn}.
+     */
+    public abstract void visitTableSwitchInsn(final int min, final int max,
+            final Label dflt, final Label... labels);
+
+    /**
+     * Method instruction. See
+     * {@link org.objectweb.asm.MethodVisitor#visitLookupSwitchInsn}.
+     */
+    public abstract void visitLookupSwitchInsn(final Label dflt,
+            final int[] keys, final Label[] labels);
+
+    /**
+     * Method instruction. See
+     * {@link org.objectweb.asm.MethodVisitor#visitMultiANewArrayInsn}.
+     */
+    public abstract void visitMultiANewArrayInsn(final String desc,
+            final int dims);
+
+    /**
+     * Method exception handler. See
+     * {@link org.objectweb.asm.MethodVisitor#visitTryCatchBlock}.
+     */
+    public abstract void visitTryCatchBlock(final Label start, final Label end,
+            final Label handler, final String type);
+
+    /**
+     * Method debug info. See
+     * {@link org.objectweb.asm.MethodVisitor#visitLocalVariable}.
+     */
+    public abstract void visitLocalVariable(final String name,
+            final String desc, final String signature, final Label start,
+            final Label end, final int index);
+
+    /**
+     * Method debug info. See
+     * {@link org.objectweb.asm.MethodVisitor#visitLineNumber}.
+     */
+    public abstract void visitLineNumber(final int line, final Label start);
+
+    /**
+     * Method max stack and max locals. See
+     * {@link org.objectweb.asm.MethodVisitor#visitMaxs}.
+     */
+    public abstract void visitMaxs(final int maxStack, final int maxLocals);
+
+    /**
+     * Method end. See {@link org.objectweb.asm.MethodVisitor#visitEnd}.
+     */
+    public abstract void visitMethodEnd();
+
+    /**
+     * Returns the text constructed by this visitor.
+     * 
+     * @return the text constructed by this visitor.
+     */
+    public List<Object> getText() {
+        return text;
+    }
+
+    /**
+     * Prints the text constructed by this visitor.
+     * 
+     * @param pw
+     *            the print writer to be used.
+     */
+    public void print(final PrintWriter pw) {
+        printList(pw, text);
+    }
+
+    /**
+     * Appends a quoted string to a given buffer.
+     * 
+     * @param buf
+     *            the buffer where the string must be added.
+     * @param s
+     *            the string to be added.
+     */
+    public static void appendString(final StringBuffer buf, final String s) {
+        buf.append('\"');
+        for (int i = 0; i < s.length(); ++i) {
+            char c = s.charAt(i);
+            if (c == '\n') {
+                buf.append("\\n");
+            } else if (c == '\r') {
+                buf.append("\\r");
+            } else if (c == '\\') {
+                buf.append("\\\\");
+            } else if (c == '"') {
+                buf.append("\\\"");
+            } else if (c < 0x20 || c > 0x7f) {
+                buf.append("\\u");
+                if (c < 0x10) {
+                    buf.append("000");
+                } else if (c < 0x100) {
+                    buf.append("00");
+                } else if (c < 0x1000) {
+                    buf.append('0');
+                }
+                buf.append(Integer.toString(c, 16));
+            } else {
+                buf.append(c);
+            }
+        }
+        buf.append('\"');
+    }
+
+    /**
+     * Prints the given string tree.
+     * 
+     * @param pw
+     *            the writer to be used to print the tree.
+     * @param l
+     *            a string tree, i.e., a string list that can contain other
+     *            string lists, and so on recursively.
+     */
+    static void printList(final PrintWriter pw, final List<?> l) {
+        for (int i = 0; i < l.size(); ++i) {
+            Object o = l.get(i);
+            if (o instanceof List) {
+                printList(pw, (List<?>) o);
+            } else {
+                pw.print(o.toString());
+            }
+        }
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/util/Textifiable.java b/src/main/asm/org/objectweb/asm/util/Textifiable.java
new file mode 100644
index 0000000..aad97ba
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/util/Textifiable.java
@@ -0,0 +1,56 @@
+/**
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.util;
+
+import java.util.Map;
+
+import org.objectweb.asm.Label;
+
+/**
+ * An {@link org.objectweb.asm.Attribute Attribute} that can print a readable
+ * representation of itself.
+ * 
+ * Implementations should construct readable output from an attribute data
+ * structure. Such representation could be used in unit test assertions.
+ * 
+ * @author Eugene Kuleshov
+ */
+public interface Textifiable {
+
+    /**
+     * Build a human readable representation of this attribute.
+     * 
+     * @param buf
+     *            a buffer used for printing Java code.
+     * @param labelNames
+     *            map of label instances to their names.
+     */
+    void textify(StringBuffer buf, Map<Label, String> labelNames);
+}
diff --git a/src/main/asm/org/objectweb/asm/util/Textifier.java b/src/main/asm/org/objectweb/asm/util/Textifier.java
new file mode 100644
index 0000000..8f14474
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/util/Textifier.java
@@ -0,0 +1,1182 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.util;
+
+import org.objectweb.asm.*;
+import org.objectweb.asm.signature.SignatureReader;
+
+import java.io.FileInputStream;
+import java.io.PrintWriter;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A {@link Printer} that prints a disassembled view of the classes it visits.
+ *
+ * @author Eric Bruneton
+ */
+public class Textifier extends Printer {
+    /**
+     * Constant used in {@link #appendDescriptor appendDescriptor} for internal
+     * type names in bytecode notation.
+     */
+    public static final int INTERNAL_NAME = 0;
+
+    /**
+     * Constant used in {@link #appendDescriptor appendDescriptor} for field
+     * descriptors, formatted in bytecode notation
+     */
+    public static final int FIELD_DESCRIPTOR = 1;
+
+    /**
+     * Constant used in {@link #appendDescriptor appendDescriptor} for field
+     * signatures, formatted in bytecode notation
+     */
+    public static final int FIELD_SIGNATURE = 2;
+
+    /**
+     * Constant used in {@link #appendDescriptor appendDescriptor} for method
+     * descriptors, formatted in bytecode notation
+     */
+    public static final int METHOD_DESCRIPTOR = 3;
+
+    /**
+     * Constant used in {@link #appendDescriptor appendDescriptor} for method
+     * signatures, formatted in bytecode notation
+     */
+    public static final int METHOD_SIGNATURE = 4;
+
+    /**
+     * Constant used in {@link #appendDescriptor appendDescriptor} for class
+     * signatures, formatted in bytecode notation
+     */
+    public static final int CLASS_SIGNATURE = 5;
+
+    /**
+     * Constant used in {@link #appendDescriptor appendDescriptor} for field or
+     * method return value signatures, formatted in default Java notation
+     * (non-bytecode)
+     */
+    public static final int TYPE_DECLARATION = 6;
+
+    /**
+     * Constant used in {@link #appendDescriptor appendDescriptor} for class
+     * signatures, formatted in default Java notation (non-bytecode)
+     */
+    public static final int CLASS_DECLARATION = 7;
+
+    /**
+     * Constant used in {@link #appendDescriptor appendDescriptor} for method
+     * parameter signatures, formatted in default Java notation (non-bytecode)
+     */
+    public static final int PARAMETERS_DECLARATION = 8;
+
+    /**
+     * Constant used in {@link #appendDescriptor appendDescriptor} for handle
+     * descriptors, formatted in bytecode notation
+     */
+    public static final int HANDLE_DESCRIPTOR = 9;
+
+    /**
+     * Tab for class members.
+     */
+    protected String tab = "  ";
+
+    /**
+     * Tab for bytecode instructions.
+     */
+    protected String tab2 = "    ";
+
+    /**
+     * Tab for table and lookup switch instructions.
+     */
+    protected String tab3 = "      ";
+
+    /**
+     * Tab for labels.
+     */
+    protected String ltab = "   ";
+
+    /**
+     * The label names. This map associate String values to Label keys.
+     */
+    protected Map<Label, String> labelNames;
+
+    private int valueNumber = 0;
+
+    /**
+     * Constructs a new {@link Textifier}. <i>Subclasses must not use this
+     * constructor</i>. Instead, they must use the {@link #Textifier(int)}
+     * version.
+     */
+    public Textifier() {
+        this(Opcodes.ASM4);
+    }
+
+    /**
+     * Constructs a new {@link Textifier}.
+     *
+     * @param api the ASM API version implemented by this visitor. Must be one
+     *            of {@link Opcodes#ASM4}.
+     */
+    protected Textifier(final int api) {
+        super(api);
+    }
+
+    /**
+     * Prints a disassembled view of the given class to the standard output.
+     * <p>
+     * Usage: Textifier [-debug] &lt;binary class name or class file name &gt;
+     *
+     * @param args the command line arguments.
+     * @throws Exception if the class cannot be found, or if an IO exception occurs.
+     */
+    public static void main(final String[] args) throws Exception {
+        int i = 0;
+        int flags = ClassReader.SKIP_DEBUG;
+
+        boolean ok = true;
+        if (args.length < 1 || args.length > 2) {
+            ok = false;
+        }
+        if (ok && "-debug".equals(args[0])) {
+            i = 1;
+            flags = 0;
+            if (args.length != 2) {
+                ok = false;
+            }
+        }
+        if (!ok) {
+            System.err
+                    .println("Prints a disassembled view of the given class.");
+            System.err.println("Usage: Textifier [-debug] "
+                    + "<fully qualified class name or class file name>");
+            return;
+        }
+        ClassReader cr;
+        if (args[i].endsWith(".class") || args[i].indexOf('\\') > -1
+                || args[i].indexOf('/') > -1) {
+            cr = new ClassReader(new FileInputStream(args[i]));
+        } else {
+            cr = new ClassReader(args[i]);
+        }
+        cr.accept(new TraceClassVisitor(new PrintWriter(System.out)), flags);
+    }
+
+    // ------------------------------------------------------------------------
+    // Classes
+    // ------------------------------------------------------------------------
+
+    @Override
+    public void visit(final int version, final int access, final String name,
+                      final String signature, final String superName,
+                      final String[] interfaces) {
+        int major = version & 0xFFFF;
+        int minor = version >>> 16;
+        buf.setLength(0);
+        buf.append("// class version ").append(major).append('.').append(minor)
+                .append(" (").append(version).append(")\n");
+        if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+            buf.append("// DEPRECATED\n");
+        }
+        buf.append("// access flags 0x")
+                .append(Integer.toHexString(access).toUpperCase()).append('\n');
+
+        appendDescriptor(CLASS_SIGNATURE, signature);
+        if (signature != null) {
+            TraceSignatureVisitor sv = new TraceSignatureVisitor(access);
+            SignatureReader r = new SignatureReader(signature);
+            r.accept(sv);
+            buf.append("// declaration: ").append(name)
+                    .append(sv.getDeclaration()).append('\n');
+        }
+
+        appendAccess(access & ~Opcodes.ACC_SUPER);
+        if ((access & Opcodes.ACC_ANNOTATION) != 0) {
+            buf.append("@interface ");
+        } else if ((access & Opcodes.ACC_INTERFACE) != 0) {
+            buf.append("interface ");
+        } else if ((access & Opcodes.ACC_ENUM) == 0) {
+            buf.append("class ");
+        }
+        appendDescriptor(INTERNAL_NAME, name);
+
+        if (superName != null && !"java/lang/Object".equals(superName)) {
+            buf.append(" extends ");
+            appendDescriptor(INTERNAL_NAME, superName);
+            buf.append(' ');
+        }
+        if (interfaces != null && interfaces.length > 0) {
+            buf.append(" implements ");
+            for (int i = 0; i < interfaces.length; ++i) {
+                appendDescriptor(INTERNAL_NAME, interfaces[i]);
+                buf.append(' ');
+            }
+        }
+        buf.append(" {\n\n");
+
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitSource(final String file, final String debug) {
+        buf.setLength(0);
+        if (file != null) {
+            buf.append(tab).append("// compiled from: ").append(file)
+                    .append('\n');
+        }
+        if (debug != null) {
+            buf.append(tab).append("// debug info: ").append(debug)
+                    .append('\n');
+        }
+        if (buf.length() > 0) {
+            text.add(buf.toString());
+        }
+    }
+
+    @Override
+    public void visitOuterClass(final String owner, final String name,
+                                final String desc) {
+        buf.setLength(0);
+        buf.append(tab).append("OUTERCLASS ");
+        appendDescriptor(INTERNAL_NAME, owner);
+        buf.append(' ');
+        if (name != null) {
+            buf.append(name).append(' ');
+        }
+        appendDescriptor(METHOD_DESCRIPTOR, desc);
+        buf.append('\n');
+        text.add(buf.toString());
+    }
+
+    @Override
+    public Textifier visitClassAnnotation(final String desc,
+                                          final boolean visible) {
+        text.add("\n");
+        return visitAnnotation(desc, visible);
+    }
+
+    @Override
+    public void visitClassAttribute(final Attribute attr) {
+        text.add("\n");
+        visitAttribute(attr);
+    }
+
+    @Override
+    public void visitInnerClass(final String name, final String outerName,
+                                final String innerName, final int access) {
+        buf.setLength(0);
+        buf.append(tab).append("// access flags 0x");
+        buf.append(
+                Integer.toHexString(access & ~Opcodes.ACC_SUPER).toUpperCase())
+                .append('\n');
+        buf.append(tab);
+        appendAccess(access);
+        buf.append("INNERCLASS ");
+        appendDescriptor(INTERNAL_NAME, name);
+        buf.append(' ');
+        appendDescriptor(INTERNAL_NAME, outerName);
+        buf.append(' ');
+        appendDescriptor(INTERNAL_NAME, innerName);
+        buf.append('\n');
+        text.add(buf.toString());
+    }
+
+    @Override
+    public Textifier visitField(final int access, final String name,
+                                final String desc, final String signature, final Object value) {
+        buf.setLength(0);
+        buf.append('\n');
+        if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+            buf.append(tab).append("// DEPRECATED\n");
+        }
+        buf.append(tab).append("// access flags 0x")
+                .append(Integer.toHexString(access).toUpperCase()).append('\n');
+        if (signature != null) {
+            buf.append(tab);
+            appendDescriptor(FIELD_SIGNATURE, signature);
+
+            TraceSignatureVisitor sv = new TraceSignatureVisitor(0);
+            SignatureReader r = new SignatureReader(signature);
+            r.acceptType(sv);
+            buf.append(tab).append("// declaration: ")
+                    .append(sv.getDeclaration()).append('\n');
+        }
+
+        buf.append(tab);
+        appendAccess(access);
+
+        appendDescriptor(FIELD_DESCRIPTOR, desc);
+        buf.append(' ').append(name);
+        if (value != null) {
+            buf.append(" = ");
+            if (value instanceof String) {
+                buf.append('\"').append(value).append('\"');
+            } else {
+                buf.append(value);
+            }
+        }
+
+        buf.append('\n');
+        text.add(buf.toString());
+
+        Textifier t = createTextifier();
+        text.add(t.getText());
+        return t;
+    }
+
+    @Override
+    public Textifier visitMethod(final int access, final String name,
+                                 final String desc, final String signature, final String[] exceptions) {
+        buf.setLength(0);
+        buf.append('\n');
+        if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+            buf.append(tab).append("// DEPRECATED\n");
+        }
+        buf.append(tab).append("// access flags 0x")
+                .append(Integer.toHexString(access).toUpperCase()).append('\n');
+
+        if (signature != null) {
+            buf.append(tab);
+            appendDescriptor(METHOD_SIGNATURE, signature);
+
+            TraceSignatureVisitor v = new TraceSignatureVisitor(0);
+            SignatureReader r = new SignatureReader(signature);
+            r.accept(v);
+            String genericDecl = v.getDeclaration();
+            String genericReturn = v.getReturnType();
+            String genericExceptions = v.getExceptions();
+
+            buf.append(tab).append("// declaration: ").append(genericReturn)
+                    .append(' ').append(name).append(genericDecl);
+            if (genericExceptions != null) {
+                buf.append(" throws ").append(genericExceptions);
+            }
+            buf.append('\n');
+        }
+
+        buf.append(tab);
+        appendAccess(access);
+        if ((access & Opcodes.ACC_NATIVE) != 0) {
+            buf.append("native ");
+        }
+        if ((access & Opcodes.ACC_VARARGS) != 0) {
+            buf.append("varargs ");
+        }
+        if ((access & Opcodes.ACC_BRIDGE) != 0) {
+            buf.append("bridge ");
+        }
+
+        buf.append(name);
+        appendDescriptor(METHOD_DESCRIPTOR, desc);
+        if (exceptions != null && exceptions.length > 0) {
+            buf.append(" throws ");
+            for (int i = 0; i < exceptions.length; ++i) {
+                appendDescriptor(INTERNAL_NAME, exceptions[i]);
+                buf.append(' ');
+            }
+        }
+
+        buf.append('\n');
+        text.add(buf.toString());
+
+        Textifier t = createTextifier();
+        text.add(t.getText());
+        return t;
+    }
+
+    @Override
+    public void visitClassEnd() {
+        text.add("}\n");
+    }
+
+    // ------------------------------------------------------------------------
+    // Annotations
+    // ------------------------------------------------------------------------
+
+    @Override
+    public void visit(final String name, final Object value) {
+        buf.setLength(0);
+        appendComa(valueNumber++);
+
+        if (name != null) {
+            buf.append(name).append('=');
+        }
+
+        if (value instanceof String) {
+            visitString((String) value);
+        } else if (value instanceof Type) {
+            visitType((Type) value);
+        } else if (value instanceof Byte) {
+            visitByte(((Byte) value).byteValue());
+        } else if (value instanceof Boolean) {
+            visitBoolean(((Boolean) value).booleanValue());
+        } else if (value instanceof Short) {
+            visitShort(((Short) value).shortValue());
+        } else if (value instanceof Character) {
+            visitChar(((Character) value).charValue());
+        } else if (value instanceof Integer) {
+            visitInt(((Integer) value).intValue());
+        } else if (value instanceof Float) {
+            visitFloat(((Float) value).floatValue());
+        } else if (value instanceof Long) {
+            visitLong(((Long) value).longValue());
+        } else if (value instanceof Double) {
+            visitDouble(((Double) value).doubleValue());
+        } else if (value.getClass().isArray()) {
+            buf.append('{');
+            if (value instanceof byte[]) {
+                byte[] v = (byte[]) value;
+                for (int i = 0; i < v.length; i++) {
+                    appendComa(i);
+                    visitByte(v[i]);
+                }
+            } else if (value instanceof boolean[]) {
+                boolean[] v = (boolean[]) value;
+                for (int i = 0; i < v.length; i++) {
+                    appendComa(i);
+                    visitBoolean(v[i]);
+                }
+            } else if (value instanceof short[]) {
+                short[] v = (short[]) value;
+                for (int i = 0; i < v.length; i++) {
+                    appendComa(i);
+                    visitShort(v[i]);
+                }
+            } else if (value instanceof char[]) {
+                char[] v = (char[]) value;
+                for (int i = 0; i < v.length; i++) {
+                    appendComa(i);
+                    visitChar(v[i]);
+                }
+            } else if (value instanceof int[]) {
+                int[] v = (int[]) value;
+                for (int i = 0; i < v.length; i++) {
+                    appendComa(i);
+                    visitInt(v[i]);
+                }
+            } else if (value instanceof long[]) {
+                long[] v = (long[]) value;
+                for (int i = 0; i < v.length; i++) {
+                    appendComa(i);
+                    visitLong(v[i]);
+                }
+            } else if (value instanceof float[]) {
+                float[] v = (float[]) value;
+                for (int i = 0; i < v.length; i++) {
+                    appendComa(i);
+                    visitFloat(v[i]);
+                }
+            } else if (value instanceof double[]) {
+                double[] v = (double[]) value;
+                for (int i = 0; i < v.length; i++) {
+                    appendComa(i);
+                    visitDouble(v[i]);
+                }
+            }
+            buf.append('}');
+        }
+
+        text.add(buf.toString());
+    }
+
+    private void visitInt(final int value) {
+        buf.append(value);
+    }
+
+    private void visitLong(final long value) {
+        buf.append(value).append('L');
+    }
+
+    private void visitFloat(final float value) {
+        buf.append(value).append('F');
+    }
+
+    private void visitDouble(final double value) {
+        buf.append(value).append('D');
+    }
+
+    private void visitChar(final char value) {
+        buf.append("(char)").append((int) value);
+    }
+
+    private void visitShort(final short value) {
+        buf.append("(short)").append(value);
+    }
+
+    private void visitByte(final byte value) {
+        buf.append("(byte)").append(value);
+    }
+
+    private void visitBoolean(final boolean value) {
+        buf.append(value);
+    }
+
+    private void visitString(final String value) {
+        appendString(buf, value);
+    }
+
+    private void visitType(final Type value) {
+        buf.append(value.getClassName()).append(".class");
+    }
+
+    @Override
+    public void visitEnum(final String name, final String desc,
+                          final String value) {
+        buf.setLength(0);
+        appendComa(valueNumber++);
+        if (name != null) {
+            buf.append(name).append('=');
+        }
+        appendDescriptor(FIELD_DESCRIPTOR, desc);
+        buf.append('.').append(value);
+        text.add(buf.toString());
+    }
+
+    @Override
+    public Textifier visitAnnotation(final String name, final String desc) {
+        buf.setLength(0);
+        appendComa(valueNumber++);
+        if (name != null) {
+            buf.append(name).append('=');
+        }
+        buf.append('@');
+        appendDescriptor(FIELD_DESCRIPTOR, desc);
+        buf.append('(');
+        text.add(buf.toString());
+        Textifier t = createTextifier();
+        text.add(t.getText());
+        text.add(")");
+        return t;
+    }
+
+    @Override
+    public Textifier visitArray(final String name) {
+        buf.setLength(0);
+        appendComa(valueNumber++);
+        if (name != null) {
+            buf.append(name).append('=');
+        }
+        buf.append('{');
+        text.add(buf.toString());
+        Textifier t = createTextifier();
+        text.add(t.getText());
+        text.add("}");
+        return t;
+    }
+
+    @Override
+    public void visitAnnotationEnd() {
+    }
+
+    // ------------------------------------------------------------------------
+    // Fields
+    // ------------------------------------------------------------------------
+
+    @Override
+    public Textifier visitFieldAnnotation(final String desc,
+                                          final boolean visible) {
+        return visitAnnotation(desc, visible);
+    }
+
+    @Override
+    public void visitFieldAttribute(final Attribute attr) {
+        visitAttribute(attr);
+    }
+
+    @Override
+    public void visitFieldEnd() {
+    }
+
+    // ------------------------------------------------------------------------
+    // Methods
+    // ------------------------------------------------------------------------
+
+    @Override
+    public Textifier visitAnnotationDefault() {
+        text.add(tab2 + "default=");
+        Textifier t = createTextifier();
+        text.add(t.getText());
+        text.add("\n");
+        return t;
+    }
+
+    @Override
+    public Textifier visitMethodAnnotation(final String desc,
+                                           final boolean visible) {
+        return visitAnnotation(desc, visible);
+    }
+
+    @Override
+    public Textifier visitParameterAnnotation(final int parameter,
+                                              final String desc, final boolean visible) {
+        buf.setLength(0);
+        buf.append(tab2).append('@');
+        appendDescriptor(FIELD_DESCRIPTOR, desc);
+        buf.append('(');
+        text.add(buf.toString());
+        Textifier t = createTextifier();
+        text.add(t.getText());
+        text.add(visible ? ") // parameter " : ") // invisible, parameter ");
+        text.add(new Integer(parameter));
+        text.add("\n");
+        return t;
+    }
+
+    @Override
+    public void visitMethodAttribute(final Attribute attr) {
+        buf.setLength(0);
+        buf.append(tab).append("ATTRIBUTE ");
+        appendDescriptor(-1, attr.type);
+
+        if (attr instanceof Textifiable) {
+            ((Textifiable) attr).textify(buf, labelNames);
+        } else {
+            buf.append(" : unknown\n");
+        }
+
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitCode() {
+    }
+
+    @Override
+    public void visitFrame(final int type, final int nLocal,
+                           final Object[] local, final int nStack, final Object[] stack) {
+        buf.setLength(0);
+        buf.append(ltab);
+        buf.append("FRAME ");
+        switch (type) {
+            case Opcodes.F_NEW:
+            case Opcodes.F_FULL:
+                buf.append("FULL [");
+                appendFrameTypes(nLocal, local);
+                buf.append("] [");
+                appendFrameTypes(nStack, stack);
+                buf.append(']');
+                break;
+            case Opcodes.F_APPEND:
+                buf.append("APPEND [");
+                appendFrameTypes(nLocal, local);
+                buf.append(']');
+                break;
+            case Opcodes.F_CHOP:
+                buf.append("CHOP ").append(nLocal);
+                break;
+            case Opcodes.F_SAME:
+                buf.append("SAME");
+                break;
+            case Opcodes.F_SAME1:
+                buf.append("SAME1 ");
+                appendFrameTypes(1, stack);
+                break;
+        }
+        buf.append('\n');
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitInsn(final int opcode) {
+        buf.setLength(0);
+        buf.append(tab2).append(OPCODES[opcode]).append('\n');
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitIntInsn(final int opcode, final int operand) {
+        buf.setLength(0);
+        buf.append(tab2)
+                .append(OPCODES[opcode])
+                .append(' ')
+                .append(opcode == Opcodes.NEWARRAY ? TYPES[operand] : Integer
+                        .toString(operand)).append('\n');
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitVarInsn(final int opcode, final int var) {
+        buf.setLength(0);
+        buf.append(tab2).append(OPCODES[opcode]).append(' ').append(var)
+                .append('\n');
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitTypeInsn(final int opcode, final String type) {
+        buf.setLength(0);
+        buf.append(tab2).append(OPCODES[opcode]).append(' ');
+        appendDescriptor(INTERNAL_NAME, type);
+        buf.append('\n');
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitFieldInsn(final int opcode, final String owner,
+                               final String name, final String desc) {
+        buf.setLength(0);
+        buf.append(tab2).append(OPCODES[opcode]).append(' ');
+        appendDescriptor(INTERNAL_NAME, owner);
+        buf.append('.').append(name).append(" : ");
+        appendDescriptor(FIELD_DESCRIPTOR, desc);
+        buf.append('\n');
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitMethodInsn(final int opcode, final String owner,
+                                final String name, final String desc) {
+        buf.setLength(0);
+        buf.append(tab2).append(OPCODES[opcode]).append(' ');
+        appendDescriptor(INTERNAL_NAME, owner);
+        buf.append('.').append(name).append(' ');
+        appendDescriptor(METHOD_DESCRIPTOR, desc);
+        buf.append('\n');
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitInvokeDynamicInsn(String name, String desc, Handle bsm,
+                                       Object... bsmArgs) {
+        buf.setLength(0);
+        buf.append(tab2).append("INVOKEDYNAMIC").append(' ');
+        buf.append(name);
+        appendDescriptor(METHOD_DESCRIPTOR, desc);
+        buf.append(" [");
+        appendHandle(bsm);
+        buf.append(tab3).append("// arguments:");
+        if (bsmArgs.length == 0) {
+            buf.append(" none");
+        } else {
+            buf.append('\n').append(tab3);
+            for (int i = 0; i < bsmArgs.length; i++) {
+                Object cst = bsmArgs[i];
+                if (cst instanceof String) {
+                    Printer.appendString(buf, (String) cst);
+                } else if (cst instanceof Type) {
+                    buf.append(((Type) cst).getDescriptor()).append(".class");
+                } else if (cst instanceof Handle) {
+                    appendHandle((Handle) cst);
+                } else {
+                    buf.append(cst);
+                }
+                buf.append(", ");
+            }
+            buf.setLength(buf.length() - 2);
+        }
+        buf.append('\n');
+        buf.append(tab2).append("]\n");
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitJumpInsn(final int opcode, final Label label) {
+        buf.setLength(0);
+        buf.append(tab2).append(OPCODES[opcode]).append(' ');
+        appendLabel(label);
+        buf.append('\n');
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitLabel(final Label label) {
+        buf.setLength(0);
+        buf.append(ltab);
+        appendLabel(label);
+        buf.append('\n');
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitLdcInsn(final Object cst) {
+        buf.setLength(0);
+        buf.append(tab2).append("LDC ");
+        if (cst instanceof String) {
+            Printer.appendString(buf, (String) cst);
+        } else if (cst instanceof Type) {
+            buf.append(((Type) cst).getDescriptor()).append(".class");
+        } else {
+            buf.append(cst);
+        }
+        buf.append('\n');
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitIincInsn(final int var, final int increment) {
+        buf.setLength(0);
+        buf.append(tab2).append("IINC ").append(var).append(' ')
+                .append(increment).append('\n');
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitTableSwitchInsn(final int min, final int max,
+                                     final Label dflt, final Label... labels) {
+        buf.setLength(0);
+        buf.append(tab2).append("TABLESWITCH\n");
+        for (int i = 0; i < labels.length; ++i) {
+            buf.append(tab3).append(min + i).append(": ");
+            appendLabel(labels[i]);
+            buf.append('\n');
+        }
+        buf.append(tab3).append("default: ");
+        appendLabel(dflt);
+        buf.append('\n');
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitLookupSwitchInsn(final Label dflt, final int[] keys,
+                                      final Label[] labels) {
+        buf.setLength(0);
+        buf.append(tab2).append("LOOKUPSWITCH\n");
+        for (int i = 0; i < labels.length; ++i) {
+            buf.append(tab3).append(keys[i]).append(": ");
+            appendLabel(labels[i]);
+            buf.append('\n');
+        }
+        buf.append(tab3).append("default: ");
+        appendLabel(dflt);
+        buf.append('\n');
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitMultiANewArrayInsn(final String desc, final int dims) {
+        buf.setLength(0);
+        buf.append(tab2).append("MULTIANEWARRAY ");
+        appendDescriptor(FIELD_DESCRIPTOR, desc);
+        buf.append(' ').append(dims).append('\n');
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitTryCatchBlock(final Label start, final Label end,
+                                   final Label handler, final String type) {
+        buf.setLength(0);
+        buf.append(tab2).append("TRYCATCHBLOCK ");
+        appendLabel(start);
+        buf.append(' ');
+        appendLabel(end);
+        buf.append(' ');
+        appendLabel(handler);
+        buf.append(' ');
+        appendDescriptor(INTERNAL_NAME, type);
+        buf.append('\n');
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitLocalVariable(final String name, final String desc,
+                                   final String signature, final Label start, final Label end,
+                                   final int index) {
+        buf.setLength(0);
+        buf.append(tab2).append("LOCALVARIABLE ").append(name).append(' ');
+        appendDescriptor(FIELD_DESCRIPTOR, desc);
+        buf.append(' ');
+        appendLabel(start);
+        buf.append(' ');
+        appendLabel(end);
+        buf.append(' ').append(index).append('\n');
+
+        if (signature != null) {
+            buf.append(tab2);
+            appendDescriptor(FIELD_SIGNATURE, signature);
+
+            TraceSignatureVisitor sv = new TraceSignatureVisitor(0);
+            SignatureReader r = new SignatureReader(signature);
+            r.acceptType(sv);
+            buf.append(tab2).append("// declaration: ")
+                    .append(sv.getDeclaration()).append('\n');
+        }
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitLineNumber(final int line, final Label start) {
+        buf.setLength(0);
+        buf.append(tab2).append("LINENUMBER ").append(line).append(' ');
+        appendLabel(start);
+        buf.append('\n');
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitMaxs(final int maxStack, final int maxLocals) {
+        buf.setLength(0);
+        buf.append(tab2).append("MAXSTACK = ").append(maxStack).append('\n');
+        text.add(buf.toString());
+
+        buf.setLength(0);
+        buf.append(tab2).append("MAXLOCALS = ").append(maxLocals).append('\n');
+        text.add(buf.toString());
+    }
+
+    @Override
+    public void visitMethodEnd() {
+    }
+
+    // ------------------------------------------------------------------------
+    // Common methods
+    // ------------------------------------------------------------------------
+
+    /**
+     * Prints a disassembled view of the given annotation.
+     *
+     * @param desc    the class descriptor of the annotation class.
+     * @param visible <tt>true</tt> if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values.
+     */
+    public Textifier visitAnnotation(final String desc, final boolean visible) {
+        buf.setLength(0);
+        buf.append(tab).append('@');
+        appendDescriptor(FIELD_DESCRIPTOR, desc);
+        buf.append('(');
+        text.add(buf.toString());
+        Textifier t = createTextifier();
+        text.add(t.getText());
+        text.add(visible ? ")\n" : ") // invisible\n");
+        return t;
+    }
+
+    /**
+     * Prints a disassembled view of the given attribute.
+     *
+     * @param attr an attribute.
+     */
+    public void visitAttribute(final Attribute attr) {
+        buf.setLength(0);
+        buf.append(tab).append("ATTRIBUTE ");
+        appendDescriptor(-1, attr.type);
+
+        if (attr instanceof Textifiable) {
+            ((Textifiable) attr).textify(buf, null);
+        } else {
+            buf.append(" : unknown\n");
+        }
+
+        text.add(buf.toString());
+    }
+
+    // ------------------------------------------------------------------------
+    // Utility methods
+    // ------------------------------------------------------------------------
+
+    /**
+     * Creates a new TraceVisitor instance.
+     *
+     * @return a new TraceVisitor.
+     */
+    protected Textifier createTextifier() {
+        return new Textifier();
+    }
+
+    /**
+     * Appends an internal name, a type descriptor or a type signature to
+     * {@link #buf buf}.
+     *
+     * @param type indicates if desc is an internal name, a field descriptor, a
+     *             method descriptor, a class signature, ...
+     * @param desc an internal name, type descriptor, or type signature. May be
+     *             <tt>null</tt>.
+     */
+    protected void appendDescriptor(final int type, final String desc) {
+        if (type == CLASS_SIGNATURE || type == FIELD_SIGNATURE
+                || type == METHOD_SIGNATURE) {
+            if (desc != null) {
+                buf.append("// signature ").append(desc).append('\n');
+            }
+        } else {
+            buf.append(desc);
+        }
+    }
+
+    /**
+     * Appends the name of the given label to {@link #buf buf}. Creates a new
+     * label name if the given label does not yet have one.
+     *
+     * @param l a label.
+     */
+    protected void appendLabel(final Label l) {
+        if (labelNames == null) {
+            labelNames = new HashMap<Label, String>();
+        }
+        String name = labelNames.get(l);
+        if (name == null) {
+            name = "L" + labelNames.size();
+            labelNames.put(l, name);
+        }
+        buf.append(name);
+    }
+
+    /**
+     * Appends the information about the given handle to {@link #buf buf}.
+     *
+     * @param h a handle, non null.
+     */
+    protected void appendHandle(final Handle h) {
+        buf.append('\n').append(tab3);
+        int tag = h.getTag();
+        buf.append("// handle kind 0x").append(Integer.toHexString(tag))
+                .append(" : ");
+        switch (tag) {
+            case Opcodes.H_GETFIELD:
+                buf.append("GETFIELD");
+                break;
+            case Opcodes.H_GETSTATIC:
+                buf.append("GETSTATIC");
+                break;
+            case Opcodes.H_PUTFIELD:
+                buf.append("PUTFIELD");
+                break;
+            case Opcodes.H_PUTSTATIC:
+                buf.append("PUTSTATIC");
+                break;
+            case Opcodes.H_INVOKEINTERFACE:
+                buf.append("INVOKEINTERFACE");
+                break;
+            case Opcodes.H_INVOKESPECIAL:
+                buf.append("INVOKESPECIAL");
+                break;
+            case Opcodes.H_INVOKESTATIC:
+                buf.append("INVOKESTATIC");
+                break;
+            case Opcodes.H_INVOKEVIRTUAL:
+                buf.append("INVOKEVIRTUAL");
+                break;
+            case Opcodes.H_NEWINVOKESPECIAL:
+                buf.append("NEWINVOKESPECIAL");
+                break;
+        }
+        buf.append('\n');
+        buf.append(tab3);
+        appendDescriptor(INTERNAL_NAME, h.getOwner());
+        buf.append('.');
+        buf.append(h.getName());
+        buf.append('(');
+        appendDescriptor(HANDLE_DESCRIPTOR, h.getDesc());
+        buf.append(')').append('\n');
+    }
+
+    /**
+     * Appends a string representation of the given access modifiers to
+     * {@link #buf buf}.
+     *
+     * @param access some access modifiers.
+     */
+    private void appendAccess(final int access) {
+        if ((access & Opcodes.ACC_PUBLIC) != 0) {
+            buf.append("public ");
+        }
+        if ((access & Opcodes.ACC_PRIVATE) != 0) {
+            buf.append("private ");
+        }
+        if ((access & Opcodes.ACC_PROTECTED) != 0) {
+            buf.append("protected ");
+        }
+        if ((access & Opcodes.ACC_FINAL) != 0) {
+            buf.append("final ");
+        }
+        if ((access & Opcodes.ACC_STATIC) != 0) {
+            buf.append("static ");
+        }
+        if ((access & Opcodes.ACC_SYNCHRONIZED) != 0) {
+            buf.append("synchronized ");
+        }
+        if ((access & Opcodes.ACC_VOLATILE) != 0) {
+            buf.append("volatile ");
+        }
+        if ((access & Opcodes.ACC_TRANSIENT) != 0) {
+            buf.append("transient ");
+        }
+        if ((access & Opcodes.ACC_ABSTRACT) != 0) {
+            buf.append("abstract ");
+        }
+        if ((access & Opcodes.ACC_STRICT) != 0) {
+            buf.append("strictfp ");
+        }
+        if ((access & Opcodes.ACC_SYNTHETIC) != 0) {
+            buf.append("synthetic ");
+        }
+        if ((access & Opcodes.ACC_ENUM) != 0) {
+            buf.append("enum ");
+        }
+    }
+
+    private void appendComa(final int i) {
+        if (i != 0) {
+            buf.append(", ");
+        }
+    }
+
+    private void appendFrameTypes(final int n, final Object[] o) {
+        for (int i = 0; i < n; ++i) {
+            if (i > 0) {
+                buf.append(' ');
+            }
+            if (o[i] instanceof String) {
+                String desc = (String) o[i];
+                if (desc.startsWith("[")) {
+                    appendDescriptor(FIELD_DESCRIPTOR, desc);
+                } else {
+                    appendDescriptor(INTERNAL_NAME, desc);
+                }
+            } else if (o[i] instanceof Integer) {
+                switch (((Integer) o[i]).intValue()) {
+                    case 0:
+                        appendDescriptor(FIELD_DESCRIPTOR, "T");
+                        break;
+                    case 1:
+                        appendDescriptor(FIELD_DESCRIPTOR, "I");
+                        break;
+                    case 2:
+                        appendDescriptor(FIELD_DESCRIPTOR, "F");
+                        break;
+                    case 3:
+                        appendDescriptor(FIELD_DESCRIPTOR, "D");
+                        break;
+                    case 4:
+                        appendDescriptor(FIELD_DESCRIPTOR, "J");
+                        break;
+                    case 5:
+                        appendDescriptor(FIELD_DESCRIPTOR, "N");
+                        break;
+                    case 6:
+                        appendDescriptor(FIELD_DESCRIPTOR, "U");
+                        break;
+                }
+            } else {
+                appendLabel((Label) o[i]);
+            }
+        }
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/util/TraceAnnotationVisitor.java b/src/main/asm/org/objectweb/asm/util/TraceAnnotationVisitor.java
new file mode 100644
index 0000000..9c2259d
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/util/TraceAnnotationVisitor.java
@@ -0,0 +1,89 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.util;
+
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Opcodes;
+
+/**
+ * An {@link AnnotationVisitor} that prints the annotations it visits with a
+ * {@link Printer}.
+ * 
+ * @author Eric Bruneton
+ */
+public final class TraceAnnotationVisitor extends AnnotationVisitor {
+
+    private final Printer p;
+
+    public TraceAnnotationVisitor(final Printer p) {
+        this(null, p);
+    }
+
+    public TraceAnnotationVisitor(final AnnotationVisitor av, final Printer p) {
+        super(Opcodes.ASM4, av);
+        this.p = p;
+    }
+
+    @Override
+    public void visit(final String name, final Object value) {
+        p.visit(name, value);
+        super.visit(name, value);
+    }
+
+    @Override
+    public void visitEnum(final String name, final String desc,
+            final String value) {
+        p.visitEnum(name, desc, value);
+        super.visitEnum(name, desc, value);
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotation(final String name,
+            final String desc) {
+        Printer p = this.p.visitAnnotation(name, desc);
+        AnnotationVisitor av = this.av == null ? null : this.av
+                .visitAnnotation(name, desc);
+        return new TraceAnnotationVisitor(av, p);
+    }
+
+    @Override
+    public AnnotationVisitor visitArray(final String name) {
+        Printer p = this.p.visitArray(name);
+        AnnotationVisitor av = this.av == null ? null : this.av
+                .visitArray(name);
+        return new TraceAnnotationVisitor(av, p);
+    }
+
+    @Override
+    public void visitEnd() {
+        p.visitAnnotationEnd();
+        super.visitEnd();
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/util/TraceClassVisitor.java b/src/main/asm/org/objectweb/asm/util/TraceClassVisitor.java
new file mode 100644
index 0000000..ccfeeb6
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/util/TraceClassVisitor.java
@@ -0,0 +1,209 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.util;
+
+import java.io.PrintWriter;
+
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Attribute;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+/**
+ * A {@link ClassVisitor} that prints the classes it visits with a
+ * {@link Printer}. This class visitor can be used in the middle of a class
+ * visitor chain to trace the class that is visited at a given point in this
+ * chain. This may be useful for debugging purposes.
+ * <p>
+ * The trace printed when visiting the <tt>Hello</tt> class is the following:
+ * <p>
+ * <blockquote>
+ * 
+ * <pre>
+ * // class version 49.0 (49) // access flags 0x21 public class Hello {
+ * 
+ * // compiled from: Hello.java
+ * 
+ * // access flags 0x1 public &lt;init&gt; ()V ALOAD 0 INVOKESPECIAL
+ * java/lang/Object &lt;init&gt; ()V RETURN MAXSTACK = 1 MAXLOCALS = 1
+ * 
+ * // access flags 0x9 public static main ([Ljava/lang/String;)V GETSTATIC
+ * java/lang/System out Ljava/io/PrintStream; LDC &quot;hello&quot;
+ * INVOKEVIRTUAL java/io/PrintStream println (Ljava/lang/String;)V RETURN
+ * MAXSTACK = 2 MAXLOCALS = 1 }
+ * </pre>
+ * 
+ * </blockquote> where <tt>Hello</tt> is defined by:
+ * <p>
+ * <blockquote>
+ * 
+ * <pre>
+ * public class Hello {
+ * 
+ *     public static void main(String[] args) {
+ *         System.out.println(&quot;hello&quot;);
+ *     }
+ * }
+ * </pre>
+ * 
+ * </blockquote>
+ * 
+ * @author Eric Bruneton
+ * @author Eugene Kuleshov
+ */
+public final class TraceClassVisitor extends ClassVisitor {
+
+    /**
+     * The print writer to be used to print the class. May be null.
+     */
+    private final PrintWriter pw;
+
+    /**
+     * The object that actually converts visit events into text.
+     */
+    public final Printer p;
+
+    /**
+     * Constructs a new {@link TraceClassVisitor}.
+     * 
+     * @param pw
+     *            the print writer to be used to print the class.
+     */
+    public TraceClassVisitor(final PrintWriter pw) {
+        this(null, pw);
+    }
+
+    /**
+     * Constructs a new {@link TraceClassVisitor}.
+     * 
+     * @param cv
+     *            the {@link ClassVisitor} to which this visitor delegates
+     *            calls. May be <tt>null</tt>.
+     * @param pw
+     *            the print writer to be used to print the class.
+     */
+    public TraceClassVisitor(final ClassVisitor cv, final PrintWriter pw) {
+        this(cv, new Textifier(), pw);
+    }
+
+    /**
+     * Constructs a new {@link TraceClassVisitor}.
+     * 
+     * @param cv
+     *            the {@link ClassVisitor} to which this visitor delegates
+     *            calls. May be <tt>null</tt>.
+     * @param p
+     *            the object that actually converts visit events into text.
+     * @param pw
+     *            the print writer to be used to print the class. May be null if
+     *            you simply want to use the result via
+     *            {@link Printer#getText()}, instead of printing it.
+     */
+    public TraceClassVisitor(final ClassVisitor cv, final Printer p,
+            final PrintWriter pw) {
+        super(Opcodes.ASM4, cv);
+        this.pw = pw;
+        this.p = p;
+    }
+
+    @Override
+    public void visit(final int version, final int access, final String name,
+            final String signature, final String superName,
+            final String[] interfaces) {
+        p.visit(version, access, name, signature, superName, interfaces);
+        super.visit(version, access, name, signature, superName, interfaces);
+    }
+
+    @Override
+    public void visitSource(final String file, final String debug) {
+        p.visitSource(file, debug);
+        super.visitSource(file, debug);
+    }
+
+    @Override
+    public void visitOuterClass(final String owner, final String name,
+            final String desc) {
+        p.visitOuterClass(owner, name, desc);
+        super.visitOuterClass(owner, name, desc);
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotation(final String desc,
+            final boolean visible) {
+        Printer p = this.p.visitClassAnnotation(desc, visible);
+        AnnotationVisitor av = cv == null ? null : cv.visitAnnotation(desc,
+                visible);
+        return new TraceAnnotationVisitor(av, p);
+    }
+
+    @Override
+    public void visitAttribute(final Attribute attr) {
+        p.visitClassAttribute(attr);
+        super.visitAttribute(attr);
+    }
+
+    @Override
+    public void visitInnerClass(final String name, final String outerName,
+            final String innerName, final int access) {
+        p.visitInnerClass(name, outerName, innerName, access);
+        super.visitInnerClass(name, outerName, innerName, access);
+    }
+
+    @Override
+    public FieldVisitor visitField(final int access, final String name,
+            final String desc, final String signature, final Object value) {
+        Printer p = this.p.visitField(access, name, desc, signature, value);
+        FieldVisitor fv = cv == null ? null : cv.visitField(access, name, desc,
+                signature, value);
+        return new TraceFieldVisitor(fv, p);
+    }
+
+    @Override
+    public MethodVisitor visitMethod(final int access, final String name,
+            final String desc, final String signature, final String[] exceptions) {
+        Printer p = this.p.visitMethod(access, name, desc, signature,
+                exceptions);
+        MethodVisitor mv = cv == null ? null : cv.visitMethod(access, name,
+                desc, signature, exceptions);
+        return new TraceMethodVisitor(mv, p);
+    }
+
+    @Override
+    public void visitEnd() {
+        p.visitClassEnd();
+        if (pw != null) {
+            p.print(pw);
+            pw.flush();
+        }
+        super.visitEnd();
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/util/TraceFieldVisitor.java b/src/main/asm/org/objectweb/asm/util/TraceFieldVisitor.java
new file mode 100644
index 0000000..2158a72
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/util/TraceFieldVisitor.java
@@ -0,0 +1,76 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.util;
+
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Attribute;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.Opcodes;
+
+/**
+ * A {@link FieldVisitor} that prints the fields it visits with a
+ * {@link Printer}.
+ * 
+ * @author Eric Bruneton
+ */
+public final class TraceFieldVisitor extends FieldVisitor {
+
+    public final Printer p;
+
+    public TraceFieldVisitor(final Printer p) {
+        this(null, p);
+    }
+
+    public TraceFieldVisitor(final FieldVisitor fv, final Printer p) {
+        super(Opcodes.ASM4, fv);
+        this.p = p;
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotation(final String desc,
+            final boolean visible) {
+        Printer p = this.p.visitFieldAnnotation(desc, visible);
+        AnnotationVisitor av = fv == null ? null : fv.visitAnnotation(desc,
+                visible);
+        return new TraceAnnotationVisitor(av, p);
+    }
+
+    @Override
+    public void visitAttribute(final Attribute attr) {
+        p.visitFieldAttribute(attr);
+        super.visitAttribute(attr);
+    }
+
+    @Override
+    public void visitEnd() {
+        p.visitFieldEnd();
+        super.visitEnd();
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/util/TraceMethodVisitor.java b/src/main/asm/org/objectweb/asm/util/TraceMethodVisitor.java
new file mode 100644
index 0000000..5462bd6
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/util/TraceMethodVisitor.java
@@ -0,0 +1,217 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.util;
+
+import org.objectweb.asm.*;
+
+/**
+ * A {@link MethodVisitor} that prints the methods it visits with a
+ * {@link Printer}.
+ *
+ * @author Eric Bruneton
+ */
+public final class TraceMethodVisitor extends MethodVisitor {
+    public final Printer p;
+
+    public TraceMethodVisitor(final Printer p) {
+        this(null, p);
+    }
+
+    public TraceMethodVisitor(final MethodVisitor mv, final Printer p) {
+        super(Opcodes.ASM4, mv);
+        this.p = p;
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotation(final String desc,
+                                             final boolean visible) {
+        Printer p = this.p.visitMethodAnnotation(desc, visible);
+        AnnotationVisitor av = mv == null ? null : mv.visitAnnotation(desc,
+                visible);
+        return new TraceAnnotationVisitor(av, p);
+    }
+
+    @Override
+    public void visitAttribute(final Attribute attr) {
+        p.visitMethodAttribute(attr);
+        super.visitAttribute(attr);
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotationDefault() {
+        Printer p = this.p.visitAnnotationDefault();
+        AnnotationVisitor av = mv == null ? null : mv.visitAnnotationDefault();
+        return new TraceAnnotationVisitor(av, p);
+    }
+
+    @Override
+    public AnnotationVisitor visitParameterAnnotation(final int parameter,
+                                                      final String desc, final boolean visible) {
+        Printer p = this.p.visitParameterAnnotation(parameter, desc, visible);
+        AnnotationVisitor av = mv == null ? null : mv.visitParameterAnnotation(
+                parameter, desc, visible);
+        return new TraceAnnotationVisitor(av, p);
+    }
+
+    @Override
+    public void visitCode() {
+        p.visitCode();
+        super.visitCode();
+    }
+
+    @Override
+    public void visitFrame(final int type, final int nLocal,
+                           final Object[] local, final int nStack, final Object[] stack) {
+        p.visitFrame(type, nLocal, local, nStack, stack);
+        super.visitFrame(type, nLocal, local, nStack, stack);
+    }
+
+    @Override
+    public void visitInsn(final int opcode) {
+        p.visitInsn(opcode);
+        super.visitInsn(opcode);
+    }
+
+    @Override
+    public void visitIntInsn(final int opcode, final int operand) {
+        p.visitIntInsn(opcode, operand);
+        super.visitIntInsn(opcode, operand);
+    }
+
+    @Override
+    public void visitVarInsn(final int opcode, final int var) {
+        p.visitVarInsn(opcode, var);
+        super.visitVarInsn(opcode, var);
+    }
+
+    @Override
+    public void visitTypeInsn(final int opcode, final String type) {
+        p.visitTypeInsn(opcode, type);
+        super.visitTypeInsn(opcode, type);
+    }
+
+    @Override
+    public void visitFieldInsn(final int opcode, final String owner,
+                               final String name, final String desc) {
+        p.visitFieldInsn(opcode, owner, name, desc);
+        super.visitFieldInsn(opcode, owner, name, desc);
+    }
+
+    @Override
+    public void visitMethodInsn(final int opcode, final String owner,
+                                final String name, final String desc) {
+        p.visitMethodInsn(opcode, owner, name, desc);
+        super.visitMethodInsn(opcode, owner, name, desc);
+    }
+
+    @Override
+    public void visitInvokeDynamicInsn(String name, String desc, Handle bsm,
+                                       Object... bsmArgs) {
+        p.visitInvokeDynamicInsn(name, desc, bsm, bsmArgs);
+        super.visitInvokeDynamicInsn(name, desc, bsm, bsmArgs);
+    }
+
+    @Override
+    public void visitJumpInsn(final int opcode, final Label label) {
+        p.visitJumpInsn(opcode, label);
+        super.visitJumpInsn(opcode, label);
+    }
+
+    @Override
+    public void visitLabel(final Label label) {
+        p.visitLabel(label);
+        super.visitLabel(label);
+    }
+
+    @Override
+    public void visitLdcInsn(final Object cst) {
+        p.visitLdcInsn(cst);
+        super.visitLdcInsn(cst);
+    }
+
+    @Override
+    public void visitIincInsn(final int var, final int increment) {
+        p.visitIincInsn(var, increment);
+        super.visitIincInsn(var, increment);
+    }
+
+    @Override
+    public void visitTableSwitchInsn(final int min, final int max,
+                                     final Label dflt, final Label... labels) {
+        p.visitTableSwitchInsn(min, max, dflt, labels);
+        super.visitTableSwitchInsn(min, max, dflt, labels);
+    }
+
+    @Override
+    public void visitLookupSwitchInsn(final Label dflt, final int[] keys,
+                                      final Label[] labels) {
+        p.visitLookupSwitchInsn(dflt, keys, labels);
+        super.visitLookupSwitchInsn(dflt, keys, labels);
+    }
+
+    @Override
+    public void visitMultiANewArrayInsn(final String desc, final int dims) {
+        p.visitMultiANewArrayInsn(desc, dims);
+        super.visitMultiANewArrayInsn(desc, dims);
+    }
+
+    @Override
+    public void visitTryCatchBlock(final Label start, final Label end,
+                                   final Label handler, final String type) {
+        p.visitTryCatchBlock(start, end, handler, type);
+        super.visitTryCatchBlock(start, end, handler, type);
+    }
+
+    @Override
+    public void visitLocalVariable(final String name, final String desc,
+                                   final String signature, final Label start, final Label end,
+                                   final int index) {
+        p.visitLocalVariable(name, desc, signature, start, end, index);
+        super.visitLocalVariable(name, desc, signature, start, end, index);
+    }
+
+    @Override
+    public void visitLineNumber(final int line, final Label start) {
+        p.visitLineNumber(line, start);
+        super.visitLineNumber(line, start);
+    }
+
+    @Override
+    public void visitMaxs(final int maxStack, final int maxLocals) {
+        p.visitMaxs(maxStack, maxLocals);
+        super.visitMaxs(maxStack, maxLocals);
+    }
+
+    @Override
+    public void visitEnd() {
+        p.visitMethodEnd();
+        super.visitEnd();
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/util/TraceSignatureVisitor.java b/src/main/asm/org/objectweb/asm/util/TraceSignatureVisitor.java
new file mode 100644
index 0000000..3fdda92
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/util/TraceSignatureVisitor.java
@@ -0,0 +1,316 @@
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.util;
+
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.signature.SignatureVisitor;
+
+/**
+ * A {@link SignatureVisitor} that prints a disassembled view of the signature
+ * it visits.
+ *
+ * @author Eugene Kuleshov
+ * @author Eric Bruneton
+ */
+public final class TraceSignatureVisitor extends SignatureVisitor {
+    private final StringBuffer declaration;
+
+    private boolean isInterface;
+
+    private boolean seenFormalParameter;
+
+    private boolean seenInterfaceBound;
+
+    private boolean seenParameter;
+
+    private boolean seenInterface;
+
+    private StringBuffer returnType;
+
+    private StringBuffer exceptions;
+
+    /**
+     * Stack used to keep track of class types that have arguments. Each element
+     * of this stack is a boolean encoded in one bit. The top of the stack is
+     * the lowest order bit. Pushing false = *2, pushing true = *2+1, popping =
+     * /2.
+     */
+    private int argumentStack;
+
+    /**
+     * Stack used to keep track of array class types. Each element of this stack
+     * is a boolean encoded in one bit. The top of the stack is the lowest order
+     * bit. Pushing false = *2, pushing true = *2+1, popping = /2.
+     */
+    private int arrayStack;
+
+    private String separator = "";
+
+    public TraceSignatureVisitor(final int access) {
+        super(Opcodes.ASM4);
+        isInterface = (access & Opcodes.ACC_INTERFACE) != 0;
+        this.declaration = new StringBuffer();
+    }
+
+    private TraceSignatureVisitor(final StringBuffer buf) {
+        super(Opcodes.ASM4);
+        this.declaration = buf;
+    }
+
+    @Override
+    public void visitFormalTypeParameter(final String name) {
+        declaration.append(seenFormalParameter ? ", " : "<").append(name);
+        seenFormalParameter = true;
+        seenInterfaceBound = false;
+    }
+
+    @Override
+    public SignatureVisitor visitClassBound() {
+        separator = " extends ";
+        startType();
+        return this;
+    }
+
+    @Override
+    public SignatureVisitor visitInterfaceBound() {
+        separator = seenInterfaceBound ? ", " : " extends ";
+        seenInterfaceBound = true;
+        startType();
+        return this;
+    }
+
+    @Override
+    public SignatureVisitor visitSuperclass() {
+        endFormals();
+        separator = " extends ";
+        startType();
+        return this;
+    }
+
+    @Override
+    public SignatureVisitor visitInterface() {
+        separator = seenInterface ? ", " : isInterface ? " extends "
+                : " implements ";
+        seenInterface = true;
+        startType();
+        return this;
+    }
+
+    @Override
+    public SignatureVisitor visitParameterType() {
+        endFormals();
+        if (seenParameter) {
+            declaration.append(", ");
+        } else {
+            seenParameter = true;
+            declaration.append('(');
+        }
+        startType();
+        return this;
+    }
+
+    @Override
+    public SignatureVisitor visitReturnType() {
+        endFormals();
+        if (seenParameter) {
+            seenParameter = false;
+        } else {
+            declaration.append('(');
+        }
+        declaration.append(')');
+        returnType = new StringBuffer();
+        return new TraceSignatureVisitor(returnType);
+    }
+
+    @Override
+    public SignatureVisitor visitExceptionType() {
+        if (exceptions == null) {
+            exceptions = new StringBuffer();
+        } else {
+            exceptions.append(", ");
+        }
+        // startType();
+        return new TraceSignatureVisitor(exceptions);
+    }
+
+    @Override
+    public void visitBaseType(final char descriptor) {
+        switch (descriptor) {
+            case 'V':
+                declaration.append("void");
+                break;
+            case 'B':
+                declaration.append("byte");
+                break;
+            case 'J':
+                declaration.append("long");
+                break;
+            case 'Z':
+                declaration.append("boolean");
+                break;
+            case 'I':
+                declaration.append("int");
+                break;
+            case 'S':
+                declaration.append("short");
+                break;
+            case 'C':
+                declaration.append("char");
+                break;
+            case 'F':
+                declaration.append("float");
+                break;
+            // case 'D':
+            default:
+                declaration.append("double");
+                break;
+        }
+        endType();
+    }
+
+    @Override
+    public void visitTypeVariable(final String name) {
+        declaration.append(name);
+        endType();
+    }
+
+    @Override
+    public SignatureVisitor visitArrayType() {
+        startType();
+        arrayStack |= 1;
+        return this;
+    }
+
+    @Override
+    public void visitClassType(final String name) {
+        if ("java/lang/Object".equals(name)) {
+            // Map<java.lang.Object,java.util.List>
+            // or
+            // abstract public V get(Object key); (seen in Dictionary.class)
+            // should have Object
+            // but java.lang.String extends java.lang.Object is unnecessary
+            boolean needObjectClass = argumentStack % 2 != 0 || seenParameter;
+            if (needObjectClass) {
+                declaration.append(separator).append(name.replace('/', '.'));
+            }
+        } else {
+            declaration.append(separator).append(name.replace('/', '.'));
+        }
+        separator = "";
+        argumentStack *= 2;
+    }
+
+    @Override
+    public void visitInnerClassType(final String name) {
+        if (argumentStack % 2 != 0) {
+            declaration.append('>');
+        }
+        argumentStack /= 2;
+        declaration.append('.');
+        declaration.append(separator).append(name.replace('/', '.'));
+        separator = "";
+        argumentStack *= 2;
+    }
+
+    @Override
+    public void visitTypeArgument() {
+        if (argumentStack % 2 == 0) {
+            ++argumentStack;
+            declaration.append('<');
+        } else {
+            declaration.append(", ");
+        }
+        declaration.append('?');
+    }
+
+    @Override
+    public SignatureVisitor visitTypeArgument(final char tag) {
+        if (argumentStack % 2 == 0) {
+            ++argumentStack;
+            declaration.append('<');
+        } else {
+            declaration.append(", ");
+        }
+
+        if (tag == EXTENDS) {
+            declaration.append("? extends ");
+        } else if (tag == SUPER) {
+            declaration.append("? super ");
+        }
+
+        startType();
+        return this;
+    }
+
+    @Override
+    public void visitEnd() {
+        if (argumentStack % 2 != 0) {
+            declaration.append('>');
+        }
+        argumentStack /= 2;
+        endType();
+    }
+
+    public String getDeclaration() {
+        return declaration.toString();
+    }
+
+    public String getReturnType() {
+        return returnType == null ? null : returnType.toString();
+    }
+
+    public String getExceptions() {
+        return exceptions == null ? null : exceptions.toString();
+    }
+
+    // -----------------------------------------------
+
+    private void endFormals() {
+        if (seenFormalParameter) {
+            declaration.append('>');
+            seenFormalParameter = false;
+        }
+    }
+
+    private void startType() {
+        arrayStack *= 2;
+    }
+
+    private void endType() {
+        if (arrayStack % 2 == 0) {
+            arrayStack /= 2;
+        } else {
+            while (arrayStack % 2 != 0) {
+                arrayStack /= 2;
+                declaration.append("[]");
+            }
+        }
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/util/package.html b/src/main/asm/org/objectweb/asm/util/package.html
new file mode 100644
index 0000000..91d7420
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/util/package.html
@@ -0,0 +1,40 @@
+<html>
+<!--
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<body>
+Provides ASM visitors that can be useful for programming and
+debugging purposes. These class visitors are normally not used by applications
+at runtime. This is why they are bundled in an optional <tt>asm-util.jar</tt>
+library that is separated from (but requires) the <tt>asm.jar</tt> library,
+which contains the core ASM framework.
+
+@since ASM 1.3.2
+</body>
+</html>
diff --git a/src/main/asm/org/objectweb/asm/xml/ASMContentHandler.java b/src/main/asm/org/objectweb/asm/xml/ASMContentHandler.java
new file mode 100644
index 0000000..16bec2c
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/xml/ASMContentHandler.java
@@ -0,0 +1,1293 @@
+/***
+ * ASM XML Adapter
+ * Copyright (c) 2004-2011, Eugene Kuleshov
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.xml;
+
+import org.objectweb.asm.*;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * A {@link org.xml.sax.ContentHandler ContentHandler} that transforms XML
+ * document into Java class file. This class can be feeded by any kind of SAX
+ * 2.0 event producers, e.g. XML parser, XSLT or XPath engines, or custom code.
+ *
+ * @author Eugene Kuleshov
+ * @see org.objectweb.asm.xml.SAXClassAdapter
+ * @see org.objectweb.asm.xml.Processor
+ */
+public class ASMContentHandler extends DefaultHandler implements Opcodes {
+    /**
+     * Map of the opcode names to opcode and opcode group
+     */
+    static final HashMap<String, Opcode> OPCODES = new HashMap<>();
+    static final HashMap<String, Integer> TYPES = new HashMap<>();
+    private static final String BASE = "class";
+
+    static {
+        addOpcode("NOP", NOP, OpcodeGroup.INSN);
+        addOpcode("ACONST_NULL", ACONST_NULL, OpcodeGroup.INSN);
+        addOpcode("ICONST_M1", ICONST_M1, OpcodeGroup.INSN);
+        addOpcode("ICONST_0", ICONST_0, OpcodeGroup.INSN);
+        addOpcode("ICONST_1", ICONST_1, OpcodeGroup.INSN);
+        addOpcode("ICONST_2", ICONST_2, OpcodeGroup.INSN);
+        addOpcode("ICONST_3", ICONST_3, OpcodeGroup.INSN);
+        addOpcode("ICONST_4", ICONST_4, OpcodeGroup.INSN);
+        addOpcode("ICONST_5", ICONST_5, OpcodeGroup.INSN);
+        addOpcode("LCONST_0", LCONST_0, OpcodeGroup.INSN);
+        addOpcode("LCONST_1", LCONST_1, OpcodeGroup.INSN);
+        addOpcode("FCONST_0", FCONST_0, OpcodeGroup.INSN);
+        addOpcode("FCONST_1", FCONST_1, OpcodeGroup.INSN);
+        addOpcode("FCONST_2", FCONST_2, OpcodeGroup.INSN);
+        addOpcode("DCONST_0", DCONST_0, OpcodeGroup.INSN);
+        addOpcode("DCONST_1", DCONST_1, OpcodeGroup.INSN);
+        addOpcode("BIPUSH", BIPUSH, OpcodeGroup.INSN_INT);
+        addOpcode("SIPUSH", SIPUSH, OpcodeGroup.INSN_INT);
+        addOpcode("LDC", LDC, OpcodeGroup.INSN_LDC);
+        addOpcode("ILOAD", ILOAD, OpcodeGroup.INSN_VAR);
+        addOpcode("LLOAD", LLOAD, OpcodeGroup.INSN_VAR);
+        addOpcode("FLOAD", FLOAD, OpcodeGroup.INSN_VAR);
+        addOpcode("DLOAD", DLOAD, OpcodeGroup.INSN_VAR);
+        addOpcode("ALOAD", ALOAD, OpcodeGroup.INSN_VAR);
+        addOpcode("IALOAD", IALOAD, OpcodeGroup.INSN);
+        addOpcode("LALOAD", LALOAD, OpcodeGroup.INSN);
+        addOpcode("FALOAD", FALOAD, OpcodeGroup.INSN);
+        addOpcode("DALOAD", DALOAD, OpcodeGroup.INSN);
+        addOpcode("AALOAD", AALOAD, OpcodeGroup.INSN);
+        addOpcode("BALOAD", BALOAD, OpcodeGroup.INSN);
+        addOpcode("CALOAD", CALOAD, OpcodeGroup.INSN);
+        addOpcode("SALOAD", SALOAD, OpcodeGroup.INSN);
+        addOpcode("ISTORE", ISTORE, OpcodeGroup.INSN_VAR);
+        addOpcode("LSTORE", LSTORE, OpcodeGroup.INSN_VAR);
+        addOpcode("FSTORE", FSTORE, OpcodeGroup.INSN_VAR);
+        addOpcode("DSTORE", DSTORE, OpcodeGroup.INSN_VAR);
+        addOpcode("ASTORE", ASTORE, OpcodeGroup.INSN_VAR);
+        addOpcode("IASTORE", IASTORE, OpcodeGroup.INSN);
+        addOpcode("LASTORE", LASTORE, OpcodeGroup.INSN);
+        addOpcode("FASTORE", FASTORE, OpcodeGroup.INSN);
+        addOpcode("DASTORE", DASTORE, OpcodeGroup.INSN);
+        addOpcode("AASTORE", AASTORE, OpcodeGroup.INSN);
+        addOpcode("BASTORE", BASTORE, OpcodeGroup.INSN);
+        addOpcode("CASTORE", CASTORE, OpcodeGroup.INSN);
+        addOpcode("SASTORE", SASTORE, OpcodeGroup.INSN);
+        addOpcode("POP", POP, OpcodeGroup.INSN);
+        addOpcode("POP2", POP2, OpcodeGroup.INSN);
+        addOpcode("DUP", DUP, OpcodeGroup.INSN);
+        addOpcode("DUP_X1", DUP_X1, OpcodeGroup.INSN);
+        addOpcode("DUP_X2", DUP_X2, OpcodeGroup.INSN);
+        addOpcode("DUP2", DUP2, OpcodeGroup.INSN);
+        addOpcode("DUP2_X1", DUP2_X1, OpcodeGroup.INSN);
+        addOpcode("DUP2_X2", DUP2_X2, OpcodeGroup.INSN);
+        addOpcode("SWAP", SWAP, OpcodeGroup.INSN);
+        addOpcode("IADD", IADD, OpcodeGroup.INSN);
+        addOpcode("LADD", LADD, OpcodeGroup.INSN);
+        addOpcode("FADD", FADD, OpcodeGroup.INSN);
+        addOpcode("DADD", DADD, OpcodeGroup.INSN);
+        addOpcode("ISUB", ISUB, OpcodeGroup.INSN);
+        addOpcode("LSUB", LSUB, OpcodeGroup.INSN);
+        addOpcode("FSUB", FSUB, OpcodeGroup.INSN);
+        addOpcode("DSUB", DSUB, OpcodeGroup.INSN);
+        addOpcode("IMUL", IMUL, OpcodeGroup.INSN);
+        addOpcode("LMUL", LMUL, OpcodeGroup.INSN);
+        addOpcode("FMUL", FMUL, OpcodeGroup.INSN);
+        addOpcode("DMUL", DMUL, OpcodeGroup.INSN);
+        addOpcode("IDIV", IDIV, OpcodeGroup.INSN);
+        addOpcode("LDIV", LDIV, OpcodeGroup.INSN);
+        addOpcode("FDIV", FDIV, OpcodeGroup.INSN);
+        addOpcode("DDIV", DDIV, OpcodeGroup.INSN);
+        addOpcode("IREM", IREM, OpcodeGroup.INSN);
+        addOpcode("LREM", LREM, OpcodeGroup.INSN);
+        addOpcode("FREM", FREM, OpcodeGroup.INSN);
+        addOpcode("DREM", DREM, OpcodeGroup.INSN);
+        addOpcode("INEG", INEG, OpcodeGroup.INSN);
+        addOpcode("LNEG", LNEG, OpcodeGroup.INSN);
+        addOpcode("FNEG", FNEG, OpcodeGroup.INSN);
+        addOpcode("DNEG", DNEG, OpcodeGroup.INSN);
+        addOpcode("ISHL", ISHL, OpcodeGroup.INSN);
+        addOpcode("LSHL", LSHL, OpcodeGroup.INSN);
+        addOpcode("ISHR", ISHR, OpcodeGroup.INSN);
+        addOpcode("LSHR", LSHR, OpcodeGroup.INSN);
+        addOpcode("IUSHR", IUSHR, OpcodeGroup.INSN);
+        addOpcode("LUSHR", LUSHR, OpcodeGroup.INSN);
+        addOpcode("IAND", IAND, OpcodeGroup.INSN);
+        addOpcode("LAND", LAND, OpcodeGroup.INSN);
+        addOpcode("IOR", IOR, OpcodeGroup.INSN);
+        addOpcode("LOR", LOR, OpcodeGroup.INSN);
+        addOpcode("IXOR", IXOR, OpcodeGroup.INSN);
+        addOpcode("LXOR", LXOR, OpcodeGroup.INSN);
+        addOpcode("IINC", IINC, OpcodeGroup.INSN_IINC);
+        addOpcode("I2L", I2L, OpcodeGroup.INSN);
+        addOpcode("I2F", I2F, OpcodeGroup.INSN);
+        addOpcode("I2D", I2D, OpcodeGroup.INSN);
+        addOpcode("L2I", L2I, OpcodeGroup.INSN);
+        addOpcode("L2F", L2F, OpcodeGroup.INSN);
+        addOpcode("L2D", L2D, OpcodeGroup.INSN);
+        addOpcode("F2I", F2I, OpcodeGroup.INSN);
+        addOpcode("F2L", F2L, OpcodeGroup.INSN);
+        addOpcode("F2D", F2D, OpcodeGroup.INSN);
+        addOpcode("D2I", D2I, OpcodeGroup.INSN);
+        addOpcode("D2L", D2L, OpcodeGroup.INSN);
+        addOpcode("D2F", D2F, OpcodeGroup.INSN);
+        addOpcode("I2B", I2B, OpcodeGroup.INSN);
+        addOpcode("I2C", I2C, OpcodeGroup.INSN);
+        addOpcode("I2S", I2S, OpcodeGroup.INSN);
+        addOpcode("LCMP", LCMP, OpcodeGroup.INSN);
+        addOpcode("FCMPL", FCMPL, OpcodeGroup.INSN);
+        addOpcode("FCMPG", FCMPG, OpcodeGroup.INSN);
+        addOpcode("DCMPL", DCMPL, OpcodeGroup.INSN);
+        addOpcode("DCMPG", DCMPG, OpcodeGroup.INSN);
+        addOpcode("IFEQ", IFEQ, OpcodeGroup.INSN_JUMP);
+        addOpcode("IFNE", IFNE, OpcodeGroup.INSN_JUMP);
+        addOpcode("IFLT", IFLT, OpcodeGroup.INSN_JUMP);
+        addOpcode("IFGE", IFGE, OpcodeGroup.INSN_JUMP);
+        addOpcode("IFGT", IFGT, OpcodeGroup.INSN_JUMP);
+        addOpcode("IFLE", IFLE, OpcodeGroup.INSN_JUMP);
+        addOpcode("IF_ICMPEQ", IF_ICMPEQ, OpcodeGroup.INSN_JUMP);
+        addOpcode("IF_ICMPNE", IF_ICMPNE, OpcodeGroup.INSN_JUMP);
+        addOpcode("IF_ICMPLT", IF_ICMPLT, OpcodeGroup.INSN_JUMP);
+        addOpcode("IF_ICMPGE", IF_ICMPGE, OpcodeGroup.INSN_JUMP);
+        addOpcode("IF_ICMPGT", IF_ICMPGT, OpcodeGroup.INSN_JUMP);
+        addOpcode("IF_ICMPLE", IF_ICMPLE, OpcodeGroup.INSN_JUMP);
+        addOpcode("IF_ACMPEQ", IF_ACMPEQ, OpcodeGroup.INSN_JUMP);
+        addOpcode("IF_ACMPNE", IF_ACMPNE, OpcodeGroup.INSN_JUMP);
+        addOpcode("GOTO", GOTO, OpcodeGroup.INSN_JUMP);
+        addOpcode("JSR", JSR, OpcodeGroup.INSN_JUMP);
+        addOpcode("RET", RET, OpcodeGroup.INSN_VAR);
+        addOpcode("IRETURN", IRETURN, OpcodeGroup.INSN);
+        addOpcode("LRETURN", LRETURN, OpcodeGroup.INSN);
+        addOpcode("FRETURN", FRETURN, OpcodeGroup.INSN);
+        addOpcode("DRETURN", DRETURN, OpcodeGroup.INSN);
+        addOpcode("ARETURN", ARETURN, OpcodeGroup.INSN);
+        addOpcode("RETURN", RETURN, OpcodeGroup.INSN);
+        addOpcode("GETSTATIC", GETSTATIC, OpcodeGroup.INSN_FIELD);
+        addOpcode("PUTSTATIC", PUTSTATIC, OpcodeGroup.INSN_FIELD);
+        addOpcode("GETFIELD", GETFIELD, OpcodeGroup.INSN_FIELD);
+        addOpcode("PUTFIELD", PUTFIELD, OpcodeGroup.INSN_FIELD);
+        addOpcode("INVOKEVIRTUAL", INVOKEVIRTUAL, OpcodeGroup.INSN_METHOD);
+        addOpcode("INVOKESPECIAL", INVOKESPECIAL, OpcodeGroup.INSN_METHOD);
+        addOpcode("INVOKESTATIC", INVOKESTATIC, OpcodeGroup.INSN_METHOD);
+        addOpcode("INVOKEINTERFACE", INVOKEINTERFACE, OpcodeGroup.INSN_METHOD);
+        addOpcode("NEW", NEW, OpcodeGroup.INSN_TYPE);
+        addOpcode("NEWARRAY", NEWARRAY, OpcodeGroup.INSN_INT);
+        addOpcode("ANEWARRAY", ANEWARRAY, OpcodeGroup.INSN_TYPE);
+        addOpcode("ARRAYLENGTH", ARRAYLENGTH, OpcodeGroup.INSN);
+        addOpcode("ATHROW", ATHROW, OpcodeGroup.INSN);
+        addOpcode("CHECKCAST", CHECKCAST, OpcodeGroup.INSN_TYPE);
+        addOpcode("INSTANCEOF", INSTANCEOF, OpcodeGroup.INSN_TYPE);
+        addOpcode("MONITORENTER", MONITORENTER, OpcodeGroup.INSN);
+        addOpcode("MONITOREXIT", MONITOREXIT, OpcodeGroup.INSN);
+        addOpcode("MULTIANEWARRAY", MULTIANEWARRAY,
+                OpcodeGroup.INSN_MULTIANEWARRAY);
+        addOpcode("IFNULL", IFNULL, OpcodeGroup.INSN_JUMP);
+        addOpcode("IFNONNULL", IFNONNULL, OpcodeGroup.INSN_JUMP);
+    }
+
+    static {
+        String[] types = SAXCodeAdapter.TYPES;
+        for (int i = 0; i < types.length; i++) {
+            TYPES.put(types[i], new Integer(i));
+        }
+    }
+
+    /**
+     * Stack of the intermediate processing contexts.
+     */
+    private final ArrayList<Object> stack = new ArrayList<Object>();
+    private final RuleSet RULES = new RuleSet();
+    /**
+     * Current instance of the {@link ClassVisitor ClassVisitor} used to visit
+     * classfile bytecode.
+     */
+    protected ClassVisitor cv;
+    /**
+     * Map of the active {@link Label Label} instances for current method.
+     */
+    protected Map<Object, Label> labels;
+    /**
+     * Complete name of the current element.
+     */
+    String match = "";
+
+    {
+        RULES.add(BASE, new ClassRule());
+        RULES.add(BASE + "/interfaces/interface", new InterfaceRule());
+        RULES.add(BASE + "/interfaces", new InterfacesRule());
+        RULES.add(BASE + "/outerclass", new OuterClassRule());
+        RULES.add(BASE + "/innerclass", new InnerClassRule());
+        RULES.add(BASE + "/source", new SourceRule());
+        RULES.add(BASE + "/field", new FieldRule());
+
+        RULES.add(BASE + "/method", new MethodRule());
+        RULES.add(BASE + "/method/exceptions/exception", new ExceptionRule());
+        RULES.add(BASE + "/method/exceptions", new ExceptionsRule());
+
+        RULES.add(BASE + "/method/annotationDefault",
+                new AnnotationDefaultRule());
+
+        RULES.add(BASE + "/method/code/*", new OpcodesRule()); // opcodes
+
+        RULES.add(BASE + "/method/code/frame", new FrameRule());
+        RULES.add(BASE + "/method/code/frame/local", new FrameTypeRule());
+        RULES.add(BASE + "/method/code/frame/stack", new FrameTypeRule());
+
+        RULES.add(BASE + "/method/code/TABLESWITCH", new TableSwitchRule());
+        RULES.add(BASE + "/method/code/TABLESWITCH/label",
+                new TableSwitchLabelRule());
+        RULES.add(BASE + "/method/code/LOOKUPSWITCH", new LookupSwitchRule());
+        RULES.add(BASE + "/method/code/LOOKUPSWITCH/label",
+                new LookupSwitchLabelRule());
+
+        RULES.add(BASE + "/method/code/INVOKEDYNAMIC", new InvokeDynamicRule());
+        RULES.add(BASE + "/method/code/INVOKEDYNAMIC/bsmArg",
+                new InvokeDynamicBsmArgumentsRule());
+
+        RULES.add(BASE + "/method/code/Label", new LabelRule());
+        RULES.add(BASE + "/method/code/TryCatch", new TryCatchRule());
+        RULES.add(BASE + "/method/code/LineNumber", new LineNumberRule());
+        RULES.add(BASE + "/method/code/LocalVar", new LocalVarRule());
+        RULES.add(BASE + "/method/code/Max", new MaxRule());
+
+        RULES.add("*/annotation", new AnnotationRule());
+        RULES.add("*/parameterAnnotation", new AnnotationParameterRule());
+        RULES.add("*/annotationValue", new AnnotationValueRule());
+        RULES.add("*/annotationValueAnnotation",
+                new AnnotationValueAnnotationRule());
+        RULES.add("*/annotationValueEnum", new AnnotationValueEnumRule());
+        RULES.add("*/annotationValueArray", new AnnotationValueArrayRule());
+    }
+
+    /**
+     * Constructs a new {@link ASMContentHandler ASMContentHandler} object.
+     *
+     * @param cv class visitor that will be called to reconstruct the classfile
+     *           using the XML stream.
+     */
+    public ASMContentHandler(final ClassVisitor cv) {
+        this.cv = cv;
+    }
+
+    private static void addOpcode(String operStr, int oper, int group) {
+        OPCODES.put(operStr, new Opcode(oper, group));
+    }
+
+    /**
+     * Process notification of the start of an XML element being reached.
+     *
+     * @param ns    - The Namespace URI, or the empty string if the element has no
+     *              Namespace URI or if Namespace processing is not being
+     *              performed.
+     * @param lName - The local name (without prefix), or the empty string if
+     *              Namespace processing is not being performed.
+     * @param qName - The qualified name (with prefix), or the empty string if
+     *              qualified names are not available.
+     * @param list  - The attributes attached to the element. If there are no
+     *              attributes, it shall be an empty Attributes object.
+     * @throws SAXException if a parsing error is to be reported
+     */
+    @Override
+    public final void startElement(final String ns, final String lName,
+                                   final String qName, final Attributes list) throws SAXException {
+        // the actual element name is either in lName or qName, depending
+        // on whether the parser is namespace aware
+        String name = lName == null || lName.length() == 0 ? qName : lName;
+
+        // Compute the current matching rule
+        StringBuffer sb = new StringBuffer(match);
+        if (match.length() > 0) {
+            sb.append('/');
+        }
+        sb.append(name);
+        match = sb.toString();
+
+        // Fire "begin" events for all relevant rules
+        Rule r = (Rule) RULES.match(match);
+        if (r != null) {
+            r.begin(name, list);
+        }
+    }
+
+    /**
+     * Process notification of the end of an XML element being reached.
+     *
+     * @param ns    - The Namespace URI, or the empty string if the element has no
+     *              Namespace URI or if Namespace processing is not being
+     *              performed.
+     * @param lName - The local name (without prefix), or the empty string if
+     *              Namespace processing is not being performed.
+     * @param qName - The qualified XML 1.0 name (with prefix), or the empty
+     *              string if qualified names are not available.
+     * @throws SAXException if a parsing error is to be reported
+     */
+    @Override
+    public final void endElement(final String ns, final String lName,
+                                 final String qName) throws SAXException {
+        // the actual element name is either in lName or qName, depending
+        // on whether the parser is namespace aware
+        String name = lName == null || lName.length() == 0 ? qName : lName;
+
+        // Fire "end" events for all relevant rules in reverse order
+        Rule r = (Rule) RULES.match(match);
+        if (r != null) {
+            r.end(name);
+        }
+
+        // Recover the previous match expression
+        int slash = match.lastIndexOf('/');
+        if (slash >= 0) {
+            match = match.substring(0, slash);
+        } else {
+            match = "";
+        }
+    }
+
+    /**
+     * Return the top object on the stack without removing it. If there are no
+     * objects on the stack, return <code>null</code>.
+     *
+     * @return the top object on the stack without removing it.
+     */
+    final Object peek() {
+        int size = stack.size();
+        return size == 0 ? null : stack.get(size - 1);
+    }
+
+    /**
+     * Pop the top object off of the stack, and return it. If there are no
+     * objects on the stack, return <code>null</code>.
+     *
+     * @return the top object off of the stack.
+     */
+    final Object pop() {
+        int size = stack.size();
+        return size == 0 ? null : stack.remove(size - 1);
+    }
+
+    /**
+     * Push a new object onto the top of the object stack.
+     *
+     * @param object The new object
+     */
+    final void push(final Object object) {
+        stack.add(object);
+    }
+
+    private static interface OpcodeGroup {
+        public static final int INSN = 0;
+        public static final int INSN_INT = 1;
+        public static final int INSN_VAR = 2;
+        public static final int INSN_TYPE = 3;
+        public static final int INSN_FIELD = 4;
+        public static final int INSN_METHOD = 5;
+        public static final int INSN_JUMP = 6;
+        public static final int INSN_LDC = 7;
+        public static final int INSN_IINC = 8;
+        public static final int INSN_MULTIANEWARRAY = 9;
+    }
+
+    static final class RuleSet {
+
+        private final HashMap<String, Object> rules = new HashMap<String, Object>();
+
+        private final ArrayList<String> lpatterns = new ArrayList<String>();
+
+        private final ArrayList<String> rpatterns = new ArrayList<String>();
+
+        public void add(final String path, final Object rule) {
+            String pattern = path;
+            if (path.startsWith("*/")) {
+                pattern = path.substring(1);
+                lpatterns.add(pattern);
+            } else if (path.endsWith("/*")) {
+                pattern = path.substring(0, path.length() - 1);
+                rpatterns.add(pattern);
+            }
+            rules.put(pattern, rule);
+        }
+
+        public Object match(final String path) {
+            if (rules.containsKey(path)) {
+                return rules.get(path);
+            }
+
+            int n = path.lastIndexOf('/');
+            for (Iterator<String> it = lpatterns.iterator(); it.hasNext(); ) {
+                String pattern = it.next();
+                if (path.substring(n).endsWith(pattern)) {
+                    return rules.get(pattern);
+                }
+            }
+
+            for (Iterator<String> it = rpatterns.iterator(); it.hasNext(); ) {
+                String pattern = it.next();
+                if (path.startsWith(pattern)) {
+                    return rules.get(pattern);
+                }
+            }
+
+            return null;
+        }
+    }
+
+    /**
+     * Opcode
+     */
+    static final class Opcode {
+
+        public final int opcode;
+
+        public final int type;
+
+        Opcode(final int opcode, final int type) {
+            this.opcode = opcode;
+            this.type = type;
+        }
+    }
+
+    /**
+     * Rule
+     */
+    protected abstract class Rule {
+
+        public void begin(final String name, final Attributes attrs)
+                throws SAXException {
+        }
+
+        public void end(final String name) {
+        }
+
+        protected final Object getValue(final String desc, final String val)
+                throws SAXException {
+            Object value = null;
+            if (val != null) {
+                if ("Ljava/lang/String;".equals(desc)) {
+                    value = decode(val);
+                } else if ("Ljava/lang/Integer;".equals(desc)
+                        || "I".equals(desc) || "S".equals(desc)
+                        || "B".equals(desc) || "C".equals(desc)
+                        || "Z".equals(desc)) {
+                    value = new Integer(val);
+
+                } else if ("Ljava/lang/Short;".equals(desc)) {
+                    value = new Short(val);
+
+                } else if ("Ljava/lang/Byte;".equals(desc)) {
+                    value = new Byte(val);
+
+                } else if ("Ljava/lang/Character;".equals(desc)) {
+                    value = new Character(decode(val).charAt(0));
+
+                } else if ("Ljava/lang/Boolean;".equals(desc)) {
+                    value = Boolean.valueOf(val);
+
+                } else if ("Ljava/lang/Long;".equals(desc) || "J".equals(desc)) {
+                    value = new Long(val);
+                } else if ("Ljava/lang/Float;".equals(desc) || "F".equals(desc)) {
+                    value = new Float(val);
+                } else if ("Ljava/lang/Double;".equals(desc)
+                        || "D".equals(desc)) {
+                    value = new Double(val);
+                } else if (Type.getDescriptor(Type.class).equals(desc)) {
+                    value = Type.getType(val);
+
+                } else if (Type.getDescriptor(Handle.class).equals(desc)) {
+                    value = decodeHandle(val);
+
+                } else {
+                    // TODO use of default toString().
+                    throw new SAXException("Invalid value:" + val + " desc:"
+                            + desc + " ctx:" + this);
+                }
+            }
+            return value;
+        }
+
+        Handle decodeHandle(final String val) throws SAXException {
+            try {
+                int dotIndex = val.indexOf('.');
+                int descIndex = val.indexOf('(', dotIndex + 1);
+                int tagIndex = val.lastIndexOf('(');
+
+                int tag = Integer.parseInt(val.substring(tagIndex + 1,
+                        val.length() - 1));
+                String owner = val.substring(0, dotIndex);
+                String name = val.substring(dotIndex + 1, descIndex);
+                String desc = val.substring(descIndex, tagIndex - 1);
+                return new Handle(tag, owner, name, desc);
+
+            } catch (RuntimeException e) {
+                throw new SAXException("Malformed handle " + val, e);
+            }
+        }
+
+        private final String decode(final String val) throws SAXException {
+            StringBuffer sb = new StringBuffer(val.length());
+            try {
+                int n = 0;
+                while (n < val.length()) {
+                    char c = val.charAt(n);
+                    if (c == '\\') {
+                        n++;
+                        c = val.charAt(n);
+                        if (c == '\\') {
+                            sb.append('\\');
+                        } else {
+                            n++; // skip 'u'
+                            sb.append((char) Integer.parseInt(
+                                    val.substring(n, n + 4), 16));
+                            n += 3;
+                        }
+                    } else {
+                        sb.append(c);
+                    }
+                    n++;
+                }
+
+            } catch (RuntimeException ex) {
+                throw new SAXException(ex);
+            }
+            return sb.toString();
+        }
+
+        protected final Label getLabel(final Object label) {
+            Label lbl = labels.get(label);
+            if (lbl == null) {
+                lbl = new Label();
+                labels.put(label, lbl);
+            }
+            return lbl;
+        }
+
+        // TODO verify move to stack
+        protected final MethodVisitor getCodeVisitor() {
+            return (MethodVisitor) peek();
+        }
+
+        protected final int getAccess(final String s) {
+            int access = 0;
+            if (s.indexOf("public") != -1) {
+                access |= ACC_PUBLIC;
+            }
+            if (s.indexOf("private") != -1) {
+                access |= ACC_PRIVATE;
+            }
+            if (s.indexOf("protected") != -1) {
+                access |= ACC_PROTECTED;
+            }
+            if (s.indexOf("static") != -1) {
+                access |= ACC_STATIC;
+            }
+            if (s.indexOf("final") != -1) {
+                access |= ACC_FINAL;
+            }
+            if (s.indexOf("super") != -1) {
+                access |= ACC_SUPER;
+            }
+            if (s.indexOf("synchronized") != -1) {
+                access |= ACC_SYNCHRONIZED;
+            }
+            if (s.indexOf("volatile") != -1) {
+                access |= ACC_VOLATILE;
+            }
+            if (s.indexOf("bridge") != -1) {
+                access |= ACC_BRIDGE;
+            }
+            if (s.indexOf("varargs") != -1) {
+                access |= ACC_VARARGS;
+            }
+            if (s.indexOf("transient") != -1) {
+                access |= ACC_TRANSIENT;
+            }
+            if (s.indexOf("native") != -1) {
+                access |= ACC_NATIVE;
+            }
+            if (s.indexOf("interface") != -1) {
+                access |= ACC_INTERFACE;
+            }
+            if (s.indexOf("abstract") != -1) {
+                access |= ACC_ABSTRACT;
+            }
+            if (s.indexOf("strict") != -1) {
+                access |= ACC_STRICT;
+            }
+            if (s.indexOf("synthetic") != -1) {
+                access |= ACC_SYNTHETIC;
+            }
+            if (s.indexOf("annotation") != -1) {
+                access |= ACC_ANNOTATION;
+            }
+            if (s.indexOf("enum") != -1) {
+                access |= ACC_ENUM;
+            }
+            if (s.indexOf("deprecated") != -1) {
+                access |= ACC_DEPRECATED;
+            }
+            return access;
+        }
+    }
+
+    /**
+     * ClassRule
+     */
+    final class ClassRule extends Rule {
+
+        @Override
+        public final void begin(final String name, final Attributes attrs) {
+            int major = Integer.parseInt(attrs.getValue("major"));
+            int minor = Integer.parseInt(attrs.getValue("minor"));
+            HashMap<String, Object> vals = new HashMap<String, Object>();
+            vals.put("version", new Integer(minor << 16 | major));
+            vals.put("access", attrs.getValue("access"));
+            vals.put("name", attrs.getValue("name"));
+            vals.put("parent", attrs.getValue("parent"));
+            vals.put("source", attrs.getValue("source"));
+            vals.put("signature", attrs.getValue("signature"));
+            vals.put("interfaces", new ArrayList<String>());
+            push(vals);
+            // values will be extracted in InterfacesRule.end();
+        }
+    }
+
+    final class SourceRule extends Rule {
+
+        @Override
+        public void begin(final String name, final Attributes attrs) {
+            String file = attrs.getValue("file");
+            String debug = attrs.getValue("debug");
+            cv.visitSource(file, debug);
+        }
+    }
+
+    /**
+     * InterfaceRule
+     */
+    final class InterfaceRule extends Rule {
+
+        @Override
+        public final void begin(final String name, final Attributes attrs) {
+            ((ArrayList<String>) ((HashMap<?, ?>) peek()).get("interfaces"))
+                    .add(attrs.getValue("name"));
+        }
+    }
+
+    /**
+     * InterfacesRule
+     */
+    final class InterfacesRule extends Rule {
+
+        @Override
+        public final void end(final String element) {
+            HashMap<?, ?> vals = (HashMap<?, ?>) pop();
+            int version = ((Integer) vals.get("version")).intValue();
+            int access = getAccess((String) vals.get("access"));
+            String name = (String) vals.get("name");
+            String signature = (String) vals.get("signature");
+            String parent = (String) vals.get("parent");
+            ArrayList<?> infs = (ArrayList<?>) vals.get("interfaces");
+            String[] interfaces = infs.toArray(new String[infs.size()]);
+            cv.visit(version, access, name, signature, parent, interfaces);
+            push(cv);
+        }
+    }
+
+    /**
+     * OuterClassRule
+     */
+    final class OuterClassRule extends Rule {
+
+        @Override
+        public final void begin(final String element, final Attributes attrs) {
+            String owner = attrs.getValue("owner");
+            String name = attrs.getValue("name");
+            String desc = attrs.getValue("desc");
+            cv.visitOuterClass(owner, name, desc);
+        }
+    }
+
+    /**
+     * InnerClassRule
+     */
+    final class InnerClassRule extends Rule {
+
+        @Override
+        public final void begin(final String element, final Attributes attrs) {
+            int access = getAccess(attrs.getValue("access"));
+            String name = attrs.getValue("name");
+            String outerName = attrs.getValue("outerName");
+            String innerName = attrs.getValue("innerName");
+            cv.visitInnerClass(name, outerName, innerName, access);
+        }
+    }
+
+    /**
+     * FieldRule
+     */
+    final class FieldRule extends Rule {
+
+        @Override
+        public final void begin(final String element, final Attributes attrs)
+                throws SAXException {
+            int access = getAccess(attrs.getValue("access"));
+            String name = attrs.getValue("name");
+            String signature = attrs.getValue("signature");
+            String desc = attrs.getValue("desc");
+            Object value = getValue(desc, attrs.getValue("value"));
+            push(cv.visitField(access, name, desc, signature, value));
+        }
+
+        @Override
+        public void end(final String name) {
+            ((FieldVisitor) pop()).visitEnd();
+        }
+    }
+
+    /**
+     * MethodRule
+     */
+    final class MethodRule extends Rule {
+
+        @Override
+        public final void begin(final String name, final Attributes attrs) {
+            labels = new HashMap<Object, Label>();
+            HashMap<String, Object> vals = new HashMap<String, Object>();
+            vals.put("access", attrs.getValue("access"));
+            vals.put("name", attrs.getValue("name"));
+            vals.put("desc", attrs.getValue("desc"));
+            vals.put("signature", attrs.getValue("signature"));
+            vals.put("exceptions", new ArrayList<String>());
+            push(vals);
+            // values will be extracted in ExceptionsRule.end();
+        }
+
+        @Override
+        public final void end(final String name) {
+            ((MethodVisitor) pop()).visitEnd();
+            labels = null;
+        }
+    }
+
+    /**
+     * ExceptionRule
+     */
+    final class ExceptionRule extends Rule {
+
+        @Override
+        public final void begin(final String name, final Attributes attrs) {
+            ((ArrayList<String>) ((HashMap<?, ?>) peek()).get("exceptions"))
+                    .add(attrs.getValue("name"));
+        }
+    }
+
+    /**
+     * ExceptionsRule
+     */
+    final class ExceptionsRule extends Rule {
+
+        @Override
+        public final void end(final String element) {
+            HashMap<?, ?> vals = (HashMap<?, ?>) pop();
+            int access = getAccess((String) vals.get("access"));
+            String name = (String) vals.get("name");
+            String desc = (String) vals.get("desc");
+            String signature = (String) vals.get("signature");
+            ArrayList<?> excs = (ArrayList<?>) vals.get("exceptions");
+            String[] exceptions = excs.toArray(new String[excs.size()]);
+
+            push(cv.visitMethod(access, name, desc, signature, exceptions));
+        }
+    }
+
+    /**
+     * TableSwitchRule
+     */
+    final class TableSwitchRule extends Rule {
+
+        @Override
+        public final void begin(final String name, final Attributes attrs) {
+            HashMap<String, Object> vals = new HashMap<String, Object>();
+            vals.put("min", attrs.getValue("min"));
+            vals.put("max", attrs.getValue("max"));
+            vals.put("dflt", attrs.getValue("dflt"));
+            vals.put("labels", new ArrayList<String>());
+            push(vals);
+        }
+
+        @Override
+        public final void end(final String name) {
+            HashMap<?, ?> vals = (HashMap<?, ?>) pop();
+            int min = Integer.parseInt((String) vals.get("min"));
+            int max = Integer.parseInt((String) vals.get("max"));
+            Label dflt = getLabel(vals.get("dflt"));
+            ArrayList<?> lbls = (ArrayList<?>) vals.get("labels");
+            Label[] labels = lbls.toArray(new Label[lbls.size()]);
+            getCodeVisitor().visitTableSwitchInsn(min, max, dflt, labels);
+        }
+    }
+
+    /**
+     * TableSwitchLabelRule
+     */
+    final class TableSwitchLabelRule extends Rule {
+
+        @Override
+        public final void begin(final String name, final Attributes attrs) {
+            ((ArrayList<Label>) ((HashMap<?, ?>) peek()).get("labels"))
+                    .add(getLabel(attrs.getValue("name")));
+        }
+    }
+
+    /**
+     * LookupSwitchRule
+     */
+    final class LookupSwitchRule extends Rule {
+
+        @Override
+        public final void begin(final String name, final Attributes attrs) {
+            HashMap<String, Object> vals = new HashMap<String, Object>();
+            vals.put("dflt", attrs.getValue("dflt"));
+            vals.put("labels", new ArrayList<Label>());
+            vals.put("keys", new ArrayList<String>());
+            push(vals);
+        }
+
+        @Override
+        public final void end(final String name) {
+            HashMap<?, ?> vals = (HashMap<?, ?>) pop();
+            Label dflt = getLabel(vals.get("dflt"));
+            ArrayList<String> keyList = (ArrayList<String>) vals.get("keys");
+            ArrayList<?> lbls = (ArrayList<?>) vals.get("labels");
+            Label[] labels = lbls.toArray(new Label[lbls.size()]);
+            int[] keys = new int[keyList.size()];
+            for (int i = 0; i < keys.length; i++) {
+                keys[i] = Integer.parseInt(keyList.get(i));
+            }
+            getCodeVisitor().visitLookupSwitchInsn(dflt, keys, labels);
+        }
+    }
+
+    /**
+     * LookupSwitchLabelRule
+     */
+    final class LookupSwitchLabelRule extends Rule {
+
+        @Override
+        public final void begin(final String name, final Attributes attrs) {
+            HashMap<?, ?> vals = (HashMap<?, ?>) peek();
+            ((ArrayList<Label>) vals.get("labels")).add(getLabel(attrs
+                    .getValue("name")));
+            ((ArrayList<String>) vals.get("keys")).add(attrs.getValue("key"));
+        }
+    }
+
+    /**
+     * FrameRule
+     */
+    final class FrameRule extends Rule {
+
+        @Override
+        public void begin(final String name, final Attributes attrs) {
+            HashMap<String, Object> typeLists = new HashMap<String, Object>();
+            typeLists.put("local", new ArrayList<Object>());
+            typeLists.put("stack", new ArrayList<Object>());
+            push(attrs.getValue("type"));
+            push(attrs.getValue("count") == null ? "0" : attrs
+                    .getValue("count"));
+            push(typeLists);
+        }
+
+        @Override
+        public void end(final String name) {
+            HashMap<?, ?> typeLists = (HashMap<?, ?>) pop();
+            ArrayList<?> locals = (ArrayList<?>) typeLists.get("local");
+            int nLocal = locals.size();
+            Object[] local = locals.toArray();
+            ArrayList<?> stacks = (ArrayList<?>) typeLists.get("stack");
+            int nStack = stacks.size();
+            Object[] stack = stacks.toArray();
+            String count = (String) pop();
+            String type = (String) pop();
+            if ("NEW".equals(type)) {
+                getCodeVisitor()
+                        .visitFrame(F_NEW, nLocal, local, nStack, stack);
+            } else if ("FULL".equals(type)) {
+                getCodeVisitor().visitFrame(F_FULL, nLocal, local, nStack,
+                        stack);
+            } else if ("APPEND".equals(type)) {
+                getCodeVisitor().visitFrame(F_APPEND, nLocal, local, 0, null);
+            } else if ("CHOP".equals(type)) {
+                getCodeVisitor().visitFrame(F_CHOP, Integer.parseInt(count),
+                        null, 0, null);
+            } else if ("SAME".equals(type)) {
+                getCodeVisitor().visitFrame(F_SAME, 0, null, 0, null);
+            } else if ("SAME1".equals(type)) {
+                getCodeVisitor().visitFrame(F_SAME1, 0, null, nStack, stack);
+            }
+        }
+    }
+
+    final class FrameTypeRule extends Rule {
+
+        @Override
+        public void begin(final String name, final Attributes attrs) {
+            ArrayList<Object> types = (ArrayList<Object>) ((HashMap<?, ?>) peek())
+                    .get(name);
+            String type = attrs.getValue("type");
+            if ("uninitialized".equals(type)) {
+                types.add(getLabel(attrs.getValue("label")));
+            } else {
+                Integer t = TYPES.get(type);
+                if (t == null) {
+                    types.add(type);
+                } else {
+                    types.add(t);
+                }
+            }
+        }
+    }
+
+    /**
+     * LabelRule
+     */
+    final class LabelRule extends Rule {
+
+        @Override
+        public final void begin(final String name, final Attributes attrs) {
+            getCodeVisitor().visitLabel(getLabel(attrs.getValue("name")));
+        }
+    }
+
+    /**
+     * TryCatchRule
+     */
+    final class TryCatchRule extends Rule {
+
+        @Override
+        public final void begin(final String name, final Attributes attrs) {
+            Label start = getLabel(attrs.getValue("start"));
+            Label end = getLabel(attrs.getValue("end"));
+            Label handler = getLabel(attrs.getValue("handler"));
+            String type = attrs.getValue("type");
+            getCodeVisitor().visitTryCatchBlock(start, end, handler, type);
+        }
+    }
+
+    /**
+     * LineNumberRule
+     */
+    final class LineNumberRule extends Rule {
+
+        @Override
+        public final void begin(final String name, final Attributes attrs) {
+            int line = Integer.parseInt(attrs.getValue("line"));
+            Label start = getLabel(attrs.getValue("start"));
+            getCodeVisitor().visitLineNumber(line, start);
+        }
+    }
+
+    /**
+     * LocalVarRule
+     */
+    final class LocalVarRule extends Rule {
+
+        @Override
+        public final void begin(final String element, final Attributes attrs) {
+            String name = attrs.getValue("name");
+            String desc = attrs.getValue("desc");
+            String signature = attrs.getValue("signature");
+            Label start = getLabel(attrs.getValue("start"));
+            Label end = getLabel(attrs.getValue("end"));
+            int var = Integer.parseInt(attrs.getValue("var"));
+            getCodeVisitor().visitLocalVariable(name, desc, signature, start,
+                    end, var);
+        }
+    }
+
+    /**
+     * InvokeDynamicRule
+     */
+    final class InvokeDynamicRule extends Rule {
+        @Override
+        public final void begin(final String element, final Attributes attrs)
+                throws SAXException {
+            push(attrs.getValue("name"));
+            push(attrs.getValue("desc"));
+            push(decodeHandle(attrs.getValue("bsm")));
+            push(new ArrayList<Object>());
+        }
+
+        @Override
+        public final void end(final String element) {
+            ArrayList<?> bsmArgs = (ArrayList<?>) pop();
+            Handle bsm = (Handle) pop();
+            String desc = (String) pop();
+            String name = (String) pop();
+            getCodeVisitor().visitInvokeDynamicInsn(name, desc, bsm,
+                    bsmArgs.toArray());
+        }
+    }
+
+    /**
+     * InvokeDynamicBsmArgumentsRule
+     */
+    final class InvokeDynamicBsmArgumentsRule extends Rule {
+        @Override
+        public final void begin(final String element, final Attributes attrs)
+                throws SAXException {
+            ArrayList<Object> bsmArgs = (ArrayList<Object>) peek();
+            bsmArgs.add(getValue(attrs.getValue("desc"), attrs.getValue("cst")));
+        }
+    }
+
+    /**
+     * OpcodesRule
+     */
+    final class OpcodesRule extends Rule {
+
+        // public boolean match( String match, String element) {
+        // return match.startsWith( path) && OPCODES.containsKey( element);
+        // }
+
+        @Override
+        public final void begin(final String element, final Attributes attrs)
+                throws SAXException {
+            Opcode o = OPCODES.get(element);
+            if (o == null) {
+                throw new SAXException("Invalid element: " + element + " at "
+                        + match);
+            }
+
+            switch (o.type) {
+                case OpcodeGroup.INSN:
+                    getCodeVisitor().visitInsn(o.opcode);
+                    break;
+
+                case OpcodeGroup.INSN_FIELD:
+                    getCodeVisitor().visitFieldInsn(o.opcode,
+                            attrs.getValue("owner"), attrs.getValue("name"),
+                            attrs.getValue("desc"));
+                    break;
+
+                case OpcodeGroup.INSN_INT:
+                    getCodeVisitor().visitIntInsn(o.opcode,
+                            Integer.parseInt(attrs.getValue("value")));
+                    break;
+
+                case OpcodeGroup.INSN_JUMP:
+                    getCodeVisitor().visitJumpInsn(o.opcode,
+                            getLabel(attrs.getValue("label")));
+                    break;
+
+                case OpcodeGroup.INSN_METHOD:
+                    getCodeVisitor().visitMethodInsn(o.opcode,
+                            attrs.getValue("owner"), attrs.getValue("name"),
+                            attrs.getValue("desc"));
+                    break;
+
+                case OpcodeGroup.INSN_TYPE:
+                    getCodeVisitor()
+                            .visitTypeInsn(o.opcode, attrs.getValue("desc"));
+                    break;
+
+                case OpcodeGroup.INSN_VAR:
+                    getCodeVisitor().visitVarInsn(o.opcode,
+                            Integer.parseInt(attrs.getValue("var")));
+                    break;
+
+                case OpcodeGroup.INSN_IINC:
+                    getCodeVisitor().visitIincInsn(
+                            Integer.parseInt(attrs.getValue("var")),
+                            Integer.parseInt(attrs.getValue("inc")));
+                    break;
+
+                case OpcodeGroup.INSN_LDC:
+                    getCodeVisitor()
+                            .visitLdcInsn(
+                                    getValue(attrs.getValue("desc"),
+                                            attrs.getValue("cst")));
+                    break;
+
+                case OpcodeGroup.INSN_MULTIANEWARRAY:
+                    getCodeVisitor().visitMultiANewArrayInsn(
+                            attrs.getValue("desc"),
+                            Integer.parseInt(attrs.getValue("dims")));
+                    break;
+
+                default:
+                    throw new Error("Internal error");
+
+            }
+        }
+    }
+
+    /**
+     * MaxRule
+     */
+    final class MaxRule extends Rule {
+
+        @Override
+        public final void begin(final String element, final Attributes attrs) {
+            int maxStack = Integer.parseInt(attrs.getValue("maxStack"));
+            int maxLocals = Integer.parseInt(attrs.getValue("maxLocals"));
+            getCodeVisitor().visitMaxs(maxStack, maxLocals);
+        }
+    }
+
+    final class AnnotationRule extends Rule {
+
+        @Override
+        public void begin(final String name, final Attributes attrs) {
+            String desc = attrs.getValue("desc");
+            boolean visible = Boolean.valueOf(attrs.getValue("visible"))
+                    .booleanValue();
+
+            Object v = peek();
+            if (v instanceof ClassVisitor) {
+                push(((ClassVisitor) v).visitAnnotation(desc, visible));
+            } else if (v instanceof FieldVisitor) {
+                push(((FieldVisitor) v).visitAnnotation(desc, visible));
+            } else if (v instanceof MethodVisitor) {
+                push(((MethodVisitor) v).visitAnnotation(desc, visible));
+            }
+        }
+
+        @Override
+        public void end(final String name) {
+            AnnotationVisitor av = (AnnotationVisitor) pop();
+            if (av != null) {
+                av.visitEnd();
+            }
+        }
+    }
+
+    final class AnnotationParameterRule extends Rule {
+
+        @Override
+        public void begin(final String name, final Attributes attrs) {
+            int parameter = Integer.parseInt(attrs.getValue("parameter"));
+            String desc = attrs.getValue("desc");
+            boolean visible = Boolean.valueOf(attrs.getValue("visible"))
+                    .booleanValue();
+
+            push(((MethodVisitor) peek()).visitParameterAnnotation(parameter,
+                    desc, visible));
+        }
+
+        @Override
+        public void end(final String name) {
+            AnnotationVisitor av = (AnnotationVisitor) pop();
+            if (av != null) {
+                av.visitEnd();
+            }
+        }
+    }
+
+    final class AnnotationValueRule extends Rule {
+
+        @Override
+        public void begin(final String nm, final Attributes attrs)
+                throws SAXException {
+            AnnotationVisitor av = (AnnotationVisitor) peek();
+            if (av != null) {
+                av.visit(
+                        attrs.getValue("name"),
+                        getValue(attrs.getValue("desc"),
+                                attrs.getValue("value")));
+            }
+        }
+    }
+
+    final class AnnotationValueEnumRule extends Rule {
+
+        @Override
+        public void begin(final String nm, final Attributes attrs) {
+            AnnotationVisitor av = (AnnotationVisitor) peek();
+            if (av != null) {
+                av.visitEnum(attrs.getValue("name"), attrs.getValue("desc"),
+                        attrs.getValue("value"));
+            }
+        }
+    }
+
+    final class AnnotationValueAnnotationRule extends Rule {
+
+        @Override
+        public void begin(final String nm, final Attributes attrs) {
+            AnnotationVisitor av = (AnnotationVisitor) peek();
+            push(av == null ? null : av.visitAnnotation(attrs.getValue("name"),
+                    attrs.getValue("desc")));
+        }
+
+        @Override
+        public void end(final String name) {
+            AnnotationVisitor av = (AnnotationVisitor) pop();
+            if (av != null) {
+                av.visitEnd();
+            }
+        }
+    }
+
+    final class AnnotationValueArrayRule extends Rule {
+
+        @Override
+        public void begin(final String nm, final Attributes attrs) {
+            AnnotationVisitor av = (AnnotationVisitor) peek();
+            push(av == null ? null : av.visitArray(attrs.getValue("name")));
+        }
+
+        @Override
+        public void end(final String name) {
+            AnnotationVisitor av = (AnnotationVisitor) pop();
+            if (av != null) {
+                av.visitEnd();
+            }
+        }
+    }
+
+    final class AnnotationDefaultRule extends Rule {
+
+        @Override
+        public void begin(final String nm, final Attributes attrs) {
+            MethodVisitor av = (MethodVisitor) peek();
+            push(av == null ? null : av.visitAnnotationDefault());
+        }
+
+        @Override
+        public void end(final String name) {
+            AnnotationVisitor av = (AnnotationVisitor) pop();
+            if (av != null) {
+                av.visitEnd();
+            }
+        }
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/xml/Processor.java b/src/main/asm/org/objectweb/asm/xml/Processor.java
new file mode 100644
index 0000000..aafa861
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/xml/Processor.java
@@ -0,0 +1,1007 @@
+/***
+ * ASM XML Adapter
+ * Copyright (c) 2004-2011, Eugene Kuleshov
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.xml;
+
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassWriter;
+import org.xml.sax.*;
+import org.xml.sax.ext.LexicalHandler;
+import org.xml.sax.helpers.AttributesImpl;
+import org.xml.sax.helpers.DefaultHandler;
+import org.xml.sax.helpers.XMLReaderFactory;
+
+import javax.xml.transform.*;
+import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamSource;
+import java.io.*;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import java.util.zip.ZipOutputStream;
+
+/**
+ * Processor is a command line tool that can be used for bytecode waving
+ * directed by XSL transformation.
+ * <p>
+ * In order to use a concrete XSLT engine, system property
+ * <tt>javax.xml.transform.TransformerFactory</tt> must be set to one of the
+ * following values.
+ *
+ * <blockquote>
+ * <table border="1" cellspacing="0" cellpadding="3">
+ * <tr>
+ * <td>jd.xslt</td>
+ * <td>jd.xml.xslt.trax.TransformerFactoryImpl</td>
+ * </tr>
+ *
+ * <tr>
+ * <td>Saxon</td>
+ * <td>net.sf.saxon.TransformerFactoryImpl</td>
+ * </tr>
+ *
+ * <tr>
+ * <td>Caucho</td>
+ * <td>com.caucho.xsl.Xsl</td>
+ * </tr>
+ *
+ * <tr>
+ * <td>Xalan interpeter</td>
+ * <td>org.apache.xalan.processor.TransformerFactory</td>
+ * </tr>
+ *
+ * <tr>
+ * <td>Xalan xsltc</td>
+ * <td>org.apache.xalan.xsltc.trax.TransformerFactoryImpl</td>
+ * </tr>
+ * </table>
+ * </blockquote>
+ *
+ * @author Eugene Kuleshov
+ */
+public class Processor {
+
+    public static final int BYTECODE = 1;
+
+    public static final int MULTI_XML = 2;
+
+    public static final int SINGLE_XML = 3;
+
+    private static final String SINGLE_XML_NAME = "classes.xml";
+
+    private final int inRepresentation;
+
+    private final int outRepresentation;
+
+    private final InputStream input;
+
+    private final OutputStream output;
+
+    private final Source xslt;
+
+    private int n = 0;
+
+    public Processor(final int inRepresenation, final int outRepresentation,
+                     final InputStream input, final OutputStream output,
+                     final Source xslt) {
+        this.inRepresentation = inRepresenation;
+        this.outRepresentation = outRepresentation;
+        this.input = input;
+        this.output = output;
+        this.xslt = xslt;
+    }
+
+    private static byte[] readEntry(final InputStream zis, final ZipEntry ze)
+            throws IOException {
+        long size = ze.getSize();
+        if (size > -1) {
+            byte[] buff = new byte[(int) size];
+            int k = 0;
+            int n;
+            while ((n = zis.read(buff, k, buff.length - k)) > 0) {
+                k += n;
+            }
+            return buff;
+        }
+
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        byte[] buff = new byte[4096];
+        int i;
+        while ((i = zis.read(buff)) != -1) {
+            bos.write(buff, 0, i);
+        }
+        return bos.toByteArray();
+    }
+
+    public static void main(final String[] args) throws Exception {
+        if (args.length < 2) {
+            showUsage();
+            return;
+        }
+
+        int inRepresentation = getRepresentation(args[0]);
+        int outRepresentation = getRepresentation(args[1]);
+
+        InputStream is = System.in;
+        OutputStream os = new BufferedOutputStream(System.out);
+
+        Source xslt = null;
+        // boolean computeMax = true;
+
+        for (int i = 2; i < args.length; i++) {
+            if ("-in".equals(args[i])) {
+                is = new FileInputStream(args[++i]);
+
+            } else if ("-out".equals(args[i])) {
+                os = new BufferedOutputStream(new FileOutputStream(args[++i]));
+
+            } else if ("-xslt".equals(args[i])) {
+                xslt = new StreamSource(new FileInputStream(args[++i]));
+
+                // } else if( "-computemax".equals( args[ i].toLowerCase())) {
+                // computeMax = true;
+
+            } else {
+                showUsage();
+                return;
+
+            }
+        }
+
+        if (inRepresentation == 0 || outRepresentation == 0) {
+            showUsage();
+            return;
+        }
+
+        Processor m = new Processor(inRepresentation, outRepresentation, is,
+                os, xslt);
+
+        long l1 = System.currentTimeMillis();
+        int n = m.process();
+        long l2 = System.currentTimeMillis();
+        System.err.println(n);
+        System.err.println((l2 - l1) + "ms  " + 1000f * n / (l2 - l1)
+                + " resources/sec");
+    }
+
+    private static int getRepresentation(final String s) {
+        if ("code".equals(s)) {
+            return BYTECODE;
+        } else if ("xml".equals(s)) {
+            return MULTI_XML;
+        } else if ("singlexml".equals(s)) {
+            return SINGLE_XML;
+        }
+        return 0;
+    }
+
+    private static void showUsage() {
+        System.err
+                .println("Usage: Main <in format> <out format> [-in <input jar>] [-out <output jar>] [-xslt <xslt fiel>]");
+        System.err
+                .println("  when -in or -out is omitted sysin and sysout would be used");
+        System.err
+                .println("  <in format> and <out format> - code | xml | singlexml");
+    }
+
+    public int process() throws TransformerException, IOException, SAXException {
+        ZipInputStream zis = new ZipInputStream(input);
+        final ZipOutputStream zos = new ZipOutputStream(output);
+        final OutputStreamWriter osw = new OutputStreamWriter(zos);
+
+        Thread.currentThread().setContextClassLoader(
+                getClass().getClassLoader());
+
+        TransformerFactory tf = TransformerFactory.newInstance();
+        if (!tf.getFeature(SAXSource.FEATURE)
+                || !tf.getFeature(SAXResult.FEATURE)) {
+            return 0;
+        }
+
+        SAXTransformerFactory saxtf = (SAXTransformerFactory) tf;
+        Templates templates = null;
+        if (xslt != null) {
+            templates = saxtf.newTemplates(xslt);
+        }
+
+        // configuring outHandlerFactory
+        // ///////////////////////////////////////////////////////
+
+        EntryElement entryElement = getEntryElement(zos);
+
+        ContentHandler outDocHandler = null;
+        switch (outRepresentation) {
+            case BYTECODE:
+                outDocHandler = new OutputSlicingHandler(
+                        new ASMContentHandlerFactory(zos), entryElement, false);
+                break;
+
+            case MULTI_XML:
+                outDocHandler = new OutputSlicingHandler(new SAXWriterFactory(osw,
+                        true), entryElement, true);
+                break;
+
+            case SINGLE_XML:
+                ZipEntry outputEntry = new ZipEntry(SINGLE_XML_NAME);
+                zos.putNextEntry(outputEntry);
+                outDocHandler = new SAXWriter(osw, false);
+                break;
+
+        }
+
+        // configuring inputDocHandlerFactory
+        // /////////////////////////////////////////////////
+        ContentHandler inDocHandler;
+        if (templates == null) {
+            inDocHandler = outDocHandler;
+        } else {
+            inDocHandler = new InputSlicingHandler("class", outDocHandler,
+                    new TransformerHandlerFactory(saxtf, templates,
+                            outDocHandler));
+        }
+        ContentHandlerFactory inDocHandlerFactory = new SubdocumentHandlerFactory(
+                inDocHandler);
+
+        if (inDocHandler != null && inRepresentation != SINGLE_XML) {
+            inDocHandler.startDocument();
+            inDocHandler.startElement("", "classes", "classes",
+                    new AttributesImpl());
+        }
+
+        int i = 0;
+        ZipEntry ze;
+        while ((ze = zis.getNextEntry()) != null) {
+            update(ze.getName(), n++);
+            if (isClassEntry(ze)) {
+                processEntry(zis, ze, inDocHandlerFactory);
+            } else {
+                OutputStream os = entryElement.openEntry(getName(ze));
+                copyEntry(zis, os);
+                entryElement.closeEntry();
+            }
+
+            i++;
+        }
+
+        if (inDocHandler != null && inRepresentation != SINGLE_XML) {
+            inDocHandler.endElement("", "classes", "classes");
+            inDocHandler.endDocument();
+        }
+
+        if (outRepresentation == SINGLE_XML) {
+            zos.closeEntry();
+        }
+        zos.flush();
+        zos.close();
+
+        return i;
+    }
+
+    // private ContentHandlerFactory getHandlerFactory(
+    // OutputStream os,
+    // SAXTransformerFactory saxtf,
+    // Templates templates)
+    // {
+    // ContentHandlerFactory factory = null;
+    // if (templates == null) {
+    // if (outputRepresentation == BYTECODE) { // factory used to write
+    // // bytecode
+    // factory = new ASMContentHandlerFactory(os, computeMax);
+    // } else { // factory used to write XML
+    // factory = new SAXWriterFactory(os, true);
+    // }
+    // } else {
+    // if (outputRepresentation == BYTECODE) { // factory used to transform
+    // // and then write bytecode
+    // factory = new ASMTransformerHandlerFactory(saxtf,
+    // templates,
+    // os,
+    // computeMax);
+    // } else { // factory used to transformand then write XML
+    // factory = new TransformerHandlerFactory(saxtf,
+    // templates,
+    // os,
+    // outputRepresentation == SINGLE_XML);
+    // }
+    // }
+    // return factory;
+    // }
+
+    private void copyEntry(final InputStream is, final OutputStream os)
+            throws IOException {
+        if (outRepresentation == SINGLE_XML) {
+            return;
+        }
+
+        byte[] buff = new byte[2048];
+        int i;
+        while ((i = is.read(buff)) != -1) {
+            os.write(buff, 0, i);
+        }
+    }
+
+    private boolean isClassEntry(final ZipEntry ze) {
+        String name = ze.getName();
+        return inRepresentation == SINGLE_XML && name.equals(SINGLE_XML_NAME)
+                || name.endsWith(".class") || name.endsWith(".class.xml");
+    }
+
+    private void processEntry(final ZipInputStream zis, final ZipEntry ze,
+                              final ContentHandlerFactory handlerFactory) {
+        ContentHandler handler = handlerFactory.createContentHandler();
+        try {
+
+            // if (CODE2ASM.equals(command)) { // read bytecode and process it
+            // // with TraceClassVisitor
+            // ClassReader cr = new ClassReader(readEntry(zis, ze));
+            // cr.accept(new TraceClassVisitor(null, new PrintWriter(os)),
+            // false);
+            // }
+
+            boolean singleInputDocument = inRepresentation == SINGLE_XML;
+            if (inRepresentation == BYTECODE) { // read bytecode and process it
+                // with handler
+                ClassReader cr = new ClassReader(readEntry(zis, ze));
+                cr.accept(new SAXClassAdapter(handler, singleInputDocument), 0);
+
+            } else { // read XML and process it with handler
+                XMLReader reader = XMLReaderFactory.createXMLReader();
+                reader.setContentHandler(handler);
+                reader.parse(new InputSource(
+                        singleInputDocument ? (InputStream) new ProtectedInputStream(
+                                zis) : new ByteArrayInputStream(readEntry(zis,
+                                ze))));
+
+            }
+        } catch (Exception ex) {
+            update(ze.getName(), 0);
+            update(ex, 0);
+        }
+    }
+
+    private EntryElement getEntryElement(final ZipOutputStream zos) {
+        if (outRepresentation == SINGLE_XML) {
+            return new SingleDocElement(zos);
+        }
+        return new ZipEntryElement(zos);
+    }
+
+    private String getName(final ZipEntry ze) {
+        String name = ze.getName();
+        if (isClassEntry(ze)) {
+            if (inRepresentation != BYTECODE && outRepresentation == BYTECODE) {
+                name = name.substring(0, name.length() - 4); // .class.xml to
+                // .class
+            } else if (inRepresentation == BYTECODE
+                    && outRepresentation != BYTECODE) {
+                name += ".xml"; // .class to .class.xml
+            }
+            // } else if( CODE2ASM.equals( command)) {
+            // name = name.substring( 0, name.length()-6).concat( ".asm");
+        }
+        return name;
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see java.util.Observer#update(java.util.Observable, java.lang.Object)
+     */
+    protected void update(final Object arg, final int n) {
+        if (arg instanceof Throwable) {
+            ((Throwable) arg).printStackTrace();
+        } else {
+            if (n % 100 == 0) {
+                System.err.println(n + " " + arg);
+            }
+        }
+    }
+
+    /**
+     * A {@link ContentHandlerFactory ContentHandlerFactory} is used to create
+     * {@link org.xml.sax.ContentHandler ContentHandler} instances for concrete
+     * context.
+     */
+    private static interface ContentHandlerFactory {
+
+        /**
+         * Creates an instance of the content handler.
+         *
+         * @return content handler
+         */
+        ContentHandler createContentHandler();
+
+    }
+
+    private static interface EntryElement {
+
+        OutputStream openEntry(String name) throws IOException;
+
+        void closeEntry() throws IOException;
+
+    }
+
+    /**
+     * IputStream wrapper class used to protect input streams from being closed
+     * by some stupid XML parsers.
+     */
+    private static final class ProtectedInputStream extends InputStream {
+        private final InputStream is;
+
+        ProtectedInputStream(final InputStream is) {
+            this.is = is;
+        }
+
+        @Override
+        public final void close() throws IOException {
+        }
+
+        @Override
+        public final int read() throws IOException {
+            return is.read();
+        }
+
+        @Override
+        public final int read(final byte[] b, final int off, final int len)
+                throws IOException {
+            return is.read(b, off, len);
+        }
+
+        @Override
+        public final int available() throws IOException {
+            return is.available();
+        }
+    }
+
+    /**
+     * SAXWriterFactory
+     */
+    private static final class SAXWriterFactory implements
+            ContentHandlerFactory {
+        private final Writer w;
+
+        private final boolean optimizeEmptyElements;
+
+        SAXWriterFactory(final Writer w, final boolean optimizeEmptyElements) {
+            this.w = w;
+            this.optimizeEmptyElements = optimizeEmptyElements;
+        }
+
+        public final ContentHandler createContentHandler() {
+            return new SAXWriter(w, optimizeEmptyElements);
+        }
+
+    }
+
+    /**
+     * ASMContentHandlerFactory
+     */
+    private static final class ASMContentHandlerFactory implements
+            ContentHandlerFactory {
+        final OutputStream os;
+
+        ASMContentHandlerFactory(final OutputStream os) {
+            this.os = os;
+        }
+
+        public final ContentHandler createContentHandler() {
+            final ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
+            return new ASMContentHandler(cw) {
+                @Override
+                public void endDocument() throws SAXException {
+                    try {
+                        os.write(cw.toByteArray());
+                    } catch (IOException e) {
+                        throw new SAXException(e);
+                    }
+                }
+            };
+        }
+
+    }
+
+    /**
+     * TransformerHandlerFactory
+     */
+    private static final class TransformerHandlerFactory implements
+            ContentHandlerFactory {
+        private final Templates templates;
+        private SAXTransformerFactory saxtf;
+        private ContentHandler outputHandler;
+
+        TransformerHandlerFactory(final SAXTransformerFactory saxtf,
+                                  final Templates templates, final ContentHandler outputHandler) {
+            this.saxtf = saxtf;
+            this.templates = templates;
+            this.outputHandler = outputHandler;
+        }
+
+        public final ContentHandler createContentHandler() {
+            try {
+                TransformerHandler handler = saxtf
+                        .newTransformerHandler(templates);
+                handler.setResult(new SAXResult(outputHandler));
+                return handler;
+            } catch (TransformerConfigurationException ex) {
+                throw new RuntimeException(ex.toString());
+            }
+        }
+    }
+
+    /**
+     * SubdocumentHandlerFactory
+     */
+    private static final class SubdocumentHandlerFactory implements
+            ContentHandlerFactory {
+        private final ContentHandler subdocumentHandler;
+
+        SubdocumentHandlerFactory(final ContentHandler subdocumentHandler) {
+            this.subdocumentHandler = subdocumentHandler;
+        }
+
+        public final ContentHandler createContentHandler() {
+            return subdocumentHandler;
+        }
+
+    }
+
+    /**
+     * A {@link org.xml.sax.ContentHandler ContentHandler} and
+     * {@link org.xml.sax.ext.LexicalHandler LexicalHandler} that serializes XML
+     * from SAX 2.0 events into {@link java.io.Writer Writer}.
+     *
+     * <i><blockquote> This implementation does not support namespaces, entity
+     * definitions (uncluding DTD), CDATA and text elements. </blockquote></i>
+     */
+    private static final class SAXWriter extends DefaultHandler implements
+            LexicalHandler {
+        private static final char[] OFF = "                                                                                                        "
+                .toCharArray();
+        private final boolean optimizeEmptyElements;
+        private Writer w;
+        private boolean openElement = false;
+
+        private int ident = 0;
+
+        /**
+         * Creates <code>SAXWriter</code>.
+         *
+         * @param w                     writer
+         * @param optimizeEmptyElements if set to <code>true</code>, short XML syntax will be used
+         *                              for empty elements
+         */
+        SAXWriter(final Writer w, final boolean optimizeEmptyElements) {
+            this.w = w;
+            this.optimizeEmptyElements = optimizeEmptyElements;
+        }
+
+        /**
+         * Encode string with escaping.
+         *
+         * @param str string to encode.
+         * @return encoded string
+         */
+        private static final String esc(final String str) {
+            StringBuffer sb = new StringBuffer(str.length());
+            for (int i = 0; i < str.length(); i++) {
+                char ch = str.charAt(i);
+                switch (ch) {
+                    case '&':
+                        sb.append("&amp;");
+                        break;
+
+                    case '<':
+                        sb.append("&lt;");
+                        break;
+
+                    case '>':
+                        sb.append("&gt;");
+                        break;
+
+                    case '\"':
+                        sb.append("&quot;");
+                        break;
+
+                    default:
+                        if (ch > 0x7f) {
+                            sb.append("&#").append(Integer.toString(ch))
+                                    .append(';');
+                        } else {
+                            sb.append(ch);
+                        }
+
+                }
+            }
+            return sb.toString();
+        }
+
+        @Override
+        public final void startElement(final String ns, final String localName,
+                                       final String qName, final Attributes atts) throws SAXException {
+            try {
+                closeElement();
+
+                writeIdent();
+                w.write('<' + qName);
+                if (atts != null && atts.getLength() > 0) {
+                    writeAttributes(atts);
+                }
+
+                if (optimizeEmptyElements) {
+                    openElement = true;
+                } else {
+                    w.write(">\n");
+                }
+                ident += 2;
+
+            } catch (IOException ex) {
+                throw new SAXException(ex);
+
+            }
+        }
+
+        @Override
+        public final void endElement(final String ns, final String localName,
+                                     final String qName) throws SAXException {
+            ident -= 2;
+            try {
+                if (openElement) {
+                    w.write("/>\n");
+                    openElement = false;
+                } else {
+                    writeIdent();
+                    w.write("</" + qName + ">\n");
+                }
+
+            } catch (IOException ex) {
+                throw new SAXException(ex);
+
+            }
+        }
+
+        @Override
+        public final void endDocument() throws SAXException {
+            try {
+                w.flush();
+
+            } catch (IOException ex) {
+                throw new SAXException(ex);
+
+            }
+        }
+
+        public final void comment(final char[] ch, final int off, final int len)
+                throws SAXException {
+            try {
+                closeElement();
+
+                writeIdent();
+                w.write("<!-- ");
+                w.write(ch, off, len);
+                w.write(" -->\n");
+
+            } catch (IOException ex) {
+                throw new SAXException(ex);
+
+            }
+        }
+
+        public final void startDTD(final String arg0, final String arg1,
+                                   final String arg2) throws SAXException {
+        }
+
+        public final void endDTD() throws SAXException {
+        }
+
+        public final void startEntity(final String arg0) throws SAXException {
+        }
+
+        public final void endEntity(final String arg0) throws SAXException {
+        }
+
+        public final void startCDATA() throws SAXException {
+        }
+
+        public final void endCDATA() throws SAXException {
+        }
+
+        private final void writeAttributes(final Attributes atts)
+                throws IOException {
+            StringBuffer sb = new StringBuffer();
+            int len = atts.getLength();
+            for (int i = 0; i < len; i++) {
+                sb.append(' ').append(atts.getLocalName(i)).append("=\"")
+                        .append(esc(atts.getValue(i))).append('\"');
+            }
+            w.write(sb.toString());
+        }
+
+        private final void writeIdent() throws IOException {
+            int n = ident;
+            while (n > 0) {
+                if (n > OFF.length) {
+                    w.write(OFF);
+                    n -= OFF.length;
+                } else {
+                    w.write(OFF, 0, n);
+                    n = 0;
+                }
+            }
+        }
+
+        private final void closeElement() throws IOException {
+            if (openElement) {
+                w.write(">\n");
+            }
+            openElement = false;
+        }
+
+    }
+
+    /**
+     * A {@link org.xml.sax.ContentHandler ContentHandler} that splits XML
+     * documents into smaller chunks. Each chunk is processed by the nested
+     * {@link org.xml.sax.ContentHandler ContentHandler} obtained from
+     * {@link java.net.ContentHandlerFactory ContentHandlerFactory}. This is
+     * useful for running XSLT engine against large XML document that will
+     * hardly fit into the memory all together.
+     * <p>
+     * TODO use complete path for subdocumentRoot
+     */
+    private static final class InputSlicingHandler extends DefaultHandler {
+        private final ContentHandler rootHandler;
+        private String subdocumentRoot;
+        private ContentHandlerFactory subdocumentHandlerFactory;
+
+        private boolean subdocument = false;
+
+        private ContentHandler subdocumentHandler;
+
+        /**
+         * Constructs a new {@link InputSlicingHandler SubdocumentHandler}
+         * object.
+         *
+         * @param subdocumentRoot           name/path to the root element of the subdocument
+         * @param rootHandler               content handler for the entire document (subdocument
+         *                                  envelope).
+         * @param subdocumentHandlerFactory a {@link ContentHandlerFactory ContentHandlerFactory} used
+         *                                  to create {@link ContentHandler ContentHandler} instances
+         *                                  for subdocuments.
+         */
+        InputSlicingHandler(final String subdocumentRoot,
+                            final ContentHandler rootHandler,
+                            final ContentHandlerFactory subdocumentHandlerFactory) {
+            this.subdocumentRoot = subdocumentRoot;
+            this.rootHandler = rootHandler;
+            this.subdocumentHandlerFactory = subdocumentHandlerFactory;
+        }
+
+        @Override
+        public final void startElement(final String namespaceURI,
+                                       final String localName, final String qName,
+                                       final Attributes list) throws SAXException {
+            if (subdocument) {
+                subdocumentHandler.startElement(namespaceURI, localName, qName,
+                        list);
+            } else if (localName.equals(subdocumentRoot)) {
+                subdocumentHandler = subdocumentHandlerFactory
+                        .createContentHandler();
+                subdocumentHandler.startDocument();
+                subdocumentHandler.startElement(namespaceURI, localName, qName,
+                        list);
+                subdocument = true;
+            } else if (rootHandler != null) {
+                rootHandler.startElement(namespaceURI, localName, qName, list);
+            }
+        }
+
+        @Override
+        public final void endElement(final String namespaceURI,
+                                     final String localName, final String qName) throws SAXException {
+            if (subdocument) {
+                subdocumentHandler.endElement(namespaceURI, localName, qName);
+                if (localName.equals(subdocumentRoot)) {
+                    subdocumentHandler.endDocument();
+                    subdocument = false;
+                }
+            } else if (rootHandler != null) {
+                rootHandler.endElement(namespaceURI, localName, qName);
+            }
+        }
+
+        @Override
+        public final void startDocument() throws SAXException {
+            if (rootHandler != null) {
+                rootHandler.startDocument();
+            }
+        }
+
+        @Override
+        public final void endDocument() throws SAXException {
+            if (rootHandler != null) {
+                rootHandler.endDocument();
+
+            }
+        }
+
+        @Override
+        public final void characters(final char[] buff, final int offset,
+                                     final int size) throws SAXException {
+            if (subdocument) {
+                subdocumentHandler.characters(buff, offset, size);
+            } else if (rootHandler != null) {
+                rootHandler.characters(buff, offset, size);
+            }
+        }
+
+    }
+
+    /**
+     * A {@link org.xml.sax.ContentHandler ContentHandler} that splits XML
+     * documents into smaller chunks. Each chunk is processed by the nested
+     * {@link org.xml.sax.ContentHandler ContentHandler} obtained from
+     * {@link java.net.ContentHandlerFactory ContentHandlerFactory}. This is
+     * useful for running XSLT engine against large XML document that will
+     * hardly fit into the memory all together.
+     *
+     * <p>
+     * TODO use complete path for subdocumentRoot
+     */
+    private static final class OutputSlicingHandler extends DefaultHandler {
+        private final String subdocumentRoot;
+        private final EntryElement entryElement;
+        private ContentHandlerFactory subdocumentHandlerFactory;
+        private boolean isXml;
+
+        private boolean subdocument = false;
+
+        private ContentHandler subdocumentHandler;
+
+        /**
+         * Constructs a new {@link OutputSlicingHandler SubdocumentHandler}
+         * object.
+         *
+         * @param subdocumentHandlerFactory a {@link ContentHandlerFactory ContentHandlerFactory} used
+         *                                  to create {@link ContentHandler ContentHandler} instances
+         *                                  for subdocuments.
+         * @param entryElement              TODO.
+         * @param isXml                     TODO.
+         */
+        OutputSlicingHandler(
+                final ContentHandlerFactory subdocumentHandlerFactory,
+                final EntryElement entryElement, final boolean isXml) {
+            this.subdocumentRoot = "class";
+            this.subdocumentHandlerFactory = subdocumentHandlerFactory;
+            this.entryElement = entryElement;
+            this.isXml = isXml;
+        }
+
+        @Override
+        public final void startElement(final String namespaceURI,
+                                       final String localName, final String qName,
+                                       final Attributes list) throws SAXException {
+            if (subdocument) {
+                subdocumentHandler.startElement(namespaceURI, localName, qName,
+                        list);
+            } else if (localName.equals(subdocumentRoot)) {
+                String name = list.getValue("name");
+                if (name == null || name.length() == 0) {
+                    throw new SAXException(
+                            "Class element without name attribute.");
+                }
+                try {
+                    entryElement.openEntry(isXml ? name + ".class.xml" : name
+                            + ".class");
+                } catch (IOException ex) {
+                    throw new SAXException(ex.toString(), ex);
+                }
+                subdocumentHandler = subdocumentHandlerFactory
+                        .createContentHandler();
+                subdocumentHandler.startDocument();
+                subdocumentHandler.startElement(namespaceURI, localName, qName,
+                        list);
+                subdocument = true;
+            }
+        }
+
+        @Override
+        public final void endElement(final String namespaceURI,
+                                     final String localName, final String qName) throws SAXException {
+            if (subdocument) {
+                subdocumentHandler.endElement(namespaceURI, localName, qName);
+                if (localName.equals(subdocumentRoot)) {
+                    subdocumentHandler.endDocument();
+                    subdocument = false;
+                    try {
+                        entryElement.closeEntry();
+                    } catch (IOException ex) {
+                        throw new SAXException(ex.toString(), ex);
+                    }
+                }
+            }
+        }
+
+        @Override
+        public final void startDocument() throws SAXException {
+        }
+
+        @Override
+        public final void endDocument() throws SAXException {
+        }
+
+        @Override
+        public final void characters(final char[] buff, final int offset,
+                                     final int size) throws SAXException {
+            if (subdocument) {
+                subdocumentHandler.characters(buff, offset, size);
+            }
+        }
+
+    }
+
+    private static final class SingleDocElement implements EntryElement {
+        private final OutputStream os;
+
+        SingleDocElement(final OutputStream os) {
+            this.os = os;
+        }
+
+        public OutputStream openEntry(final String name) throws IOException {
+            return os;
+        }
+
+        public void closeEntry() throws IOException {
+            os.flush();
+        }
+
+    }
+
+    private static final class ZipEntryElement implements EntryElement {
+        private ZipOutputStream zos;
+
+        ZipEntryElement(final ZipOutputStream zos) {
+            this.zos = zos;
+        }
+
+        public OutputStream openEntry(final String name) throws IOException {
+            ZipEntry entry = new ZipEntry(name);
+            zos.putNextEntry(entry);
+            return zos;
+        }
+
+        public void closeEntry() throws IOException {
+            zos.flush();
+            zos.closeEntry();
+        }
+
+    }
+
+}
diff --git a/src/main/asm/org/objectweb/asm/xml/SAXAdapter.java b/src/main/asm/org/objectweb/asm/xml/SAXAdapter.java
new file mode 100644
index 0000000..1eef234
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/xml/SAXAdapter.java
@@ -0,0 +1,88 @@
+/***
+ * ASM XML Adapter
+ * Copyright (c) 2004-2011, Eugene Kuleshov
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.xml;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+
+/**
+ * SAXAdapter
+ *
+ * @author Eugene Kuleshov
+ */
+public class SAXAdapter {
+    private final ContentHandler h;
+
+    protected SAXAdapter(final ContentHandler h) {
+        this.h = h;
+    }
+
+    protected ContentHandler getContentHandler() {
+        return h;
+    }
+
+    protected void addDocumentStart() {
+        try {
+            h.startDocument();
+        } catch (SAXException ex) {
+            throw new RuntimeException(ex.getMessage(), ex.getException());
+        }
+    }
+
+    protected void addDocumentEnd() {
+        try {
+            h.endDocument();
+        } catch (SAXException ex) {
+            throw new RuntimeException(ex.getMessage(), ex.getException());
+        }
+    }
+
+    protected final void addStart(final String name, final Attributes attrs) {
+        try {
+            h.startElement("", name, name, attrs);
+        } catch (SAXException ex) {
+            throw new RuntimeException(ex.getMessage(), ex.getException());
+        }
+    }
+
+    protected final void addEnd(final String name) {
+        try {
+            h.endElement("", name, name);
+        } catch (SAXException ex) {
+            throw new RuntimeException(ex.getMessage(), ex.getException());
+        }
+    }
+
+    protected final void addElement(final String name, final Attributes attrs) {
+        addStart(name, attrs);
+        addEnd(name);
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/xml/SAXAnnotationAdapter.java b/src/main/asm/org/objectweb/asm/xml/SAXAnnotationAdapter.java
new file mode 100644
index 0000000..e8b587f
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/xml/SAXAnnotationAdapter.java
@@ -0,0 +1,183 @@
+/***
+ * ASM XML Adapter
+ * Copyright (c) 2004-2011, Eugene Kuleshov
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.xml;
+
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+import org.xml.sax.helpers.AttributesImpl;
+
+/**
+ * SAXAnnotationAdapter
+ *
+ * @author Eugene Kuleshov
+ */
+public final class SAXAnnotationAdapter extends AnnotationVisitor {
+    private final String elementName;
+    SAXAdapter sa;
+
+    public SAXAnnotationAdapter(final SAXAdapter sa, final String elementName,
+                                final int visible, final String name, final String desc) {
+        this(Opcodes.ASM4, sa, elementName, visible, desc, name, -1);
+    }
+
+    public SAXAnnotationAdapter(final SAXAdapter sa, final String elementName,
+                                final int visible, final int parameter, final String desc) {
+        this(Opcodes.ASM4, sa, elementName, visible, desc, null, parameter);
+    }
+
+    protected SAXAnnotationAdapter(final int api, final SAXAdapter sa,
+                                   final String elementName, final int visible, final String desc,
+                                   final String name, final int parameter) {
+        super(api);
+        this.sa = sa;
+        this.elementName = elementName;
+
+        AttributesImpl att = new AttributesImpl();
+        if (name != null) {
+            att.addAttribute("", "name", "name", "", name);
+        }
+        if (visible != 0) {
+            att.addAttribute("", "visible", "visible", "", visible > 0 ? "true"
+                    : "false");
+        }
+        if (parameter != -1) {
+            att.addAttribute("", "parameter", "parameter", "",
+                    Integer.toString(parameter));
+        }
+        if (desc != null) {
+            att.addAttribute("", "desc", "desc", "", desc);
+        }
+
+        sa.addStart(elementName, att);
+    }
+
+    @Override
+    public void visit(final String name, final Object value) {
+        Class<?> c = value.getClass();
+        if (c.isArray()) {
+            AnnotationVisitor av = visitArray(name);
+            if (value instanceof byte[]) {
+                byte[] b = (byte[]) value;
+                for (int i = 0; i < b.length; i++) {
+                    av.visit(null, new Byte(b[i]));
+                }
+
+            } else if (value instanceof char[]) {
+                char[] b = (char[]) value;
+                for (int i = 0; i < b.length; i++) {
+                    av.visit(null, new Character(b[i]));
+                }
+
+            } else if (value instanceof short[]) {
+                short[] b = (short[]) value;
+                for (int i = 0; i < b.length; i++) {
+                    av.visit(null, new Short(b[i]));
+                }
+
+            } else if (value instanceof boolean[]) {
+                boolean[] b = (boolean[]) value;
+                for (int i = 0; i < b.length; i++) {
+                    av.visit(null, Boolean.valueOf(b[i]));
+                }
+
+            } else if (value instanceof int[]) {
+                int[] b = (int[]) value;
+                for (int i = 0; i < b.length; i++) {
+                    av.visit(null, new Integer(b[i]));
+                }
+
+            } else if (value instanceof long[]) {
+                long[] b = (long[]) value;
+                for (int i = 0; i < b.length; i++) {
+                    av.visit(null, new Long(b[i]));
+                }
+
+            } else if (value instanceof float[]) {
+                float[] b = (float[]) value;
+                for (int i = 0; i < b.length; i++) {
+                    av.visit(null, new Float(b[i]));
+                }
+
+            } else if (value instanceof double[]) {
+                double[] b = (double[]) value;
+                for (int i = 0; i < b.length; i++) {
+                    av.visit(null, new Double(b[i]));
+                }
+
+            }
+            av.visitEnd();
+        } else {
+            addValueElement("annotationValue", name, Type.getDescriptor(c),
+                    value.toString());
+        }
+    }
+
+    @Override
+    public void visitEnum(final String name, final String desc,
+                          final String value) {
+        addValueElement("annotationValueEnum", name, desc, value);
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotation(final String name,
+                                             final String desc) {
+        return new SAXAnnotationAdapter(sa, "annotationValueAnnotation", 0,
+                name, desc);
+    }
+
+    @Override
+    public AnnotationVisitor visitArray(final String name) {
+        return new SAXAnnotationAdapter(sa, "annotationValueArray", 0, name,
+                null);
+    }
+
+    @Override
+    public void visitEnd() {
+        sa.addEnd(elementName);
+    }
+
+    private void addValueElement(final String element, final String name,
+                                 final String desc, final String value) {
+        AttributesImpl att = new AttributesImpl();
+        if (name != null) {
+            att.addAttribute("", "name", "name", "", name);
+        }
+        if (desc != null) {
+            att.addAttribute("", "desc", "desc", "", desc);
+        }
+        if (value != null) {
+            att.addAttribute("", "value", "value", "",
+                    SAXClassAdapter.encode(value));
+        }
+
+        sa.addElement(element, att);
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/xml/SAXClassAdapter.java b/src/main/asm/org/objectweb/asm/xml/SAXClassAdapter.java
new file mode 100644
index 0000000..64e330e
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/xml/SAXClassAdapter.java
@@ -0,0 +1,312 @@
+/***
+ * ASM XML Adapter
+ * Copyright (c) 2004-2011, Eugene Kuleshov
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.xml;
+
+import org.objectweb.asm.*;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.helpers.AttributesImpl;
+
+/**
+ * A {@link org.objectweb.asm.ClassVisitor ClassVisitor} that generates SAX 2.0
+ * events from the visited class. It can feed any kind of
+ * {@link org.xml.sax.ContentHandler ContentHandler}, e.g. XML serializer, XSLT
+ * or XQuery engines.
+ *
+ * @author Eugene Kuleshov
+ * @see org.objectweb.asm.xml.Processor
+ * @see org.objectweb.asm.xml.ASMContentHandler
+ */
+public final class SAXClassAdapter extends ClassVisitor {
+    /**
+     * Pseudo access flag used to distinguish class access flags.
+     */
+    private static final int ACCESS_CLASS = 262144;
+    /**
+     * Pseudo access flag used to distinguish field access flags.
+     */
+    private static final int ACCESS_FIELD = 524288;
+    /**
+     * Pseudo access flag used to distinguish inner class flags.
+     */
+    private static final int ACCESS_INNER = 1048576;
+    private final boolean singleDocument;
+    SAXAdapter sa;
+
+    /**
+     * Constructs a new {@link SAXClassAdapter SAXClassAdapter} object.
+     *
+     * @param h              content handler that will be used to send SAX 2.0 events.
+     * @param singleDocument if <tt>true</tt> adapter will not produce
+     *                       {@link ContentHandler#startDocument() startDocument()} and
+     *                       {@link ContentHandler#endDocument() endDocument()} events.
+     */
+    public SAXClassAdapter(final ContentHandler h, boolean singleDocument) {
+        super(Opcodes.ASM4);
+        this.sa = new SAXAdapter(h);
+        this.singleDocument = singleDocument;
+        if (!singleDocument) {
+            sa.addDocumentStart();
+        }
+    }
+
+    static final String encode(final String s) {
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < s.length(); i++) {
+            char c = s.charAt(i);
+            if (c == '\\') {
+                sb.append("\\\\");
+            } else if (c < 0x20 || c > 0x7f) {
+                sb.append("\\u");
+                if (c < 0x10) {
+                    sb.append("000");
+                } else if (c < 0x100) {
+                    sb.append("00");
+                } else if (c < 0x1000) {
+                    sb.append('0');
+                }
+                sb.append(Integer.toString(c, 16));
+            } else {
+                sb.append(c);
+            }
+        }
+        return sb.toString();
+    }
+
+    static void appendAccess(final int access, final StringBuffer sb) {
+        if ((access & Opcodes.ACC_PUBLIC) != 0) {
+            sb.append("public ");
+        }
+        if ((access & Opcodes.ACC_PRIVATE) != 0) {
+            sb.append("private ");
+        }
+        if ((access & Opcodes.ACC_PROTECTED) != 0) {
+            sb.append("protected ");
+        }
+        if ((access & Opcodes.ACC_FINAL) != 0) {
+            sb.append("final ");
+        }
+        if ((access & Opcodes.ACC_STATIC) != 0) {
+            sb.append("static ");
+        }
+        if ((access & Opcodes.ACC_SUPER) != 0) {
+            if ((access & ACCESS_CLASS) == 0) {
+                sb.append("synchronized ");
+            } else {
+                sb.append("super ");
+            }
+        }
+        if ((access & Opcodes.ACC_VOLATILE) != 0) {
+            if ((access & ACCESS_FIELD) == 0) {
+                sb.append("bridge ");
+            } else {
+                sb.append("volatile ");
+            }
+        }
+        if ((access & Opcodes.ACC_TRANSIENT) != 0) {
+            if ((access & ACCESS_FIELD) == 0) {
+                sb.append("varargs ");
+            } else {
+                sb.append("transient ");
+            }
+        }
+        if ((access & Opcodes.ACC_NATIVE) != 0) {
+            sb.append("native ");
+        }
+        if ((access & Opcodes.ACC_STRICT) != 0) {
+            sb.append("strict ");
+        }
+        if ((access & Opcodes.ACC_INTERFACE) != 0) {
+            sb.append("interface ");
+        }
+        if ((access & Opcodes.ACC_ABSTRACT) != 0) {
+            sb.append("abstract ");
+        }
+        if ((access & Opcodes.ACC_SYNTHETIC) != 0) {
+            sb.append("synthetic ");
+        }
+        if ((access & Opcodes.ACC_ANNOTATION) != 0) {
+            sb.append("annotation ");
+        }
+        if ((access & Opcodes.ACC_ENUM) != 0) {
+            sb.append("enum ");
+        }
+        if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+            sb.append("deprecated ");
+        }
+    }
+
+    @Override
+    public void visitSource(final String source, final String debug) {
+        AttributesImpl att = new AttributesImpl();
+        if (source != null) {
+            att.addAttribute("", "file", "file", "", encode(source));
+        }
+        if (debug != null) {
+            att.addAttribute("", "debug", "debug", "", encode(debug));
+        }
+
+        sa.addElement("source", att);
+    }
+
+    @Override
+    public void visitOuterClass(final String owner, final String name,
+                                final String desc) {
+        AttributesImpl att = new AttributesImpl();
+        att.addAttribute("", "owner", "owner", "", owner);
+        if (name != null) {
+            att.addAttribute("", "name", "name", "", name);
+        }
+        if (desc != null) {
+            att.addAttribute("", "desc", "desc", "", desc);
+        }
+
+        sa.addElement("outerclass", att);
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotation(final String desc,
+                                             final boolean visible) {
+        return new SAXAnnotationAdapter(sa, "annotation", visible ? 1 : -1,
+                null, desc);
+    }
+
+    @Override
+    public void visit(final int version, final int access, final String name,
+                      final String signature, final String superName,
+                      final String[] interfaces) {
+        StringBuffer sb = new StringBuffer();
+        appendAccess(access | ACCESS_CLASS, sb);
+
+        AttributesImpl att = new AttributesImpl();
+        att.addAttribute("", "access", "access", "", sb.toString());
+        if (name != null) {
+            att.addAttribute("", "name", "name", "", name);
+        }
+        if (signature != null) {
+            att.addAttribute("", "signature", "signature", "",
+                    encode(signature));
+        }
+        if (superName != null) {
+            att.addAttribute("", "parent", "parent", "", superName);
+        }
+        att.addAttribute("", "major", "major", "",
+                Integer.toString(version & 0xFFFF));
+        att.addAttribute("", "minor", "minor", "",
+                Integer.toString(version >>> 16));
+        sa.addStart("class", att);
+
+        sa.addStart("interfaces", new AttributesImpl());
+        if (interfaces != null && interfaces.length > 0) {
+            for (int i = 0; i < interfaces.length; i++) {
+                AttributesImpl att2 = new AttributesImpl();
+                att2.addAttribute("", "name", "name", "", interfaces[i]);
+                sa.addElement("interface", att2);
+            }
+        }
+        sa.addEnd("interfaces");
+    }
+
+    @Override
+    public FieldVisitor visitField(final int access, final String name,
+                                   final String desc, final String signature, final Object value) {
+        StringBuffer sb = new StringBuffer();
+        appendAccess(access | ACCESS_FIELD, sb);
+
+        AttributesImpl att = new AttributesImpl();
+        att.addAttribute("", "access", "access", "", sb.toString());
+        att.addAttribute("", "name", "name", "", name);
+        att.addAttribute("", "desc", "desc", "", desc);
+        if (signature != null) {
+            att.addAttribute("", "signature", "signature", "",
+                    encode(signature));
+        }
+        if (value != null) {
+            att.addAttribute("", "value", "value", "", encode(value.toString()));
+        }
+
+        return new SAXFieldAdapter(sa, att);
+    }
+
+    @Override
+    public MethodVisitor visitMethod(final int access, final String name,
+                                     final String desc, final String signature, final String[] exceptions) {
+        StringBuffer sb = new StringBuffer();
+        appendAccess(access, sb);
+
+        AttributesImpl att = new AttributesImpl();
+        att.addAttribute("", "access", "access", "", sb.toString());
+        att.addAttribute("", "name", "name", "", name);
+        att.addAttribute("", "desc", "desc", "", desc);
+        if (signature != null) {
+            att.addAttribute("", "signature", "signature", "", signature);
+        }
+        sa.addStart("method", att);
+
+        sa.addStart("exceptions", new AttributesImpl());
+        if (exceptions != null && exceptions.length > 0) {
+            for (int i = 0; i < exceptions.length; i++) {
+                AttributesImpl att2 = new AttributesImpl();
+                att2.addAttribute("", "name", "name", "", exceptions[i]);
+                sa.addElement("exception", att2);
+            }
+        }
+        sa.addEnd("exceptions");
+
+        return new SAXCodeAdapter(sa, access);
+    }
+
+    @Override
+    public final void visitInnerClass(final String name,
+                                      final String outerName, final String innerName, final int access) {
+        StringBuffer sb = new StringBuffer();
+        appendAccess(access | ACCESS_INNER, sb);
+
+        AttributesImpl att = new AttributesImpl();
+        att.addAttribute("", "access", "access", "", sb.toString());
+        if (name != null) {
+            att.addAttribute("", "name", "name", "", name);
+        }
+        if (outerName != null) {
+            att.addAttribute("", "outerName", "outerName", "", outerName);
+        }
+        if (innerName != null) {
+            att.addAttribute("", "innerName", "innerName", "", innerName);
+        }
+        sa.addElement("innerclass", att);
+    }
+
+    @Override
+    public final void visitEnd() {
+        sa.addEnd("class");
+        if (!singleDocument) {
+            sa.addDocumentEnd();
+        }
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/xml/SAXCodeAdapter.java b/src/main/asm/org/objectweb/asm/xml/SAXCodeAdapter.java
new file mode 100644
index 0000000..c575df6
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/xml/SAXCodeAdapter.java
@@ -0,0 +1,353 @@
+/***
+ * ASM XML Adapter
+ * Copyright (c) 2004-2011, Eugene Kuleshov
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.xml;
+
+import org.objectweb.asm.*;
+import org.objectweb.asm.util.Printer;
+import org.xml.sax.helpers.AttributesImpl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A {@link MethodVisitor} that generates SAX 2.0 events from the visited
+ * method.
+ *
+ * @author Eugene Kuleshov
+ * @see org.objectweb.asm.xml.SAXClassAdapter
+ * @see org.objectweb.asm.xml.Processor
+ */
+public final class SAXCodeAdapter extends MethodVisitor {
+    static final String[] TYPES = {"top", "int", "float", "double", "long",
+            "null", "uninitializedThis"};
+
+    private final Map<Label, String> labelNames;
+    SAXAdapter sa;
+
+    /**
+     * Constructs a new {@link SAXCodeAdapter SAXCodeAdapter} object.
+     *
+     * @param sa content handler that will be used to send SAX 2.0 events.
+     */
+    public SAXCodeAdapter(final SAXAdapter sa, final int access) {
+        super(Opcodes.ASM4);
+        this.sa = sa;
+        this.labelNames = new HashMap<Label, String>();
+
+        if ((access & (Opcodes.ACC_ABSTRACT | Opcodes.ACC_INTERFACE | Opcodes.ACC_NATIVE)) == 0) {
+            sa.addStart("code", new AttributesImpl());
+        }
+    }
+
+    private static AttributesImpl getConstantAttribute(final Object cst) {
+        AttributesImpl attrs = new AttributesImpl();
+        attrs.addAttribute("", "cst", "cst", "",
+                SAXClassAdapter.encode(cst.toString()));
+        attrs.addAttribute("", "desc", "desc", "",
+                Type.getDescriptor(cst.getClass()));
+        return attrs;
+    }
+
+    @Override
+    public final void visitCode() {
+    }
+
+    @Override
+    public void visitFrame(final int type, final int nLocal,
+                           final Object[] local, final int nStack, final Object[] stack) {
+        AttributesImpl attrs = new AttributesImpl();
+        switch (type) {
+            case Opcodes.F_NEW:
+            case Opcodes.F_FULL:
+                if (type == Opcodes.F_NEW) {
+                    attrs.addAttribute("", "type", "type", "", "NEW");
+                } else {
+                    attrs.addAttribute("", "type", "type", "", "FULL");
+                }
+                sa.addStart("frame", attrs);
+                appendFrameTypes(true, nLocal, local);
+                appendFrameTypes(false, nStack, stack);
+                break;
+            case Opcodes.F_APPEND:
+                attrs.addAttribute("", "type", "type", "", "APPEND");
+                sa.addStart("frame", attrs);
+                appendFrameTypes(true, nLocal, local);
+                break;
+            case Opcodes.F_CHOP:
+                attrs.addAttribute("", "type", "type", "", "CHOP");
+                attrs.addAttribute("", "count", "count", "",
+                        Integer.toString(nLocal));
+                sa.addStart("frame", attrs);
+                break;
+            case Opcodes.F_SAME:
+                attrs.addAttribute("", "type", "type", "", "SAME");
+                sa.addStart("frame", attrs);
+                break;
+            case Opcodes.F_SAME1:
+                attrs.addAttribute("", "type", "type", "", "SAME1");
+                sa.addStart("frame", attrs);
+                appendFrameTypes(false, 1, stack);
+                break;
+        }
+        sa.addEnd("frame");
+    }
+
+    private void appendFrameTypes(final boolean local, final int n,
+                                  final Object[] types) {
+        for (int i = 0; i < n; ++i) {
+            Object type = types[i];
+            AttributesImpl attrs = new AttributesImpl();
+            if (type instanceof String) {
+                attrs.addAttribute("", "type", "type", "", (String) type);
+            } else if (type instanceof Integer) {
+                attrs.addAttribute("", "type", "type", "",
+                        TYPES[((Integer) type).intValue()]);
+            } else {
+                attrs.addAttribute("", "type", "type", "", "uninitialized");
+                attrs.addAttribute("", "label", "label", "",
+                        getLabel((Label) type));
+            }
+            sa.addElement(local ? "local" : "stack", attrs);
+        }
+    }
+
+    @Override
+    public final void visitInsn(final int opcode) {
+        sa.addElement(Printer.OPCODES[opcode], new AttributesImpl());
+    }
+
+    @Override
+    public final void visitIntInsn(final int opcode, final int operand) {
+        AttributesImpl attrs = new AttributesImpl();
+        attrs.addAttribute("", "value", "value", "", Integer.toString(operand));
+        sa.addElement(Printer.OPCODES[opcode], attrs);
+    }
+
+    @Override
+    public final void visitVarInsn(final int opcode, final int var) {
+        AttributesImpl attrs = new AttributesImpl();
+        attrs.addAttribute("", "var", "var", "", Integer.toString(var));
+        sa.addElement(Printer.OPCODES[opcode], attrs);
+    }
+
+    @Override
+    public final void visitTypeInsn(final int opcode, final String type) {
+        AttributesImpl attrs = new AttributesImpl();
+        attrs.addAttribute("", "desc", "desc", "", type);
+        sa.addElement(Printer.OPCODES[opcode], attrs);
+    }
+
+    @Override
+    public final void visitFieldInsn(final int opcode, final String owner,
+                                     final String name, final String desc) {
+        AttributesImpl attrs = new AttributesImpl();
+        attrs.addAttribute("", "owner", "owner", "", owner);
+        attrs.addAttribute("", "name", "name", "", name);
+        attrs.addAttribute("", "desc", "desc", "", desc);
+        sa.addElement(Printer.OPCODES[opcode], attrs);
+    }
+
+    @Override
+    public final void visitMethodInsn(final int opcode, final String owner,
+                                      final String name, final String desc) {
+        AttributesImpl attrs = new AttributesImpl();
+        attrs.addAttribute("", "owner", "owner", "", owner);
+        attrs.addAttribute("", "name", "name", "", name);
+        attrs.addAttribute("", "desc", "desc", "", desc);
+        sa.addElement(Printer.OPCODES[opcode], attrs);
+    }
+
+    @Override
+    public void visitInvokeDynamicInsn(String name, String desc, Handle bsm,
+                                       Object... bsmArgs) {
+        AttributesImpl attrs = new AttributesImpl();
+        attrs.addAttribute("", "name", "name", "", name);
+        attrs.addAttribute("", "desc", "desc", "", desc);
+        attrs.addAttribute("", "bsm", "bsm", "",
+                SAXClassAdapter.encode(bsm.toString()));
+        sa.addStart("INVOKEDYNAMIC", attrs);
+        for (int i = 0; i < bsmArgs.length; i++) {
+            sa.addElement("bsmArg", getConstantAttribute(bsmArgs[i]));
+        }
+        sa.addEnd("INVOKEDYNAMIC");
+    }
+
+    @Override
+    public final void visitJumpInsn(final int opcode, final Label label) {
+        AttributesImpl attrs = new AttributesImpl();
+        attrs.addAttribute("", "label", "label", "", getLabel(label));
+        sa.addElement(Printer.OPCODES[opcode], attrs);
+    }
+
+    @Override
+    public final void visitLabel(final Label label) {
+        AttributesImpl attrs = new AttributesImpl();
+        attrs.addAttribute("", "name", "name", "", getLabel(label));
+        sa.addElement("Label", attrs);
+    }
+
+    @Override
+    public final void visitLdcInsn(final Object cst) {
+        sa.addElement(Printer.OPCODES[Opcodes.LDC], getConstantAttribute(cst));
+    }
+
+    @Override
+    public final void visitIincInsn(final int var, final int increment) {
+        AttributesImpl attrs = new AttributesImpl();
+        attrs.addAttribute("", "var", "var", "", Integer.toString(var));
+        attrs.addAttribute("", "inc", "inc", "", Integer.toString(increment));
+        sa.addElement(Printer.OPCODES[Opcodes.IINC], attrs);
+    }
+
+    @Override
+    public final void visitTableSwitchInsn(final int min, final int max,
+                                           final Label dflt, final Label... labels) {
+        AttributesImpl attrs = new AttributesImpl();
+        attrs.addAttribute("", "min", "min", "", Integer.toString(min));
+        attrs.addAttribute("", "max", "max", "", Integer.toString(max));
+        attrs.addAttribute("", "dflt", "dflt", "", getLabel(dflt));
+        String o = Printer.OPCODES[Opcodes.TABLESWITCH];
+        sa.addStart(o, attrs);
+        for (int i = 0; i < labels.length; i++) {
+            AttributesImpl att2 = new AttributesImpl();
+            att2.addAttribute("", "name", "name", "", getLabel(labels[i]));
+            sa.addElement("label", att2);
+        }
+        sa.addEnd(o);
+    }
+
+    @Override
+    public final void visitLookupSwitchInsn(final Label dflt, final int[] keys,
+                                            final Label[] labels) {
+        AttributesImpl att = new AttributesImpl();
+        att.addAttribute("", "dflt", "dflt", "", getLabel(dflt));
+        String o = Printer.OPCODES[Opcodes.LOOKUPSWITCH];
+        sa.addStart(o, att);
+        for (int i = 0; i < labels.length; i++) {
+            AttributesImpl att2 = new AttributesImpl();
+            att2.addAttribute("", "name", "name", "", getLabel(labels[i]));
+            att2.addAttribute("", "key", "key", "", Integer.toString(keys[i]));
+            sa.addElement("label", att2);
+        }
+        sa.addEnd(o);
+    }
+
+    @Override
+    public final void visitMultiANewArrayInsn(final String desc, final int dims) {
+        AttributesImpl attrs = new AttributesImpl();
+        attrs.addAttribute("", "desc", "desc", "", desc);
+        attrs.addAttribute("", "dims", "dims", "", Integer.toString(dims));
+        sa.addElement(Printer.OPCODES[Opcodes.MULTIANEWARRAY], attrs);
+    }
+
+    @Override
+    public final void visitTryCatchBlock(final Label start, final Label end,
+                                         final Label handler, final String type) {
+        AttributesImpl attrs = new AttributesImpl();
+        attrs.addAttribute("", "start", "start", "", getLabel(start));
+        attrs.addAttribute("", "end", "end", "", getLabel(end));
+        attrs.addAttribute("", "handler", "handler", "", getLabel(handler));
+        if (type != null) {
+            attrs.addAttribute("", "type", "type", "", type);
+        }
+        sa.addElement("TryCatch", attrs);
+    }
+
+    @Override
+    public final void visitMaxs(final int maxStack, final int maxLocals) {
+        AttributesImpl attrs = new AttributesImpl();
+        attrs.addAttribute("", "maxStack", "maxStack", "",
+                Integer.toString(maxStack));
+        attrs.addAttribute("", "maxLocals", "maxLocals", "",
+                Integer.toString(maxLocals));
+        sa.addElement("Max", attrs);
+
+        sa.addEnd("code");
+    }
+
+    @Override
+    public void visitLocalVariable(final String name, final String desc,
+                                   final String signature, final Label start, final Label end,
+                                   final int index) {
+        AttributesImpl attrs = new AttributesImpl();
+        attrs.addAttribute("", "name", "name", "", name);
+        attrs.addAttribute("", "desc", "desc", "", desc);
+        if (signature != null) {
+            attrs.addAttribute("", "signature", "signature", "",
+                    SAXClassAdapter.encode(signature));
+        }
+        attrs.addAttribute("", "start", "start", "", getLabel(start));
+        attrs.addAttribute("", "end", "end", "", getLabel(end));
+        attrs.addAttribute("", "var", "var", "", Integer.toString(index));
+        sa.addElement("LocalVar", attrs);
+    }
+
+    @Override
+    public final void visitLineNumber(final int line, final Label start) {
+        AttributesImpl attrs = new AttributesImpl();
+        attrs.addAttribute("", "line", "line", "", Integer.toString(line));
+        attrs.addAttribute("", "start", "start", "", getLabel(start));
+        sa.addElement("LineNumber", attrs);
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotationDefault() {
+        return new SAXAnnotationAdapter(sa, "annotationDefault", 0, null, null);
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotation(final String desc,
+                                             final boolean visible) {
+        return new SAXAnnotationAdapter(sa, "annotation", visible ? 1 : -1,
+                null, desc);
+    }
+
+    @Override
+    public AnnotationVisitor visitParameterAnnotation(final int parameter,
+                                                      final String desc, final boolean visible) {
+        return new SAXAnnotationAdapter(sa, "parameterAnnotation", visible ? 1
+                : -1, parameter, desc);
+    }
+
+    @Override
+    public void visitEnd() {
+        sa.addEnd("method");
+    }
+
+    private final String getLabel(final Label label) {
+        String name = labelNames.get(label);
+        if (name == null) {
+            name = Integer.toString(labelNames.size());
+            labelNames.put(label, name);
+        }
+        return name;
+    }
+
+}
diff --git a/src/main/asm/org/objectweb/asm/xml/SAXFieldAdapter.java b/src/main/asm/org/objectweb/asm/xml/SAXFieldAdapter.java
new file mode 100644
index 0000000..46a6bc3
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/xml/SAXFieldAdapter.java
@@ -0,0 +1,60 @@
+/***
+ * ASM XML Adapter
+ * Copyright (c) 2004-2011, Eugene Kuleshov
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.objectweb.asm.xml;
+
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.Opcodes;
+import org.xml.sax.Attributes;
+
+/**
+ * SAXFieldAdapter
+ *
+ * @author Eugene Kuleshov
+ */
+public final class SAXFieldAdapter extends FieldVisitor {
+    SAXAdapter sa;
+
+    public SAXFieldAdapter(final SAXAdapter sa, final Attributes att) {
+        super(Opcodes.ASM4);
+        this.sa = sa;
+        sa.addStart("field", att);
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
+        return new SAXAnnotationAdapter(sa, "annotation", visible ? 1 : -1, null, desc);
+    }
+
+    @Override
+    public void visitEnd() {
+        sa.addEnd("field");
+    }
+}
diff --git a/src/main/asm/org/objectweb/asm/xml/asm-xml.dtd b/src/main/asm/org/objectweb/asm/xml/asm-xml.dtd
new file mode 100644
index 0000000..b862085
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/xml/asm-xml.dtd
@@ -0,0 +1,349 @@
+<!--
+  ASM XML Adapter
+  Copyright (c) 2004-2011, Eugene Kuleshov
+  All rights reserved.
+  
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+  3. Neither the name of the copyright holders nor the names of its
+     contributors may be used to endorse or promote products derived from
+     this software without specific prior written permission.
+  
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+  THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<!--
+  This DTD must be used to create XML documents to be processed by
+  org.objectweb.asm.xml.ASMContentHandler
+-->
+
+<!--
+  Root element used to aggregate multiple classes into single document.
+-->
+<!ELEMENT classes ( class+ )>
+
+<!--
+  Root element for a single class.
+-->
+<!ELEMENT class ( interfaces, ( field | innerclass | method )*)>
+<!ATTLIST class access CDATA #REQUIRED>
+<!ATTLIST class name CDATA #REQUIRED>
+<!ATTLIST class parent CDATA #REQUIRED>
+<!ATTLIST class major CDATA #REQUIRED>
+<!ATTLIST class minor CDATA #REQUIRED>
+<!ATTLIST class source CDATA #IMPLIED>
+
+<!ELEMENT interfaces ( interface* )>
+<!ELEMENT interface EMPTY>
+<!ATTLIST interface name CDATA #REQUIRED>
+
+<!ELEMENT field EMPTY>
+<!ATTLIST field access CDATA #REQUIRED>
+<!ATTLIST field desc CDATA #REQUIRED>
+<!ATTLIST field name CDATA #REQUIRED>
+<!--
+  All characters out of interval 0x20 to 0x7f (inclusive) must
+  be encoded (\uXXXX) and character '\' must be replaced by "\\"
+-->
+<!ATTLIST field value CDATA #IMPLIED>
+
+<!ELEMENT innerclass EMPTY>
+<!ATTLIST innerclass access CDATA #REQUIRED>
+<!ATTLIST innerclass innerName CDATA #IMPLIED>
+<!ATTLIST innerclass name CDATA #REQUIRED>
+<!ATTLIST innerclass outerName CDATA #IMPLIED>
+
+<!--
+  Root element for method definition.
+-->
+<!ELEMENT method ( exceptions, code? )>
+<!ATTLIST method access CDATA #REQUIRED>
+<!ATTLIST method desc CDATA #REQUIRED>
+<!ATTLIST method name CDATA #REQUIRED>
+
+<!ELEMENT exceptions ( exception* )>
+<!ELEMENT exception EMPTY>
+<!ATTLIST exception name CDATA #REQUIRED>
+
+<!--
+  code element contains bytecode instructions and definitions for labels, line numbers, try/catch and max
+-->
+<!ELEMENT code (( AALOAD | AASTORE | ACONST_NULL | ALOAD | ANEWARRAY | ARETURN | ARRAYLENGTH | ASTORE | ATHROW | BALOAD | BASTORE | BIPUSH | CALOAD | CASTORE | CHECKCAST | D2F | D2I | D2L | DADD | DALOAD | DASTORE | DCMPG | DCMPL | DCONST_0 | DCONST_1 | DDIV | DLOAD | DMUL | DNEG | DREM | DRETURN | DSTORE | DSUB | DUP | DUP2 | DUP2_X1 | DUP2_X2 | DUP_X1 | DUP_X2 | SWAP | F2D | F2I | F2L | FADD | FALOAD | FASTORE | FCMPG | FCMPL | FCONST_0 | FCONST_1 | FCONST_2 | FDIV | FLOAD | FMUL | FNEG | FREM | FRETURN | FSTORE | FSUB | GETFIELD | GETSTATIC | GOTO | I2B | I2C | I2D | I2F | I2L | I2S | IADD | IALOAD | IAND | IASTORE | ICONST_0 | ICONST_1 | ICONST_2 | ICONST_3 | ICONST_4 | ICONST_5 | ICONST_M1 | IDIV | IFEQ | IFGE | IFGT | IFLE | IFLT | IFNE | IFNONNULL | IFNULL | IF_ACMPEQ | IF_ACMPNE | IF_ICMPEQ | IF_ICMPGE | IF_ICMPGT | IF_ICMPLE | IF_ICMPLT | IF_ICMPNE | IINC | ILOAD | IMUL | INEG | INSTANCEOF | INVOKEINTERFACE | INVOKESPECIAL | INVOKESTATIC | INVOKEVIRTUAL | IOR | IREM | IRETURN | ISHL | ISHR | ISTORE | ISUB | IUSHR | IXOR | JSR | L2D | L2F | L2I | LADD | LALOAD | LAND | LASTORE | LCMP | LCONST_0 | LCONST_1 | LDC | LDIV | LLOAD | LMUL | LNEG | LOOKUPSWITCH | LOR | LREM | LRETURN | LSHL | LSHR | LSTORE | LSUB | LUSHR | LXOR | MONITORENTER | MONITOREXIT | MULTIANEWARRAY | NEW | NEWARRAY | NOP | POP | POP2 | PUTFIELD | PUTSTATIC | RET | RETURN | SALOAD | SASTORE | SIPUSH | TABLESWITCH | Label | LineNumber | TryCatch )*, Max)>
+
+<!ELEMENT Label EMPTY>
+<!ATTLIST Label name CDATA #REQUIRED>
+
+<!ELEMENT TryCatch EMPTY>
+<!ATTLIST TryCatch end CDATA #REQUIRED>
+<!ATTLIST TryCatch handler CDATA #REQUIRED>
+<!ATTLIST TryCatch start CDATA #REQUIRED>
+<!ATTLIST TryCatch type CDATA #IMPLIED>
+
+<!ELEMENT LineNumber EMPTY>
+<!ATTLIST LineNumber line CDATA #REQUIRED>
+<!ATTLIST LineNumber start CDATA #REQUIRED>
+
+<!ELEMENT Max EMPTY>
+<!ATTLIST Max maxLocals CDATA #REQUIRED>
+<!ATTLIST Max maxStack CDATA #REQUIRED>
+
+<!ELEMENT AALOAD EMPTY>
+<!ELEMENT AASTORE EMPTY>
+<!ELEMENT ACONST_NULL EMPTY>
+<!ELEMENT ALOAD EMPTY>
+<!ATTLIST ALOAD var CDATA #REQUIRED>
+<!ELEMENT ANEWARRAY EMPTY>
+<!ATTLIST ANEWARRAY desc CDATA #REQUIRED>
+<!ELEMENT ARETURN EMPTY>
+<!ELEMENT ARRAYLENGTH EMPTY>
+<!ELEMENT ASTORE EMPTY>
+<!ATTLIST ASTORE var CDATA #REQUIRED>
+<!ELEMENT ATHROW EMPTY>
+<!ELEMENT BALOAD EMPTY>
+<!ELEMENT BASTORE EMPTY>
+<!ELEMENT BIPUSH EMPTY>
+<!ATTLIST BIPUSH value CDATA #REQUIRED>
+<!ELEMENT CALOAD EMPTY>
+<!ELEMENT CASTORE EMPTY>
+<!ELEMENT CHECKCAST EMPTY>
+<!ATTLIST CHECKCAST desc CDATA #REQUIRED>
+<!ELEMENT D2F EMPTY>
+<!ELEMENT D2I EMPTY>
+<!ELEMENT D2L EMPTY>
+<!ELEMENT DADD EMPTY>
+<!ELEMENT DALOAD EMPTY>
+<!ELEMENT DASTORE EMPTY>
+<!ELEMENT DCMPG EMPTY>
+<!ELEMENT DCMPL EMPTY>
+<!ELEMENT DCONST_0 EMPTY>
+<!ELEMENT DCONST_1 EMPTY>
+<!ELEMENT DDIV EMPTY>
+<!ELEMENT DLOAD EMPTY>
+<!ATTLIST DLOAD var CDATA #REQUIRED>
+<!ELEMENT DMUL EMPTY>
+<!ELEMENT DNEG EMPTY>
+<!ELEMENT DREM EMPTY>
+<!ELEMENT DRETURN EMPTY>
+<!ELEMENT DSTORE EMPTY>
+<!ATTLIST DSTORE var CDATA #REQUIRED>
+<!ELEMENT DSUB EMPTY>
+<!ELEMENT DUP EMPTY>
+<!ELEMENT DUP2 EMPTY>
+<!ELEMENT DUP2_X1 EMPTY>
+<!ELEMENT DUP2_X2 EMPTY>
+<!ELEMENT DUP_X1 EMPTY>
+<!ELEMENT DUP_X2 EMPTY>
+<!ELEMENT SWAP EMPTY>
+<!ELEMENT F2D EMPTY>
+<!ELEMENT F2I EMPTY>
+<!ELEMENT F2L EMPTY>
+<!ELEMENT FADD EMPTY>
+<!ELEMENT FALOAD EMPTY>
+<!ELEMENT FASTORE EMPTY>
+<!ELEMENT FCMPG EMPTY>
+<!ELEMENT FCMPL EMPTY>
+<!ELEMENT FCONST_0 EMPTY>
+<!ELEMENT FCONST_1 EMPTY>
+<!ELEMENT FCONST_2 EMPTY>
+<!ELEMENT FDIV EMPTY>
+<!ELEMENT FLOAD EMPTY>
+<!ATTLIST FLOAD var CDATA #REQUIRED>
+<!ELEMENT FMUL EMPTY>
+<!ELEMENT FNEG EMPTY>
+<!ELEMENT FREM EMPTY>
+<!ELEMENT FRETURN EMPTY>
+<!ELEMENT FSTORE EMPTY>
+<!ATTLIST FSTORE var CDATA #REQUIRED>
+<!ELEMENT FSUB EMPTY>
+<!ELEMENT GETFIELD EMPTY>
+<!ATTLIST GETFIELD desc CDATA #REQUIRED>
+<!ATTLIST GETFIELD name CDATA #REQUIRED>
+<!ATTLIST GETFIELD owner CDATA #REQUIRED>
+<!ELEMENT GETSTATIC EMPTY>
+<!ATTLIST GETSTATIC desc CDATA #REQUIRED>
+<!ATTLIST GETSTATIC name CDATA #REQUIRED>
+<!ATTLIST GETSTATIC owner CDATA #REQUIRED>
+<!ELEMENT GOTO EMPTY>
+<!ATTLIST GOTO label CDATA #REQUIRED>
+<!ELEMENT I2B EMPTY>
+<!ELEMENT I2C EMPTY>
+<!ELEMENT I2D EMPTY>
+<!ELEMENT I2F EMPTY>
+<!ELEMENT I2L EMPTY>
+<!ELEMENT I2S EMPTY>
+<!ELEMENT IADD EMPTY>
+<!ELEMENT IALOAD EMPTY>
+<!ELEMENT IAND EMPTY>
+<!ELEMENT IASTORE EMPTY>
+<!ELEMENT ICONST_0 EMPTY>
+<!ELEMENT ICONST_1 EMPTY>
+<!ELEMENT ICONST_2 EMPTY>
+<!ELEMENT ICONST_3 EMPTY>
+<!ELEMENT ICONST_4 EMPTY>
+<!ELEMENT ICONST_5 EMPTY>
+<!ELEMENT ICONST_M1 EMPTY>
+<!ELEMENT IDIV EMPTY>
+<!ELEMENT IFEQ EMPTY>
+<!ATTLIST IFEQ label CDATA #REQUIRED>
+<!ELEMENT IFGE EMPTY>
+<!ATTLIST IFGE label CDATA #REQUIRED>
+<!ELEMENT IFGT EMPTY>
+<!ATTLIST IFGT label CDATA #REQUIRED>
+<!ELEMENT IFLE EMPTY>
+<!ATTLIST IFLE label CDATA #REQUIRED>
+<!ELEMENT IFLT EMPTY>
+<!ATTLIST IFLT label CDATA #REQUIRED>
+<!ELEMENT IFNE EMPTY>
+<!ATTLIST IFNE label CDATA #REQUIRED>
+<!ELEMENT IFNONNULL EMPTY>
+<!ATTLIST IFNONNULL label CDATA #REQUIRED>
+<!ELEMENT IFNULL EMPTY>
+<!ATTLIST IFNULL label CDATA #REQUIRED>
+<!ELEMENT IF_ACMPEQ EMPTY>
+<!ATTLIST IF_ACMPEQ label CDATA #REQUIRED>
+<!ELEMENT IF_ACMPNE EMPTY>
+<!ATTLIST IF_ACMPNE label CDATA #REQUIRED>
+<!ELEMENT IF_ICMPEQ EMPTY>
+<!ATTLIST IF_ICMPEQ label CDATA #REQUIRED>
+<!ELEMENT IF_ICMPGE EMPTY>
+<!ATTLIST IF_ICMPGE label CDATA #REQUIRED>
+<!ELEMENT IF_ICMPGT EMPTY>
+<!ATTLIST IF_ICMPGT label CDATA #REQUIRED>
+<!ELEMENT IF_ICMPLE EMPTY>
+<!ATTLIST IF_ICMPLE label CDATA #REQUIRED>
+<!ELEMENT IF_ICMPLT EMPTY>
+<!ATTLIST IF_ICMPLT label CDATA #REQUIRED>
+<!ELEMENT IF_ICMPNE EMPTY>
+<!ATTLIST IF_ICMPNE label CDATA #REQUIRED>
+<!ELEMENT IINC EMPTY>
+<!ATTLIST IINC inc CDATA #REQUIRED>
+<!ATTLIST IINC var CDATA #REQUIRED>
+<!ELEMENT ILOAD EMPTY>
+<!ATTLIST ILOAD var CDATA #REQUIRED>
+<!ELEMENT IMUL EMPTY>
+<!ELEMENT INEG EMPTY>
+<!ELEMENT INSTANCEOF EMPTY>
+<!ATTLIST INSTANCEOF desc CDATA #REQUIRED>
+<!ELEMENT INVOKEINTERFACE EMPTY>
+<!ATTLIST INVOKEINTERFACE desc CDATA #REQUIRED>
+<!ATTLIST INVOKEINTERFACE name CDATA #REQUIRED>
+<!ATTLIST INVOKEINTERFACE owner CDATA #REQUIRED>
+<!ELEMENT INVOKESPECIAL EMPTY>
+<!ATTLIST INVOKESPECIAL desc CDATA #REQUIRED>
+<!ATTLIST INVOKESPECIAL name CDATA #REQUIRED>
+<!ATTLIST INVOKESPECIAL owner CDATA #REQUIRED>
+<!ELEMENT INVOKESTATIC EMPTY>
+<!ATTLIST INVOKESTATIC desc CDATA #REQUIRED>
+<!ATTLIST INVOKESTATIC name CDATA #REQUIRED>
+<!ATTLIST INVOKESTATIC owner CDATA #REQUIRED>
+<!ELEMENT INVOKEVIRTUAL EMPTY>
+<!ATTLIST INVOKEVIRTUAL desc CDATA #REQUIRED>
+<!ATTLIST INVOKEVIRTUAL name CDATA #REQUIRED>
+<!ATTLIST INVOKEVIRTUAL owner CDATA #REQUIRED>
+<!ELEMENT INVOKEDYNAMIC ( bsmArgs+ )>
+<!ATTLIST INVOKEDYNAMIC desc CDATA #REQUIRED>
+<!ATTLIST INVOKEDYNAMIC name CDATA #REQUIRED>
+<!ATTLIST INVOKEDYNAMIC bsm CDATA #REQUIRED>
+<!ELEMENT bsmArgs EMPTY>
+<!ATTLIST bsmArgs cst CDATA #REQUIRED>
+<!ATTLIST bsmArgs desc CDATA #REQUIRED>
+<!ELEMENT IOR EMPTY>
+<!ELEMENT IREM EMPTY>
+<!ELEMENT IRETURN EMPTY>
+<!ELEMENT ISHL EMPTY>
+<!ELEMENT ISHR EMPTY>
+<!ELEMENT ISTORE EMPTY>
+<!ATTLIST ISTORE var CDATA #REQUIRED>
+<!ELEMENT ISUB EMPTY>
+<!ELEMENT IUSHR EMPTY>
+<!ELEMENT IXOR EMPTY>
+<!ELEMENT JSR EMPTY>
+<!ATTLIST JSR label CDATA #REQUIRED>
+<!ELEMENT L2D EMPTY>
+<!ELEMENT L2F EMPTY>
+<!ELEMENT L2I EMPTY>
+<!ELEMENT LADD EMPTY>
+<!ELEMENT LALOAD EMPTY>
+<!ELEMENT LAND EMPTY>
+<!ELEMENT LASTORE EMPTY>
+<!ELEMENT LCMP EMPTY>
+<!ELEMENT LCONST_0 EMPTY>
+<!ELEMENT LCONST_1 EMPTY>
+<!ELEMENT LDC EMPTY>
+<!--
+  All characters out of interval 0x20 to 0x7f (inclusive) must
+  be encoded (\uXXXX) and character '\' must be replaced by "\\"
+-->
+<!ATTLIST LDC cst CDATA #REQUIRED>
+<!ATTLIST LDC desc CDATA #REQUIRED>
+<!ELEMENT LDIV EMPTY>
+<!ELEMENT LLOAD EMPTY>
+<!ATTLIST LLOAD var CDATA #REQUIRED>
+<!ELEMENT LMUL EMPTY>
+<!ELEMENT LNEG EMPTY>
+<!ELEMENT LOR EMPTY>
+<!ELEMENT LREM EMPTY>
+<!ELEMENT LRETURN EMPTY>
+<!ELEMENT LSHL EMPTY>
+<!ELEMENT LSHR EMPTY>
+<!ELEMENT LSTORE EMPTY>
+<!ATTLIST LSTORE var CDATA #REQUIRED>
+<!ELEMENT LSUB EMPTY>
+<!ELEMENT LUSHR EMPTY>
+<!ELEMENT LXOR EMPTY>
+<!ELEMENT MONITORENTER EMPTY>
+<!ELEMENT MONITOREXIT EMPTY>
+<!ELEMENT MULTIANEWARRAY EMPTY>
+<!ATTLIST MULTIANEWARRAY desc CDATA #REQUIRED>
+<!ATTLIST MULTIANEWARRAY dims CDATA #REQUIRED>
+<!ELEMENT NEW EMPTY>
+<!ATTLIST NEW desc CDATA #REQUIRED>
+<!ELEMENT NEWARRAY EMPTY>
+<!ATTLIST NEWARRAY value CDATA #REQUIRED>
+<!ELEMENT NOP EMPTY>
+<!ELEMENT POP EMPTY>
+<!ELEMENT POP2 EMPTY>
+<!ELEMENT PUTFIELD EMPTY>
+<!ATTLIST PUTFIELD desc CDATA #REQUIRED>
+<!ATTLIST PUTFIELD name CDATA #REQUIRED>
+<!ATTLIST PUTFIELD owner CDATA #REQUIRED>
+<!ELEMENT PUTSTATIC EMPTY>
+<!ATTLIST PUTSTATIC desc CDATA #REQUIRED>
+<!ATTLIST PUTSTATIC name CDATA #REQUIRED>
+<!ATTLIST PUTSTATIC owner CDATA #REQUIRED>
+<!ELEMENT RET EMPTY>
+<!ATTLIST RET var CDATA #REQUIRED>
+<!ELEMENT RETURN EMPTY>
+<!ELEMENT SALOAD EMPTY>
+<!ELEMENT SASTORE EMPTY>
+<!ELEMENT SIPUSH EMPTY>
+<!ATTLIST SIPUSH value CDATA #REQUIRED>
+
+<!ELEMENT LOOKUPSWITCH ( label+ )>
+<!ATTLIST LOOKUPSWITCH dflt CDATA #REQUIRED>
+
+<!ELEMENT TABLESWITCH ( label+ )>
+<!ATTLIST TABLESWITCH dflt CDATA #REQUIRED>
+<!ATTLIST TABLESWITCH max CDATA #REQUIRED>
+<!ATTLIST TABLESWITCH min CDATA #REQUIRED>
+
+<!ELEMENT label EMPTY>
+<!ATTLIST label key CDATA #IMPLIED>
+<!ATTLIST label name CDATA #REQUIRED>
+
diff --git a/src/main/asm/org/objectweb/asm/xml/package.html b/src/main/asm/org/objectweb/asm/xml/package.html
new file mode 100644
index 0000000..d7bbe66
--- /dev/null
+++ b/src/main/asm/org/objectweb/asm/xml/package.html
@@ -0,0 +1,96 @@
+<html>
+<!--
+ * ASM XML Adapter
+ * Copyright (c) 2004-2011, Eugene Kuleshov
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<body>
+Provides <a href="http://sax.sourceforge.net/">SAX 2.0</a> adapters for ASM
+visitors to convert classes to and from XML.
+These adapters can be chained with other SAX compliant content handlers and
+filters, eg. XSLT or XQuery engines. This package is bundled as
+a separate <tt>asm-xml.jar</tt> library and requires <tt>asm.jar</tt>.
+<p>
+<tt>ASMContentHandler</tt> and <tt>SAXClassAdapter/SAXCodeAdapter</tt>
+are using <a href="asm-xml.dtd">asm-xml.dtd</a>.
+Here is the example of bytecode to bytecode XSLT transformation.
+
+<pre>
+    SAXTransformerFactory saxtf = ( SAXTransformerFactory) TransformerFactory.newInstance();
+    Templates templates = saxtf.newTemplates( xsltSource);
+
+    TransformerHandler handler = saxtf.newTransformerHandler( templates);
+    handler.setResult( new SAXResult( new ASMContentHandler( outputStream, computeMax)));
+
+    ClassReader cr = new ClassReader( bytecode);
+    cr.accept( new SAXClassAdapter( handler, cr.getVersion(), false), false);
+</pre>
+
+See JAXP and SAX documentation for more detils.
+
+<p>
+There are few illustrations of the bytecode transformation with XSLT in
+examples directory. The following XSLT procesors has been tested.
+
+<blockquote>
+<table border="1" cellspacing="0" cellpadding="3">
+<tr>
+<th>Engine</td>
+<th>javax.xml.transform.TransformerFactory property</td>
+</tr>
+
+<tr>
+<td>jd.xslt</td>
+<td>jd.xml.xslt.trax.TransformerFactoryImpl</td>
+</tr>
+
+<tr>
+<td>Saxon</td>
+<td>net.sf.saxon.TransformerFactoryImpl</td>
+</tr>
+
+<tr>
+<td>Caucho</td>
+<td>com.caucho.xsl.Xsl</td>
+</tr>
+
+<tr>
+<td>Xalan interpeter</td>
+<td>org.apache.xalan.processor.TransformerFactory</td>
+</tr>
+
+<tr>
+<td>Xalan xsltc</td>
+<td>org.apache.xalan.xsltc.trax.TransformerFactoryImpl</td>
+</tr>
+</table>
+</blockquote>
+
+@since ASM 1.4.3
+
+</body>
+</html>
diff --git a/src/main/base/org/bdware/sc/ComponedContractResult.java b/src/main/base/org/bdware/sc/ComponedContractResult.java
new file mode 100644
index 0000000..7942b2d
--- /dev/null
+++ b/src/main/base/org/bdware/sc/ComponedContractResult.java
@@ -0,0 +1,147 @@
+package org.bdware.sc;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.bdware.sc.util.JsonUtil;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class ComponedContractResult {
+    //    public static final String RecoveringStr = "";
+    public static final String EXPIRED_REQ = "requestID expired";
+    private static final Logger LOGGER = LogManager.getLogger(ComponedContractResult.class);
+    private final int THRESHOLD; //  >=的结果可返回
+    Map<String, ContractResult> resultMap = new HashMap<>(); // 只有状态是Success的返回结果会存在这个map中
+    Set<String> problemNodes = new HashSet<>();
+
+    // FAFH仅需要一半的一半一致即可?
+    public ComponedContractResult(int c) {
+        THRESHOLD = (int) Math.ceil((double) c / 2);
+    }
+
+    public synchronized void add(JsonObject obj) {
+        // 节点isRecovering
+        if (obj.has("status")
+                && obj.get("status").getAsString().equals("Error")
+                && obj.has("result")
+                && obj.get("result").getAsString().equals("not fine")) {
+            LOGGER.info("加入一个节点的执行结果是not infe!该节点不是正常运行状态!");
+            String nodeID = obj.get("nodeID").getAsString();
+            problemNodes.add(nodeID);
+            LOGGER.info("问题节点中加入 " + nodeID.substring(0, 5));
+            return;
+        }
+
+        // 节点下线，不用在此处恢复，心跳已经发现问题了
+        if (obj.has("status") && obj.get("status").getAsString().equals("Error")) {
+            LOGGER.info("加入一个节点的执行结果是Error!该节点下线!");
+            return;
+        }
+
+        ContractResult cr2;
+        try {
+
+            cr2 = JsonUtil.fromJson(obj.get("data").getAsString(), ContractResult.class);
+            if (cr2.status == ContractResult.Status.Error
+                    && cr2.result.getAsString().equals(EXPIRED_REQ)) {
+                return;
+            }
+        } catch (Exception e) {
+            cr2 =
+                    new ContractResult(
+                            ContractResult.Status.Error, new JsonPrimitive("parse str failed:"));
+            e.printStackTrace();
+        }
+        // if (cr2.status == ContractResult.Status.Error) { // 结果不是Success不参与最终结果计算
+        //   String nodeID = obj.get("nodeID").getAsString();
+        //  logger.info("problemsNodes中加入 " + nodeID);
+        //  problemNodes.add(nodeID);
+        //  return;
+        // }
+        //  if(cr2.status == ContractResult.Status.Exception){
+        //    return;
+        // }
+        // cr2.executeTime.add(obj.get("executeTime").getAsLong());
+        resultMap.put(obj.get("nodeID").getAsString(), cr2);
+    }
+
+    public ContractResult figureFinalResult() {
+        ContractResult finalResult = null;
+
+        Map<JsonElement, Integer> map = new ConcurrentHashMap<>(); // <结果，出现次数>
+        Map<JsonElement, ContractResult> tempMap =
+                new ConcurrentHashMap<>(); // key为C哦耨天然磁铁Result的result字段
+
+        for (String nodeID : resultMap.keySet()) {
+            ContractResult tempResult = resultMap.get(nodeID);
+            if (tempResult.result == null) tempResult.result = JsonNull.INSTANCE;
+            JsonElement str = tempResult.result;
+            // 遍历各个节点的返回结果
+            if (!map.containsKey(str)) {
+                map.put(str, 1);
+                tempMap.put(str, tempResult);
+            } else {
+                int temp = map.get(str);
+                map.put(str, temp + 1);
+            }
+        }
+
+        for (JsonElement str : map.keySet()) {
+            if (map.get(str) >= THRESHOLD) {
+                finalResult = tempMap.get(str);
+                break;
+            }
+        }
+
+        if (finalResult != null) {
+            finalResult.size = map.get(finalResult.result);
+            for (String nodeID : resultMap.keySet()) {
+                ContractResult temp = resultMap.get(nodeID);
+                if (!temp.result.equals(finalResult.result)
+                        && temp.status == ContractResult.Status.Error) {
+                    problemNodes.add(nodeID);
+                }
+            }
+        } else {
+            // 返回结果，无多于一半一致
+            finalResult =
+                    new ContractResult(
+                            ContractResult.Status.Error, new JsonPrimitive("invalid result"));
+            finalResult.analysis = JsonUtil.toPrettyJson(resultMap);
+        }
+
+        return finalResult;
+    }
+
+    public ContractResult mergeFinalResult() {
+        LOGGER.info("mergeFinalResult");
+
+        Map<JsonElement, Integer> map = new ConcurrentHashMap<>(); // <结果，出现次数>
+
+        // JsonParser
+        JsonObject allJo = new JsonObject();
+        ContractResult contractResult = new ContractResult(ContractResult.Status.Success, allJo);
+        // TODO @bitvincent
+        for (String nodeID : resultMap.keySet()) {
+            // 取出
+            ContractResult tempResult = resultMap.get(nodeID); // 取出结果
+            if (tempResult != null) {
+                allJo.add(nodeID, tempResult.result);
+            }
+            // 合并结果
+        }
+        return contractResult;
+    }
+
+    public Set<String> getProblemNodes() {
+        return problemNodes;
+    }
+}
diff --git a/src/main/base/org/bdware/sc/ContractGenerator.java b/src/main/base/org/bdware/sc/ContractGenerator.java
new file mode 100644
index 0000000..1ae4d8e
--- /dev/null
+++ b/src/main/base/org/bdware/sc/ContractGenerator.java
@@ -0,0 +1,61 @@
+package org.bdware.sc;
+
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.runtime.RuntimeConstants;
+import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
+import org.bdware.sc.util.JsonUtil;
+
+import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ContractGenerator {
+    static VelocityEngine ve = init();
+
+    public static String generateAPIContract(long availableDate, String url, String method, Map<String, String> header,
+                                             Map<String, String> arg) {
+        VelocityContext ctx = new VelocityContext();
+
+        Template script = ve.getTemplate("org/bdware/sc/sc/datacontract.vm");
+        String[][] initList = {{"availableDate", availableDate + ""}, {"baseUrl", stringify(url)},
+                {"method", stringify(method)}, {"headers", convertMap(header)}, {"arg", convertMap(arg)}};
+        ctx.put("initList", initList);
+        ctx.put("validate", "YancloudUtil.currentTimeMillis()>Global.availableDate");
+        ctx.put("validateFailedMsg", "\"key expired\"");
+        StringWriter writer = new StringWriter();
+        script.merge(ctx, writer);
+        return writer.toString();
+    }
+
+    private static VelocityEngine init() {
+        VelocityEngine ve = new VelocityEngine();
+        ve.setProperty(RuntimeConstants.RESOURCE_LOADER, "classpath");
+        ve.setProperty("classpath.resource.loader.class", ClasspathResourceLoader.class.getName());
+        ve.init();
+        return ve;
+    }
+
+    public static String generateFTPContract(long availableDate) {
+        VelocityContext ctx = new VelocityContext();
+        Template script = ve.getTemplate("org/bdware/sc/sc/ftpcontract.vm");
+        String[][] initList = {{"availableDate", availableDate + ""}};
+        ctx.put("initList", initList);
+        ctx.put("validate", "YancloudUtil.currentTimeMillis()>Global.availableDate");
+        StringWriter writer = new StringWriter();
+        script.merge(ctx, writer);
+        return writer.toString();
+    }
+
+    private static String stringify(String url) {
+        return JsonUtil.toJson(url);
+    }
+
+    private static String convertMap(Map<String, String> arg) {
+        if (arg == null) {
+            arg = new HashMap<>();
+        }
+        return JsonUtil.toJson(arg);
+    }
+}
diff --git a/src/main/base/org/bdware/sc/ContractLog.java b/src/main/base/org/bdware/sc/ContractLog.java
new file mode 100644
index 0000000..5361395
--- /dev/null
+++ b/src/main/base/org/bdware/sc/ContractLog.java
@@ -0,0 +1,15 @@
+package org.bdware.sc;
+
+public class ContractLog {
+    public String date;
+    public String type;
+    public String value;
+
+    public ContractLog(String k, String v) {
+        String[] keys = k.split(";");
+        date = keys[0];
+        type = keys[1];
+        value = v;
+    }
+
+}
diff --git a/src/main/base/org/bdware/sc/ContractPort.java b/src/main/base/org/bdware/sc/ContractPort.java
new file mode 100644
index 0000000..8dd274e
--- /dev/null
+++ b/src/main/base/org/bdware/sc/ContractPort.java
@@ -0,0 +1,123 @@
+package org.bdware.sc;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.bdware.sc.db.CMTables;
+import org.bdware.sc.db.KeyValueDBUtil;
+import org.bdware.sc.util.JsonUtil;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class ContractPort {
+    private static final Logger LOGGER = LogManager.getLogger(ContractPort.class);
+    private static final String USED_PORTS = "USED_PORTS";
+
+    private final AtomicInteger port;
+    private final int beginningPort;
+    private final Set<Integer> usedPorts;
+    private int CMPort;
+
+    public ContractPort(int startPort) {
+        port = new AtomicInteger(startPort);
+        beginningPort = startPort;
+
+        usedPorts = new HashSet<>();
+    }
+
+    public int getPortAndInc() {
+        int portInt = port.getAndIncrement();
+        if (portInt > 65535) {
+            port.set(beginningPort);
+            portInt = beginningPort;
+        }
+        return portInt;
+    }
+
+    public void reSetPort(int p) {
+        if (p > 65535) {
+            port.set(beginningPort);
+        } else {
+            port.set(p);
+        }
+    }
+
+    public int getCMPort() {
+        return CMPort;
+    }
+
+    public void setCMPort(int cmPort) {
+        CMPort = cmPort;
+        LOGGER.info("cmPort is set to " + cmPort);
+    }
+
+    public void visitReconnectPortRange(PortVisitor v) {
+        try {
+            int[] usedPorts = JsonUtil.fromJson(
+                    KeyValueDBUtil.instance.getValue(CMTables.ContractInfo.toString(), USED_PORTS),
+                    int[].class);
+            if (null == usedPorts || usedPorts.length == 0) {
+                throw new NullPointerException();
+            }
+            LOGGER.info("visit CP port in " + Arrays.toString(usedPorts));
+            int maxUsedPort = -1;
+            for (int port : usedPorts) {
+                if (v.visit(port)) {
+                    updateUsedPorts(port, true);
+                    if (port > maxUsedPort) {
+                        maxUsedPort = port;
+                    }
+                }
+            }
+            if (maxUsedPort > this.port.get()) {
+                this.port.set(maxUsedPort + 1);
+            }
+        } catch (Exception ignored) {
+            int endPort = beginningPort + 30;
+            for (int port = beginningPort; port < endPort; ++port) {
+                if (v.visit(port)) {
+                    updateUsedPorts(port, true);
+                }
+            }
+            LOGGER.info("visit CP port form 1616 to 1646");
+            for (int port = 1616; port < 1646; ++port) {
+                if (port >= beginningPort && port < endPort) {
+                    continue;
+                }
+                if (v.visit(port)) {
+                    updateUsedPorts(port, true);
+                }
+            }
+        }
+        updateDb();
+    }
+
+    public void updateDb(int port, boolean isAdd) {
+        updateUsedPorts(port, isAdd);
+        updateDb();
+    }
+
+    private void updateUsedPorts(int port, boolean isAdd) {
+        if (isAdd) {
+            usedPorts.add(port);
+        } else {
+            usedPorts.remove(port);
+        }
+    }
+
+    private synchronized void updateDb() {
+        KeyValueDBUtil.instance.setValue(CMTables.ContractInfo.toString(), USED_PORTS, JsonUtil.toJson(usedPorts));
+    }
+
+    interface PortVisitor {
+        /**
+         * check if the port is listened
+         *
+         * @param port port number
+         * @return whether some program listens to the port
+         */
+        boolean visit(int port);
+    }
+}
diff --git a/src/main/base/org/bdware/sc/ContractPrinter.java b/src/main/base/org/bdware/sc/ContractPrinter.java
new file mode 100644
index 0000000..5078fd0
--- /dev/null
+++ b/src/main/base/org/bdware/sc/ContractPrinter.java
@@ -0,0 +1,64 @@
+package org.bdware.sc;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.io.PrintStream;
+import java.util.*;
+
+public class ContractPrinter extends Thread {
+    private static final Logger LOGGER = LogManager.getLogger(ContractPrinter.class);
+    private Process p;
+    private Scanner sc;
+    private String TAG;
+    private List<PrintStream> psList;
+    private Set<PrintStream> toRemove;
+
+    public void track(Process process, Scanner sc, String tag, PrintStream printStream) {
+        p = process;
+        this.sc = sc;
+        this.TAG = tag;
+        psList = new ArrayList<>();
+        if (null != printStream) {
+            psList.add(printStream);
+        }
+        toRemove = new HashSet<>();
+        start();
+    }
+
+    public synchronized void redirect(PrintStream ps, String tag) {
+        if (null != psList && !psList.contains(ps)) {
+            psList.add(ps);
+        }
+        this.TAG = tag;
+    }
+
+    public void run() {
+        try {
+            while (sc.hasNextLine()) {
+                String content = sc.nextLine();
+                if (psList.size() == 0) {
+                    System.out.println(TAG + content);
+                } else {
+                    printInList(content);
+                }
+            }
+        } catch (Exception e) {
+            LOGGER.warn(e.getMessage());
+        }
+    }
+
+    private synchronized void printInList(String content) {
+        for (PrintStream ps : psList) {
+            try {
+                ps.println(TAG + content);
+            } catch (Exception e) {
+                LOGGER.warn(e.getMessage());
+                toRemove.add(ps);
+            }
+        }
+        psList.removeAll(toRemove);
+        toRemove.clear();
+    }
+
+}// Printer
\ No newline at end of file
diff --git a/src/main/base/org/bdware/sc/ContractResult.java b/src/main/base/org/bdware/sc/ContractResult.java
new file mode 100644
index 0000000..e61676e
--- /dev/null
+++ b/src/main/base/org/bdware/sc/ContractResult.java
@@ -0,0 +1,31 @@
+package org.bdware.sc;
+
+import com.google.gson.JsonElement;
+import org.bdware.sc.event.REvent;
+
+import java.util.List;
+
+public class ContractResult {
+    public boolean needSeq = false;
+    public int seq;
+    public Status status;
+    public JsonElement result;
+    public String analysis;
+    public boolean isInsnLimit;
+    public String branch;
+    public long totalGas = 0L;
+    public long executionGas = 0L;
+    public long extraGas = 0L;
+    public int size = 0;
+    public List<REvent> events = null;
+    public boolean eventRelated = false;
+
+    public ContractResult(Status status, JsonElement result) {
+        this.status = status;
+        this.result = result;
+    }
+
+    public enum Status {
+        Success, Exception, Error
+    }
+}
\ No newline at end of file
diff --git a/src/main/base/org/bdware/sc/DX.java b/src/main/base/org/bdware/sc/DX.java
new file mode 100644
index 0000000..791d586
--- /dev/null
+++ b/src/main/base/org/bdware/sc/DX.java
@@ -0,0 +1,44 @@
+package org.bdware.sc;
+
+import com.android.dx.cf.direct.DirectClassFile;
+import com.android.dx.cf.direct.StdAttributeFactory;
+import com.android.dx.command.dexer.DxContext;
+import com.android.dx.dex.DexOptions;
+import com.android.dx.dex.cf.CfOptions;
+import com.android.dx.dex.cf.CfTranslator;
+import com.android.dx.dex.file.ClassDefItem;
+import com.android.dx.dex.file.DexFile;
+
+import java.util.Map;
+
+public class DX {
+    public static byte[] clzsToDex(Map<String, byte[]> clzs) {
+        try {
+            DxContext context = new DxContext();
+            DexOptions dexOptions = new DexOptions();
+            dexOptions.minSdkVersion = 26;
+            CfOptions cfOptions = new CfOptions();
+            DexFile outputDex = new DexFile(dexOptions);
+            for (String str : clzs.keySet()) {
+                DirectClassFile dcf =
+                        new DirectClassFile(
+                                clzs.get(str),
+                                toInternalName(str) + ".class",
+                                cfOptions.strictNameCheck);
+                dcf.setAttributeFactory(StdAttributeFactory.THE_ONE);
+                ClassDefItem item =
+                        CfTranslator.translate(
+                                context, dcf, clzs.get(str), cfOptions, dexOptions, outputDex);
+                outputDex.add(item);
+            }
+            return outputDex.toDex(null, false);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public static String toInternalName(String plain) {
+        return plain.replaceAll("\\.", "/");
+    }
+}
diff --git a/src/main/base/org/bdware/sc/JSEngine.java b/src/main/base/org/bdware/sc/JSEngine.java
new file mode 100644
index 0000000..22196d8
--- /dev/null
+++ b/src/main/base/org/bdware/sc/JSEngine.java
@@ -0,0 +1,24 @@
+package org.bdware.sc;
+
+import org.bdware.sc.bean.Contract;
+import org.bdware.sc.bean.ContractRequest;
+import org.bdware.sc.node.ContractNode;
+
+import javax.script.ScriptEngine;
+
+public abstract class JSEngine implements ScriptEngine {
+
+    public abstract ContractResult executeContract(ContractRequest input);
+
+    // public abstract ContractResult loadContract(ContractNode in, boolean isInsnLimit);
+
+    /**
+     * Load a contract into contract engine
+     *
+     * @param contract     the contract
+     * @param contractNode a contract node generated by YJS compiler
+     * @return whether contract is loaded successfully
+     */
+    public abstract ContractResult loadContract(
+            Contract contract, ContractNode contractNode, boolean isInsnLim);
+}
diff --git a/src/main/base/org/bdware/sc/Jedion.java b/src/main/base/org/bdware/sc/Jedion.java
new file mode 100644
index 0000000..088e7ed
--- /dev/null
+++ b/src/main/base/org/bdware/sc/Jedion.java
@@ -0,0 +1,390 @@
+package org.bdware.sc;
+
+import com.sleepycat.bind.EntryBinding;
+import com.sleepycat.bind.serial.SerialBinding;
+import com.sleepycat.bind.serial.StoredClassCatalog;
+import com.sleepycat.collections.StoredMap;
+import com.sleepycat.je.*;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Jedion {
+    private static final Logger LOGGER = LogManager.getLogger(Jedion.class);
+    //    static ExecutorService executor = Executors.newFixedThreadPool(1);
+    private EnvironmentConfig envConfig = null; // 数据库环境配置对象
+    private Environment myDbEnvironment = null; // 数据库环境对象
+    private DatabaseConfig dbConfig = null; // 数据库配置对象
+    // private Database myDatabaseConf = null;// 数据库对象-Conf
+    // private Database myDatabaseUsers = null;// 数据库对象-Users
+    private Database myDatabase; // 引用
+    private StoredMap pendingDB = null;
+    private String dbName = "yjs"; // 数据库名称
+
+    public Jedion(String dbName) {
+        this.dbName = dbName;
+    }
+
+    public void configEnvironment(File envDir) {
+        envConfig = new EnvironmentConfig();
+        envConfig.setAllowCreate(true); // 如果设置了true则表示当数据库环境不存在时候重新创建一个数据库环境，默认为false.
+        envConfig.setTransactional(true); // 事务支持,如果为true，则表示当前环境支持事务处理，默认为false，不支持事务处理。
+        envConfig.setReadOnly(false); // 是否以只读方式打开，默认为false.
+        /*
+         * envConfig.setCachePercent(50);//设置当前环境能够使用的RAM占整个JVM百分比
+         * envConfig.setCacheSize(102400);//设置当前环境能使用的最大RAM,单位为byte
+         */
+
+        try {
+            myDbEnvironment = new Environment(envDir, envConfig);
+        } catch (DatabaseException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    // 配置创建完环境对象后，可以用它创建数据库
+    public void createDatabase() {
+        dbConfig = new DatabaseConfig();
+        dbConfig.setAllowCreate(true); // 如果设置了true则表示当数据库不存在时候重新创建一个数据库，默认为false.
+        dbConfig.setTransactional(true); // 事务支持,如果为true，则表示当前数据库支持事务处理，默认为false，不支持事务处理。
+        dbConfig.setReadOnly(false); // 是否以只读方式打开，默认为false.
+        /*
+         * dbConfig.setBtreeComparator();//设置用于Btree比较的比较器，通常是用来排序
+         * dbConfig.setDuplicateComparator();//设置用来比较一个key有两个不同值的时候的大小比较器。
+         * dbConfig.setSortedDuplicates(true);//设置一个key是否允许存储多个值，true代表允许，默认false.
+         * dbConfig.setExclusiveCreate(true);//以独占的方式打开，也就是说同一个时间只能有一实例打开这个database。
+         */
+        try {
+            myDatabase = myDbEnvironment.openDatabase(null, dbName, dbConfig);
+            String CLASS_CATALOG = "java_class_catalog";
+            Database catalogDatabase = myDbEnvironment.openDatabase(null, CLASS_CATALOG, dbConfig);
+            // myDatabase = myDbEnvironment.openDatabase(null, dbName+"Users", dbConfig);
+            // System.out.println("[Jedion]createDatabase " + myDatabase.getDatabaseName());
+            StoredClassCatalog catalog = new StoredClassCatalog(catalogDatabase);
+            EntryBinding keyBinding = new SerialBinding(catalog, byte[].class);
+            pendingDB = new StoredMap(myDatabase, keyBinding, keyBinding, true);
+        } catch (DatabaseException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    public void writeToDatabase(final String key, final String value, final boolean isOverwrite) {
+        try {
+            writeToDatabaseInternal(key, value, isOverwrite);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        //        executor.execute(() -> {
+        //            try {
+        //                writeToDatabaseInternal(key, value, isOverwrite);
+        //            } catch (DatabaseException e) {
+        //                e.printStackTrace();
+        //            }
+        //        });
+    }
+
+    // 像数据库中写数据
+    private void writeToDatabaseInternal(String key, String value, boolean isOverwrite)
+            throws DatabaseException {
+        // JE的记录包含两部分，key键值和value数据值，这两个值都是通过DatabaseEntry对象封装起来的
+        // 所以说如果要使用记录，则必须创建两个DatabaseEntry对象，一个是key，一个是value
+        // DatabaseEntry内部使用的是bytes数组
+        DatabaseEntry databaseKey = new DatabaseEntry(key.trim().getBytes(StandardCharsets.UTF_8));
+        DatabaseEntry databaseValue =
+                new DatabaseEntry(value.trim().getBytes(StandardCharsets.UTF_8));
+
+        OperationStatus res = null; // 操作状态码
+        Transaction txn; // 事务对象
+
+        TransactionConfig txConfig = new TransactionConfig(); // 事务配置
+        txConfig.setSerializableIsolation(true); // 设置串行化隔离级别
+
+        txn = myDbEnvironment.beginTransaction(null, txConfig); // 开始事务
+
+        if (isOverwrite) {
+            // 添加一条记录。如数据库不支持一个key对应多个data或当前数据库中已经存在该key了，则使用此方法将使用新的值覆盖旧的值。
+            res = myDatabase.put(txn, databaseKey, databaseValue);
+        } else {
+            // 不管数据库是否允许支持多重记录(一个key对应多个value),只要存在该key就不允许添加，并且返回perationStatus.KEYEXIST信息
+            res = myDatabase.putNoOverwrite(txn, databaseKey, databaseValue);
+        }
+
+        txn.commit(); // 提交事务
+
+        //			if (res == OperationStatus.SUCCESS)
+        //				System.out.println("[Jedion] insert success");
+        //			else if (res == OperationStatus.KEYEXIST)
+        //				System.out.println("[Jedion] key exist");
+        //			else
+        //				System.out.println("[Jedion] insert fail");
+
+    }
+
+    // 遍历数据库中数据
+    public ArrayList<String> getAllFromDatabase()
+            throws DatabaseException {
+        Cursor myCursor; // 游标
+        ArrayList<String> resultList = new ArrayList<>();
+        Transaction txn;
+
+        txn = myDbEnvironment.beginTransaction(null, null);
+        CursorConfig cc = new CursorConfig(); // 游标配置
+        cc.setReadCommitted(true); // 设置隔离级别
+
+        myCursor = myDatabase.openCursor(txn, cc);
+
+        DatabaseEntry entryKey = new DatabaseEntry();
+        DatabaseEntry entryValue = new DatabaseEntry();
+
+        if (myCursor.getFirst(entryKey, entryValue, LockMode.DEFAULT) == OperationStatus.SUCCESS) {
+            String key = new String(entryKey.getData(), StandardCharsets.UTF_8);
+            resultList.add(key);
+            while (myCursor.getNext(entryKey, entryValue, LockMode.DEFAULT)
+                    == OperationStatus.SUCCESS) {
+                key = new String(entryKey.getData(), StandardCharsets.UTF_8);
+                resultList.add(key);
+            }
+        }
+
+        myCursor.close();
+
+        txn.commit();
+        return resultList;
+    }
+
+    public String readFromDatabaseOpted(String key) {
+        return new String((byte[]) pendingDB.get(key.getBytes()));
+    }
+
+    // 从数据库读取相应键值的数据
+    public String readFromDatabase(String key) throws DatabaseException {
+        DatabaseEntry databaseKey = new DatabaseEntry(key.trim().getBytes(StandardCharsets.UTF_8));
+        DatabaseEntry databaseValue = new DatabaseEntry();
+        Transaction txn; // 事务对象
+
+        TransactionConfig txConfig = new TransactionConfig(); // 事务配置
+        txConfig.setSerializableIsolation(true); // 设置串行化隔离级别
+
+        txn = myDbEnvironment.beginTransaction(null, txConfig); // 开始事务
+        OperationStatus res = myDatabase.get(txn, databaseKey, databaseValue, LockMode.DEFAULT);
+
+        txn.commit(); // 提交事务
+        if (res == OperationStatus.SUCCESS) {
+            byte[] retData = databaseValue.getData();
+            return new String(retData, StandardCharsets.UTF_8);
+        } else {
+            return "";
+        }
+    }
+
+    public void visitAllItem(JedionVisitor visitor) {
+        Cursor myCursor = null;
+        List<String> resultList = new ArrayList<>();
+        Transaction txn = null;
+        try {
+            txn = myDbEnvironment.beginTransaction(null, null);
+            CursorConfig cc = new CursorConfig();
+            cc.setReadCommitted(true);
+            myCursor = myDatabase.openCursor(txn, cc);
+            DatabaseEntry foundKey = new DatabaseEntry();
+            DatabaseEntry foundData = new DatabaseEntry();
+            // 使用cursor.getPrev方法来遍历游标获取数据
+            if (myCursor.getFirst(foundKey, foundData, LockMode.DEFAULT)
+                    == OperationStatus.SUCCESS) {
+                String theKey = new String(foundKey.getData(), StandardCharsets.UTF_8);
+                String theData = new String(foundData.getData(), StandardCharsets.UTF_8);
+                visitor.visit(theKey, theData);
+                // System.out.println("Key | Data : " + theKey + " | " + theData + "");
+                // System.out.println("Key : " + theKey + "\nvalue : " + theData);
+                while (myCursor.getNext(foundKey, foundData, LockMode.DEFAULT)
+                        == OperationStatus.SUCCESS) {
+                    theKey = new String(foundKey.getData(), StandardCharsets.UTF_8);
+                    theData = new String(foundData.getData(), StandardCharsets.UTF_8);
+                    visitor.visit(theKey, theData);
+
+                    // System.out.println("Key | Data : " + theKey + " | " + theData + "");
+                    // System.out.println("Key : " + theKey + "\nvalue : " + theData);
+                }
+            }
+            myCursor.close();
+            txn.commit();
+
+        } catch (Exception e) {
+            try {
+                if (null != txn) {
+                    txn.abort();
+                }
+                if (myCursor != null) {
+                    myCursor.close();
+                }
+            } catch (Exception e1) {
+                e1.printStackTrace();
+            }
+
+        }
+    }
+
+    public List<String> getEveryItem() {
+        Cursor myCursor = null;
+        List<String> resultList = new ArrayList<>();
+        Transaction txn = null;
+        try {
+            txn = myDbEnvironment.beginTransaction(null, null);
+            CursorConfig cc = new CursorConfig();
+            cc.setReadCommitted(true);
+            myCursor = myDatabase.openCursor(txn, cc);
+            DatabaseEntry foundKey = new DatabaseEntry();
+            DatabaseEntry foundData = new DatabaseEntry();
+            // 使用cursor.getPrev方法来遍历游标获取数据
+            if (myCursor.getFirst(foundKey, foundData, LockMode.DEFAULT)
+                    == OperationStatus.SUCCESS) {
+                String theKey = new String(foundKey.getData(), StandardCharsets.UTF_8);
+                String theData = new String(foundData.getData(), StandardCharsets.UTF_8);
+                resultList.add(theKey);
+                // System.out.println("Key | Data : " + theKey + " | " + theData + "");
+                // System.out.println("Key : " + theKey + "\nvalue : " + theData);
+                while (myCursor.getNext(foundKey, foundData, LockMode.DEFAULT)
+                        == OperationStatus.SUCCESS) {
+                    theKey = new String(foundKey.getData(), StandardCharsets.UTF_8);
+                    theData = new String(foundData.getData(), StandardCharsets.UTF_8);
+                    resultList.add(theKey);
+                    // System.out.println("Key | Data : " + theKey + " | " + theData + "");
+                    // System.out.println("Key : " + theKey + "\nvalue : " + theData);
+                }
+            }
+            myCursor.close();
+            txn.commit();
+            return resultList;
+        } catch (Exception e) {
+            try {
+                if (null != txn) {
+                    txn.abort();
+                }
+                if (myCursor != null) {
+                    myCursor.close();
+                }
+            } catch (Exception e1) {
+                e1.printStackTrace();
+            }
+            return null;
+        }
+    }
+
+    public long getCount() {
+        try {
+            return myDatabase.count();
+        } catch (DatabaseException e) {
+            return 0;
+        }
+    }
+
+    public List<KV> getEveryKeyValue() {
+        LOGGER.debug("===========遍历数据库" + dbName + "中的所有数据==========");
+        Cursor myCursor = null;
+        List<KV> resultList = new ArrayList<>();
+        Transaction txn = null;
+        try {
+            txn = myDbEnvironment.beginTransaction(null, null);
+            CursorConfig cc = new CursorConfig();
+            cc.setReadCommitted(true);
+            myCursor = myDatabase.openCursor(txn, cc);
+            DatabaseEntry foundKey = new DatabaseEntry();
+            DatabaseEntry foundData = new DatabaseEntry();
+            // 使用cursor.getPrev方法来遍历游标获取数据
+            if (myCursor.getFirst(foundKey, foundData, LockMode.DEFAULT)
+                    == OperationStatus.SUCCESS) {
+                KV kv = new KV();
+                kv.key = new String(foundKey.getData(), StandardCharsets.UTF_8);
+                kv.value = new String(foundData.getData(), StandardCharsets.UTF_8);
+                resultList.add(kv);
+                // System.out.println("Key : " + theKey + "\nvalue : " + theData)
+                while (myCursor.getNext(foundKey, foundData, LockMode.DEFAULT)
+                        == OperationStatus.SUCCESS) {
+                    kv = new KV();
+                    kv.key = new String(foundKey.getData(), StandardCharsets.UTF_8);
+                    kv.value = new String(foundData.getData(), StandardCharsets.UTF_8);
+                    resultList.add(kv);
+                }
+            }
+            myCursor.close();
+            txn.commit();
+            LOGGER.debug("getEveryKeyValue, size:" + resultList.size());
+            return resultList;
+        } catch (Exception e) {
+            try {
+                if (null != txn) {
+                    txn.abort();
+                }
+                if (myCursor != null) {
+                    myCursor.close();
+                }
+            } catch (Exception e1) {
+                e1.printStackTrace();
+            }
+            return null;
+        }
+    }
+
+    // 删除数据库中一条数据
+    public void deleteFromDatabase(String key) throws DatabaseException {
+        Transaction txn;
+
+        TransactionConfig txConfig = new TransactionConfig();
+        txConfig.setSerializableIsolation(true);
+
+        txn = myDbEnvironment.beginTransaction(null, txConfig);
+        DatabaseEntry databaseKey;
+        databaseKey = new DatabaseEntry(key.trim().getBytes(StandardCharsets.UTF_8));
+        OperationStatus res = myDatabase.delete(txn, databaseKey);
+        txn.commit();
+        //		if (res == OperationStatus.SUCCESS)
+        //			System.out.println("delete success");
+        //		else if (res == OperationStatus.KEYEMPTY)
+        //			System.out.println("no key");
+        //		else
+        //			System.out.println("delete fail");
+    }
+
+    // 一些其他方法
+    public void otherMethod() throws DatabaseException {
+        String databaseName = myDatabase.getDatabaseName(); // 数据库名字
+        LOGGER.debug("databaseName :" + databaseName);
+
+        Environment env = myDatabase.getEnvironment(); // 取得当前数据库的环境信息
+        LOGGER.debug(env);
+
+        // 取得当前环境下数据库名称列表
+        LOGGER.debug(myDbEnvironment.getDatabaseNames());
+
+        env.renameDatabase(null, databaseName, "newName"); // 给数据库改名
+        env.removeDatabase(null, databaseName); // 删除当前环境数据库
+
+        // 清空数据库中所有记录，并返回数量
+        LOGGER.debug(env.truncateDatabase(null, databaseName, true));
+    }
+
+    // 关闭数据库
+    public void closeDatabase() throws DatabaseException {
+        if (myDatabase != null) myDatabase.close();
+
+        if (myDbEnvironment != null) {
+            myDbEnvironment.cleanLog();
+            myDbEnvironment.close();
+        }
+    }
+
+    public static abstract class JedionVisitor {
+        public abstract void visit(String key, String value);
+    }
+
+    public static class KV {
+        public String key;
+        public String value;
+    }
+}
diff --git a/src/main/base/org/bdware/sc/SCParser.java b/src/main/base/org/bdware/sc/SCParser.java
new file mode 100644
index 0000000..40d0879
--- /dev/null
+++ b/src/main/base/org/bdware/sc/SCParser.java
@@ -0,0 +1,5 @@
+package org.bdware.sc;
+
+public class SCParser {
+
+}
diff --git a/src/main/base/org/bdware/sc/codec/DelimiterBasedFrameEncoder.java b/src/main/base/org/bdware/sc/codec/DelimiterBasedFrameEncoder.java
new file mode 100644
index 0000000..fa5496d
--- /dev/null
+++ b/src/main/base/org/bdware/sc/codec/DelimiterBasedFrameEncoder.java
@@ -0,0 +1,17 @@
+package org.bdware.sc.codec;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToByteEncoder;
+
+public class DelimiterBasedFrameEncoder extends MessageToByteEncoder<ByteBuf> {
+    public static byte[] delimiter = "wonbifoodie".getBytes();
+
+    @Override
+    protected void encode(ChannelHandlerContext arg0, ByteBuf in, ByteBuf out) throws Exception {
+        // System.out.println("[DelimiterBasedFrameEncoder] write:" +
+        // in.readableBytes());
+        out.writeBytes(in);
+        out.writeBytes(delimiter);
+    }
+}
diff --git a/src/main/base/org/bdware/sc/codec/DelimiterCodec.java b/src/main/base/org/bdware/sc/codec/DelimiterCodec.java
new file mode 100644
index 0000000..abaacff
--- /dev/null
+++ b/src/main/base/org/bdware/sc/codec/DelimiterCodec.java
@@ -0,0 +1,14 @@
+package org.bdware.sc.codec;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.CombinedChannelDuplexHandler;
+import io.netty.handler.codec.DelimiterBasedFrameDecoder;
+
+public class DelimiterCodec
+        extends CombinedChannelDuplexHandler<DelimiterBasedFrameDecoder, DelimiterBasedFrameEncoder> {
+    public DelimiterCodec() {
+        ByteBuf buf = Unpooled.wrappedBuffer(DelimiterBasedFrameEncoder.delimiter);
+        init(new DelimiterBasedFrameDecoder(50 * 1024, buf), new DelimiterBasedFrameEncoder());
+    }
+}
diff --git a/src/main/base/org/bdware/sc/codec/LengthFieldBasedFrameCodec.java b/src/main/base/org/bdware/sc/codec/LengthFieldBasedFrameCodec.java
new file mode 100644
index 0000000..45dc461
--- /dev/null
+++ b/src/main/base/org/bdware/sc/codec/LengthFieldBasedFrameCodec.java
@@ -0,0 +1,14 @@
+package org.bdware.sc.codec;
+
+import io.netty.channel.CombinedChannelDuplexHandler;
+import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
+
+import java.nio.ByteOrder;
+
+public class LengthFieldBasedFrameCodec
+        extends CombinedChannelDuplexHandler<LengthFieldBasedFrameDecoder, LengthFieldBasedFrameEncoder> {
+    public LengthFieldBasedFrameCodec() {
+        init(new LengthFieldBasedFrameDecoder(ByteOrder.BIG_ENDIAN, Integer.MAX_VALUE / 2, 0, 4, 0, 4, true),
+                new LengthFieldBasedFrameEncoder());
+    }
+}
\ No newline at end of file
diff --git a/src/main/base/org/bdware/sc/codec/LengthFieldBasedFrameEncoder.java b/src/main/base/org/bdware/sc/codec/LengthFieldBasedFrameEncoder.java
new file mode 100644
index 0000000..1e941d5
--- /dev/null
+++ b/src/main/base/org/bdware/sc/codec/LengthFieldBasedFrameEncoder.java
@@ -0,0 +1,14 @@
+package org.bdware.sc.codec;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToByteEncoder;
+
+public class LengthFieldBasedFrameEncoder extends MessageToByteEncoder<ByteBuf> {
+
+    @Override
+    protected void encode(ChannelHandlerContext arg0, ByteBuf arg1, ByteBuf arg2) throws Exception {
+        arg2.writeInt(arg1.readableBytes());
+        arg2.writeBytes(arg1);
+    }
+}
\ No newline at end of file
diff --git a/src/main/base/org/bdware/sc/compiler/PermissionStub.java b/src/main/base/org/bdware/sc/compiler/PermissionStub.java
new file mode 100644
index 0000000..1af7473
--- /dev/null
+++ b/src/main/base/org/bdware/sc/compiler/PermissionStub.java
@@ -0,0 +1,14 @@
+package org.bdware.sc.compiler;
+
+import org.bdware.sc.node.Permission;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface PermissionStub {
+    Permission permission();
+}
\ No newline at end of file
diff --git a/src/main/base/org/bdware/sc/compiler/PermissionStubGenerator.java b/src/main/base/org/bdware/sc/compiler/PermissionStubGenerator.java
new file mode 100644
index 0000000..b19c04a
--- /dev/null
+++ b/src/main/base/org/bdware/sc/compiler/PermissionStubGenerator.java
@@ -0,0 +1,81 @@
+package org.bdware.sc.compiler;
+
+import org.objectweb.asm.*;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class PermissionStubGenerator extends ClassVisitor implements Opcodes {
+    private final String p;
+
+    public PermissionStubGenerator(int api, ClassVisitor cn, String permission) {
+        super(api, cn);
+        this.p = permission;
+    }
+
+    public static byte[] generateStub(Class<?> clz, String permission) {
+        PermissionStub stub = clz.getAnnotation(PermissionStub.class);
+        if (stub == null)
+            return null;
+        try {
+            String resource = clz.getCanonicalName().replaceAll("\\.", "/") + ".class";
+            InputStream input = clz.getClassLoader().getResourceAsStream(resource);
+            ClassReader cr;
+            cr = new ClassReader(input);
+            ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES);
+            PermissionStubGenerator generator = new PermissionStubGenerator(ASM4, cw, permission);
+            cr.accept(generator, 0);
+
+            return cw.toByteArray();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
+        if (cv != null) {
+            cv.visit(version, access, name + "Stub", null, "java/lang/Object", null);
+        }
+        MethodVisitor mv = cv.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
+        mv.visitCode();
+        Label l0 = new Label();
+        mv.visitLabel(l0);
+        mv.visitVarInsn(ALOAD, 0);
+        mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V");
+        mv.visitInsn(RETURN);
+        Label l1 = new Label();
+        mv.visitLabel(l1);
+        // mv.visitLocalVariable("this", "Lcom/yancloud/sc/boundry/utils/FileUtilStub;",
+        // null, l0, l1, 0);
+        mv.visitMaxs(1, 1);
+        mv.visitEnd();
+    }
+
+    public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
+        if (cv != null) {
+            if (name.equals("<clinit>"))
+                return null;
+            if (name.equals("<init>")) {
+                return null;
+            }
+
+            MethodVisitor mv = cv.visitMethod(access, name, desc, signature,
+                    new String[]{"javax/script/ScriptException"});
+            mv.visitCode();
+            Label l0 = new Label();
+            mv.visitLabel(l0);
+            mv.visitTypeInsn(NEW, "javax/script/ScriptException");
+            mv.visitInsn(DUP);
+            mv.visitLdcInsn("Do not have " + p + " Permission");
+            mv.visitMethodInsn(INVOKESPECIAL, "javax/script/ScriptException", "<init>", "(Ljava/lang/String;)V");
+            mv.visitInsn(ATHROW);
+            mv.visitMaxs(5, 20);
+            mv.visitEnd();
+
+            return null;
+        }
+        return null;
+    }
+}
diff --git a/src/main/base/org/bdware/sc/compiler/YJSErrorListener.java b/src/main/base/org/bdware/sc/compiler/YJSErrorListener.java
new file mode 100644
index 0000000..f355934
--- /dev/null
+++ b/src/main/base/org/bdware/sc/compiler/YJSErrorListener.java
@@ -0,0 +1,53 @@
+package org.bdware.sc.compiler;
+
+import org.antlr.v4.runtime.ANTLRErrorListener;
+import org.antlr.v4.runtime.Parser;
+import org.antlr.v4.runtime.RecognitionException;
+import org.antlr.v4.runtime.Recognizer;
+import org.antlr.v4.runtime.atn.ATNConfigSet;
+import org.antlr.v4.runtime.dfa.DFA;
+
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.List;
+
+public class YJSErrorListener implements ANTLRErrorListener {
+    List<String> result;
+
+    public YJSErrorListener() {
+        result = new ArrayList<>();
+    }
+
+    public List<String> getResultList() {
+        return result;
+    }
+
+    @Override
+    public void reportAmbiguity(Parser recognizer, DFA dfa, int startIndex, int stopIndex, boolean exact,
+                                BitSet ambigAlts, ATNConfigSet configs) {
+        String content = ("SyntaxError Ambiguity, line" + recognizer.getCurrentToken().getLine() + " pos:"
+                + recognizer.getCurrentToken().getCharPositionInLine());
+        result.add(content);
+    }
+
+    @Override
+    public void reportAttemptingFullContext(Parser recognizer, DFA dfa, int startIndex, int stopIndex,
+                                            BitSet conflictingAlts, ATNConfigSet configs) {
+        // System.out.println("YJSErrorListener AttemptingFullContext!");
+
+    }
+
+    @Override
+    public void reportContextSensitivity(Parser arg0, DFA arg1, int arg2, int arg3, int arg4, ATNConfigSet arg5) {
+        // System.out.println("YJSErrorListener ContextSensitivity!");
+
+    }
+
+    @Override
+    public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line, int charPos, String msg,
+                            RecognitionException e) {
+        String content = "SyntaxError, line" + line + " pos:" + charPos + " msg:" + msg;
+        result.add(content);
+    }
+
+}
diff --git a/src/main/base/org/bdware/sc/conn/ByteUtil.java b/src/main/base/org/bdware/sc/conn/ByteUtil.java
new file mode 100644
index 0000000..2ba3d55
--- /dev/null
+++ b/src/main/base/org/bdware/sc/conn/ByteUtil.java
@@ -0,0 +1,90 @@
+package org.bdware.sc.conn;
+
+import org.apache.commons.codec.binary.Base64;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+
+public class ByteUtil {
+    public static String byteTo(long size) {
+        String[] unit = {"B", "KB", "MB", "GB", "TB"};
+        double d = (double) size;
+        int i;
+        for (i = 0; i < unit.length - 1; i++) {
+            if (d > 1024.0) d /= 1024.0;
+            else break;
+        }
+        return String.format("%.2f %s", d, unit[i]);
+    }
+
+    public static String encodeBASE64(byte[] array) {
+        if (array != null) {
+            return Base64.encodeBase64String(array);
+            //return encodeBASE64(array, array.length);   这句有问题，然后stackoverflow了?
+        } else {
+            return null;
+        }
+    }
+
+    public static byte[] decodeBASE64(String encoded) {
+        try {
+            return Base64.decodeBase64(encoded);
+            //return ByteUtil.decodeBASE64(encoded);   自己调自己,然后就stackoverflow了
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public static String encodeBASE64(byte[] array, int len) {
+        if (len == array.length) {
+            return ByteUtil.encodeBASE64(array);
+        } else {
+            byte[] copied = new byte[len];
+            System.arraycopy(array, 0, copied, 0, len);
+            return ByteUtil.encodeBASE64(copied);
+        }
+    }
+
+    public static int readInt(ByteArrayInputStream bi) {
+        int ret = 0;
+        ret |= (bi.read() & 0xff);
+        ret <<= 8;
+        ret |= (bi.read() & 0xff);
+        ret <<= 8;
+        ret |= (bi.read() & 0xff);
+        ret <<= 8;
+        ret |= (bi.read() & 0xff);
+        return ret;
+    }
+
+    public static void writeInt(ByteArrayOutputStream bo, int i) {
+        bo.write((i >> 24) & 0xff);
+        bo.write((i >> 16) & 0xff);
+        bo.write((i >> 8) & 0xff);
+        bo.write(i & 0xff);
+    }
+
+    public static void writeLong(ByteArrayOutputStream bo, long l) {
+        for (int i = 56; i >= 0; i -= 8) {
+            bo.write(((int) (l >> i)) & 0xff);
+        }
+    }
+
+    public static long readLong(ByteArrayInputStream bi) {
+        long ret = 0L;
+        for (int i = 0; i < 8; i++) {
+            ret <<= 8;
+            ret |= (bi.read() & 0xff);
+        }
+        return ret;
+    }
+
+    public static byte[] readBytes(ByteArrayInputStream bi, int len) {
+        byte[] ret = new byte[len];
+        bi.read(ret, 0, len);
+        return ret;
+    }
+
+
+}
diff --git a/src/main/base/org/bdware/sc/conn/Description.java b/src/main/base/org/bdware/sc/conn/Description.java
new file mode 100644
index 0000000..214bd9d
--- /dev/null
+++ b/src/main/base/org/bdware/sc/conn/Description.java
@@ -0,0 +1,14 @@
+package org.bdware.sc.conn;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.FIELD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Description {
+    String value() default "";
+
+    boolean isAsync() default false;
+}
\ No newline at end of file
diff --git a/src/main/base/org/bdware/sc/conn/EventHandler.java b/src/main/base/org/bdware/sc/conn/EventHandler.java
new file mode 100644
index 0000000..03488bd
--- /dev/null
+++ b/src/main/base/org/bdware/sc/conn/EventHandler.java
@@ -0,0 +1,7 @@
+package org.bdware.sc.conn;
+
+import org.bdware.sc.event.REvent;
+
+public interface EventHandler {
+    void onEvent(REvent msg);
+}
\ No newline at end of file
diff --git a/src/main/base/org/bdware/sc/conn/EventMsg.java b/src/main/base/org/bdware/sc/conn/EventMsg.java
new file mode 100644
index 0000000..7533253
--- /dev/null
+++ b/src/main/base/org/bdware/sc/conn/EventMsg.java
@@ -0,0 +1,38 @@
+package org.bdware.sc.conn;
+
+import java.io.*;
+
+public class EventMsg implements Serializable {
+    private static final long serialVersionUID = 5953407456061892534L;
+
+    public String type, content, contractID;
+
+    public EventMsg(String contractID, String type, String content) {
+        this.contractID = contractID;
+        this.type = type;
+        this.content = content;
+    }
+
+    public static EventMsg parse(byte[] data) {
+        ObjectInputStream in;
+        try {
+            in = new ObjectInputStream(new ByteArrayInputStream(data));
+            return (EventMsg) in.readObject();
+        } catch (IOException | ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public byte[] getBytes() {
+        ByteArrayOutputStream bo = new ByteArrayOutputStream();
+        try {
+            ObjectOutputStream oo = new ObjectOutputStream(bo);
+            oo.writeObject(this);
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return bo.toByteArray();
+    }
+}
diff --git a/src/main/base/org/bdware/sc/conn/InstrumentedResultCallback.java b/src/main/base/org/bdware/sc/conn/InstrumentedResultCallback.java
new file mode 100644
index 0000000..b0d3fe9
--- /dev/null
+++ b/src/main/base/org/bdware/sc/conn/InstrumentedResultCallback.java
@@ -0,0 +1,7 @@
+package org.bdware.sc.conn;
+
+import com.google.gson.JsonObject;
+
+public interface InstrumentedResultCallback {
+    void onResult(ResultCallback resultCallback, JsonObject result);
+}
diff --git a/src/main/base/org/bdware/sc/conn/MsgHandler.java b/src/main/base/org/bdware/sc/conn/MsgHandler.java
new file mode 100644
index 0000000..8d4b601
--- /dev/null
+++ b/src/main/base/org/bdware/sc/conn/MsgHandler.java
@@ -0,0 +1,82 @@
+package org.bdware.sc.conn;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.bdware.sc.get.GetMessage;
+import org.bdware.sc.util.JsonUtil;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+public class MsgHandler {
+    private static final Logger LOGGER = LogManager.getLogger(MsgHandler.class);
+    Map<String, MethodInfo> methodInfos;
+
+    public MsgHandler() {
+        methodInfos = new HashMap<>();
+        Class<?> clz = this.getClass();
+        for (Method method : clz.getDeclaredMethods()) {
+            Description anno = method.getAnnotation(Description.class);
+            if (anno != null && method.getParameterCount() == 2) {
+                methodInfos.put(
+                        method.getName(),
+                        new MethodInfo(method.getName(), anno.value(), method, anno.isAsync()));
+            }
+        }
+    }
+
+    public void handle(GetMessage message, ResultCallback rc) {
+        try {
+            MethodInfo info = methodInfos.get(message.method);
+            if (info == null) {
+                rc.onResult("{ \"msg\":\"can't handle action:" + message.method + "\"}");
+                LOGGER.warn("unsupported action: " + message.method);
+            } else if (info.isAsync) {
+                ServiceServer.executor.execute(() -> {
+                    try {
+                        info.m.invoke(MsgHandler.this, message, rc);
+                    } catch (Exception e) {
+                        ByteArrayOutputStream bo = new ByteArrayOutputStream();
+                        e.printStackTrace(new PrintStream(bo));
+                        rc.onResult("{ \"msg\":\"" + bo + "\"}");
+                    }
+                });
+            } else {
+                info.m.invoke(this, message, rc);
+            }
+        } catch (Throwable e) {
+            Method m2;
+            try {
+                m2 = MsgHandler.class.getDeclaredMethod(
+                        message.method, GetMessage.class, ResultCallback.class);
+                m2.invoke(this, message, rc);
+            } catch (Exception e1) {
+                ByteArrayOutputStream bo = new ByteArrayOutputStream();
+                e.printStackTrace(new PrintStream(bo));
+                rc.onResult("{ \"msg\":\"" + bo + "\"}");
+            }
+        }
+    }
+
+    @Description("help info")
+    public void help(GetMessage msg, ResultCallback cb) {
+        cb.onResult(JsonUtil.toPrettyJson(methodInfos));
+    }
+
+    static class MethodInfo {
+        transient Method m;
+        String method;
+        String desc;
+        boolean isAsync;
+
+        public MethodInfo(String name, String value, Method m, boolean async) {
+            method = name;
+            desc = value;
+            isAsync = async;
+            this.m = m;
+        }
+    }
+}
diff --git a/src/main/base/org/bdware/sc/conn/Node.java b/src/main/base/org/bdware/sc/conn/Node.java
new file mode 100644
index 0000000..d7f64f0
--- /dev/null
+++ b/src/main/base/org/bdware/sc/conn/Node.java
@@ -0,0 +1,7 @@
+package org.bdware.sc.conn;
+
+import java.io.Serializable;
+
+public class Node implements Serializable {
+
+}
diff --git a/src/main/base/org/bdware/sc/conn/OnHashCallback.java b/src/main/base/org/bdware/sc/conn/OnHashCallback.java
new file mode 100644
index 0000000..b53096f
--- /dev/null
+++ b/src/main/base/org/bdware/sc/conn/OnHashCallback.java
@@ -0,0 +1,5 @@
+package org.bdware.sc.conn;
+
+public interface OnHashCallback {
+    void publishHash(String reqID, String hashStr);
+}
diff --git a/src/main/base/org/bdware/sc/conn/ResultCallback.java b/src/main/base/org/bdware/sc/conn/ResultCallback.java
new file mode 100644
index 0000000..2816ea9
--- /dev/null
+++ b/src/main/base/org/bdware/sc/conn/ResultCallback.java
@@ -0,0 +1,21 @@
+package org.bdware.sc.conn;
+
+import io.netty.util.Timeout;
+
+public abstract class ResultCallback {
+    //    private static final Logger LOGGER = LogManager.getLogger(ResultCallback.class);
+    Timeout task;
+
+    public abstract void onResult(String str);
+
+    public void setTimeOut(Timeout task) {
+        this.task = task;
+    }
+
+    public void cancelTimeOut() {
+//        LOGGER.debug("[cancelTimeout]" + task.toString());
+        if (null != this.task) {
+            task.cancel();
+        }
+    }
+}
diff --git a/src/main/base/org/bdware/sc/conn/ServiceServer.java b/src/main/base/org/bdware/sc/conn/ServiceServer.java
new file mode 100644
index 0000000..bae1a6b
--- /dev/null
+++ b/src/main/base/org/bdware/sc/conn/ServiceServer.java
@@ -0,0 +1,146 @@
+package org.bdware.sc.conn;
+
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.buffer.*;
+import io.netty.channel.*;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.bdware.sc.codec.LengthFieldBasedFrameCodec;
+import org.bdware.sc.get.GetMessage;
+
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.PrintStream;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class ServiceServer extends Thread {
+    public static final ExecutorService executor =
+            new ThreadPoolExecutor(
+                    8,
+                    15,
+                    60,
+                    TimeUnit.SECONDS,
+                    new SynchronousQueue<>());
+    private static final String TAG = "ServiceServer";
+    private static final Logger LOGGER = LogManager.getLogger(ServiceServer.class);
+    private final MsgHandler handler;
+    public AtomicInteger mainPort;
+    boolean ready;
+
+    public ServiceServer(MsgHandler handler, int startPort) {
+        mainPort = new AtomicInteger(startPort);
+        ready = false;
+        this.handler = handler;
+        this.start();
+    }
+
+    public int getPort() {
+        while (!ready) {
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+        return mainPort.get();
+    }
+
+    public void run() {
+        EventLoopGroup bossGroup = new NioEventLoopGroup(1);
+        EventLoopGroup workerGroup = new NioEventLoopGroup();
+
+        ServerBootstrap b = new ServerBootstrap();
+        b.option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT);
+        b.group(bossGroup, workerGroup)
+                .channel(NioServerSocketChannel.class)
+                .option(ChannelOption.SO_BACKLOG, 100)
+                .option(ChannelOption.SO_REUSEADDR, false)
+                .childHandler(
+                        new ChannelInitializer<SocketChannel>() {
+                            @Override
+                            protected void initChannel(SocketChannel arg0) {
+                                arg0.pipeline()
+                                        .addLast(new LengthFieldBasedFrameCodec())
+                                        .addLast(new AsyncInboundHandler(ServiceServer.this));
+                            }
+                        });
+        Channel channel;
+        while (true) {
+            try {
+                int port = mainPort.get();
+                ChannelFuture temp1 = b.bind(port);
+                temp1.sync();
+                channel = temp1.channel();
+                ready = true;
+                break;
+            } catch (Exception e) {
+                //e.printStackTrace();
+                LOGGER.debug("port already in used:" + mainPort);
+                mainPort.getAndIncrement();
+            }
+        }
+        //TODO MUST use System.out to ensure output
+        LOGGER.info("ServiceServer mainPort " + mainPort);
+        try {
+            channel.closeFuture().await();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void handle(GetMessage message, ResultCallback rc) {
+        try {
+            handler.handle(message, rc);
+        } catch (Throwable e) {
+            ByteArrayOutputStream bo = new ByteArrayOutputStream();
+            e.printStackTrace(new PrintStream(bo));
+            rc.onResult("{ \"msg\":\"" + bo + "\"}");
+        }
+    }
+
+    static class AsyncInboundHandler extends SimpleChannelInboundHandler<ByteBuf> {
+        ServiceServer serviceServer;
+
+        public AsyncInboundHandler(ServiceServer serviceServer) {
+            this.serviceServer = serviceServer;
+        }
+
+        @Override
+        protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception {
+            ObjectInputStream obj = new ObjectInputStream(new ByteBufInputStream(msg));
+            final long id = obj.readLong();
+            GetMessage getMsg = (GetMessage) obj.readObject();
+            serviceServer.handle(
+                    getMsg,
+                    new ResultCallback() {
+                        @Override
+                        public void onResult(String response) {
+                            try {
+                                writeToChannel(ctx, id, response);
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                        }
+                    });
+        }
+
+        private void writeToChannel(ChannelHandlerContext ctx, long id, String response)
+                throws Exception {
+            ByteBuf buf = Unpooled.buffer();
+            ObjectOutputStream out = new ObjectOutputStream(new ByteBufOutputStream(buf));
+            out.writeLong(id);
+            out.writeObject(response);
+            synchronized (ctx) {
+                ctx.writeAndFlush(buf);
+            }
+        }
+    }
+}
diff --git a/src/main/base/org/bdware/sc/conn/SocketGet.java b/src/main/base/org/bdware/sc/conn/SocketGet.java
new file mode 100644
index 0000000..6c98fcb
--- /dev/null
+++ b/src/main/base/org/bdware/sc/conn/SocketGet.java
@@ -0,0 +1,198 @@
+package org.bdware.sc.conn;
+
+import com.google.gson.JsonPrimitive;
+import io.netty.bootstrap.Bootstrap;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufInputStream;
+import io.netty.buffer.ByteBufOutputStream;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.*;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioSocketChannel;
+import org.bdware.sc.ContractResult;
+import org.bdware.sc.codec.LengthFieldBasedFrameCodec;
+import org.bdware.sc.get.GetMessage;
+import org.bdware.sc.util.JsonUtil;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class SocketGet {
+    private static final org.apache.logging.log4j.Logger LOGGER =
+            org.apache.logging.log4j.LogManager.getLogger(SocketGet.class);
+    static EventLoopGroup group = new NioEventLoopGroup(8);
+    private final String ipAddress;
+    private final int port;
+    AtomicInteger i = new AtomicInteger(0);
+    Channel channel;
+    Bootstrap b;
+    SyncResult r = new SyncResult();
+    Random random = new Random();
+    OfflineHandler offlineExceptionHandler;
+
+    public SocketGet(String ipAddress, int port) {
+        // logger.info("[SocketGet] 构造器 : port=" + port);
+        this.ipAddress = ipAddress;
+        this.port = port;
+        b = new Bootstrap();
+        // logger.info("[SocketGet] 构造器 : position---------------1");
+
+        // TODO  可能有问题
+
+        b.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 5000);
+
+        // logger.info("[SocketGet] 构造器 : position---------------2");
+
+        b.group(group);
+
+        // logger.info("[SocketGet] 构造器 : position---------------3");
+        b.channel(NioSocketChannel.class)
+                .option(ChannelOption.TCP_NODELAY, true)
+                .handler(
+                        new ChannelInitializer<SocketChannel>() {
+                            @Override
+                            protected void initChannel(SocketChannel ch) {
+                                ChannelPipeline p = ch.pipeline();
+                                // new com.yancloud.sc.codec.DelimiterCodec()
+                                // new LengthFieldBasedFrameCodec()
+                                p.addLast(new LengthFieldBasedFrameCodec()).addLast(
+                                        new SimpleChannelInboundHandler<ByteBuf>() {
+                                            @Override
+                                            protected void channelRead0(
+                                                    ChannelHandlerContext arg0,
+                                                    ByteBuf arg1)
+                                                    throws Exception {
+                                                ObjectInputStream in =
+                                                        new ObjectInputStream(
+                                                                new ByteBufInputStream(
+                                                                        arg1));
+                                                long id = in.readLong();
+                                                // TODO zero copy here
+                                                String result = (String) in.readObject();
+                                                r.wakeUp(id, result);
+                                            }
+
+                                            @Override
+                                            public void channelActive(
+                                                    ChannelHandlerContext ctx) {
+                                            }
+
+                                            @Override
+                                            public void channelInactive(
+                                                    ChannelHandlerContext ctx) {
+                                                SocketGet.this.channel = null;
+                                            }
+
+                                            @Override
+                                            public void exceptionCaught(
+                                                    ChannelHandlerContext ctx,
+                                                    Throwable cause) {
+                                                cause.printStackTrace();
+                                            }
+                                        });
+                            }
+                        });
+        try {
+            // logger.info("[SocketGet] 构造器 : position---------------4");
+            channel = b.connect(ipAddress, port).sync().channel();
+            // logger.info("[SocketGet] 构造器 : position---------------5");
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void setOfflineExceptionHandler(OfflineHandler offlineExceptionHandler) {
+        this.offlineExceptionHandler = offlineExceptionHandler;
+    }
+
+    private ObjectOutputStream request(String pkgName, String method, String arg, long id)
+            throws InterruptedException, IOException {
+        if (!isAlive()) {
+            // TODO  可能有问题
+            // logger.info("[SocketGet] request position------1");
+            channel = b.connect(ipAddress, port).sync().channel();
+        }
+        // logger.info("[SocketGet] request position------2");
+        GetMessage msg = new GetMessage(pkgName, method, arg);
+        // logger.info("[SocketGet] request position------3");
+        ByteBuf buf = Unpooled.buffer();
+        ObjectOutputStream oo = new ObjectOutputStream(new ByteBufOutputStream(buf));
+        // logger.info("[SocketGet] request position------4");
+        oo.writeLong(id);
+        oo.writeObject(msg);
+        // logger.info("[SocketGet] request position------5");
+        channel.writeAndFlush(buf);
+        // logger.info("[SocketGet] request position------6");
+        return oo;
+    }
+
+    public String syncGet(String pkgName, String method, String arg) {
+        try {
+            long id = random.nextLong();
+            final ContractResult cr =
+                    new ContractResult(ContractResult.Status.Error, new JsonPrimitive("Timeout!!"));
+            ResultCallback cb =
+                    new ResultCallback() {
+                        @Override
+                        public void onResult(String str) {
+                            cr.status = ContractResult.Status.Success;
+                            cr.result = null == str ? null : new JsonPrimitive(str);
+                            synchronized (this) {
+                                this.notifyAll();
+                            }
+                        }
+                    };
+            if (!r.waitObj.containsKey(id)) {
+                // logger.info("[SocketGet] sleep position------2");
+                r.waitObj.put(id, cb);
+                // logger.info("[SocketGet] waitObj中放入requestID=" +id + " 的callback");
+            }
+            request(pkgName, method, arg, id).close();
+            return r.syncSleep(id, cr, cb);
+        } catch (Exception e) {
+            e.printStackTrace();
+            final ContractResult cr =
+                    new ContractResult(
+                            ContractResult.Status.Error,
+                            new JsonPrimitive("Failed due to Exception:" + e.getMessage()));
+            return JsonUtil.toJson(cr);
+        }
+    }
+
+    public void asyncGet(String pkgName, String method, String arg, ResultCallback cb) {
+        try {
+            long id = random.nextLong();
+            if (!r.waitObj.containsKey(id) && null != cb) {
+                r.waitObj.put(id, cb);
+            } else {
+                LOGGER.warn("id conflict! " + id);
+            }
+            r.sleep(id, cb);
+            request(pkgName, method, arg, id);
+        } catch (Exception e) {
+            e.printStackTrace();
+            ContractResult cr =
+                    new ContractResult(
+                            ContractResult.Status.Error, new JsonPrimitive(e.getMessage()));
+            if (!isAlive() && offlineExceptionHandler != null) {
+                offlineExceptionHandler.onException(this, e);
+                cr.result = new JsonPrimitive("unavailable now try again later, " + e.getMessage());
+            }
+            if (null != cb) {
+                cb.onResult(JsonUtil.toJson(cr));
+            }
+        }
+    }
+
+    public boolean isAlive() {
+        return channel != null && channel.isActive();
+    }
+
+    public abstract static class OfflineHandler {
+        public abstract void onException(SocketGet socketGet, Exception e);
+    }
+}
diff --git a/src/main/base/org/bdware/sc/conn/SyncResult.java b/src/main/base/org/bdware/sc/conn/SyncResult.java
new file mode 100644
index 0000000..e4f2125
--- /dev/null
+++ b/src/main/base/org/bdware/sc/conn/SyncResult.java
@@ -0,0 +1,75 @@
+package org.bdware.sc.conn;
+
+import com.google.gson.JsonPrimitive;
+import io.netty.util.HashedWheelTimer;
+import io.netty.util.Timeout;
+import io.netty.util.TimerTask;
+import org.bdware.sc.ContractResult;
+import org.bdware.sc.ContractResult.Status;
+import org.bdware.sc.util.JsonUtil;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+public class SyncResult {
+    public static final HashedWheelTimer HASHED_WHEEL_TIMER =
+            new HashedWheelTimer(
+                    Executors.defaultThreadFactory(),
+                    5,
+                    TimeUnit.MILLISECONDS,
+                    2);
+    static final String TimeoutStr =
+            JsonUtil.toJson(new ContractResult(Status.Error, new JsonPrimitive("Timeout!")));
+    //    private static final org.apache.logging.log4j.Logger LOGGER =
+    //    org.apache.logging.log4j.LogManager.getLogger(SyncResult.class);
+    Map<Long, ResultCallback> waitObj = new ConcurrentHashMap<>();
+
+    public void wakeUp(long requestID, String result) {
+        ResultCallback ob = waitObj.get(requestID);
+        waitObj.remove(requestID);
+        if (ob != null) {
+            ob.onResult(result);
+        } else {
+            //   logger.info("[Missing callback]" + requestID);
+        }
+    }
+
+    public void sleep(final long requestID, ResultCallback cb) {
+        TimerTask tt = timeout -> wakeUp(requestID, TimeoutStr);
+        // TODO: for now, if executing confidential function, need to increase this value to at
+        HASHED_WHEEL_TIMER.newTimeout(tt, 10, TimeUnit.SECONDS);
+    }
+
+    public void sleepWithTimeout(final Long requestID, ResultCallback cb, int timeOut) {
+        if (!waitObj.containsKey(requestID)) {
+            waitObj.put(requestID, cb);
+        }
+        TimerTask tt =
+                new TimerTask() {
+                    @Override
+                    public void run(Timeout timeout) {
+                        wakeUp(requestID, TimeoutStr);
+                    }
+                };
+        HASHED_WHEEL_TIMER.newTimeout(tt, timeOut, TimeUnit.SECONDS);
+    }
+
+    public String syncSleep(long requestID, ContractResult cr, ResultCallback cb) {
+        sleep(requestID, cb);
+        synchronized (cb) {
+            try {
+                if (waitObj.containsKey(requestID))
+                    cb.wait(10000L);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+        if (cr.status == Status.Success) {
+            return null == cr.result ? null : cr.result.getAsString();
+        } else {
+            return JsonUtil.toJson(cr);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/base/org/bdware/sc/datacontract.vm b/src/main/base/org/bdware/sc/datacontract.vm
new file mode 100644
index 0000000..dcd973b
--- /dev/null
+++ b/src/main/base/org/bdware/sc/datacontract.vm
@@ -0,0 +1,31 @@
+contract apiDataContract {
+	function makeException(arg){
+		var data  = {};
+		data.status = "-1";
+		data.msg = arg;
+		return JSON.stringify(data);
+	}
+	export function preMain(args){
+		#foreach($prop in $initList)
+		Global.${prop[0]} = ${prop[1]};
+		#end
+	}
+	
+	function merge(map1,map2){
+		var ret = {};
+		for (var key in map1 )
+			ret[key] = map1[key];
+		for (var key in map2)
+			ret[key] = map2[key];
+		return ret;
+	}
+	
+	export function main(args){
+		if (${validate})
+			return makeException(${validateFailedMsg});
+		args = JSON.parse(args);
+		var header = merge(Global.headers,args.headers);
+		var argMap = merge(Global.args,args.args);
+		return YancloudUtil.http(Global.baseUrl,Global.method,header,argMap,args.reservedList);
+	}
+}
\ No newline at end of file
diff --git a/src/main/base/org/bdware/sc/encrypt/AES.java b/src/main/base/org/bdware/sc/encrypt/AES.java
new file mode 100644
index 0000000..969b325
--- /dev/null
+++ b/src/main/base/org/bdware/sc/encrypt/AES.java
@@ -0,0 +1,233 @@
+package org.bdware.sc.encrypt;
+
+import org.bdware.sc.conn.ByteUtil;
+import org.bdware.sc.util.JsonUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class AES {
+    int[] Sbox = new int[]{99, 124, 119, 123, 242, 107, 111, 197, 48, 1, 103, 43, 254, 215, 171, 118, 202, 130, 201,
+            125, 250, 89, 71, 240, 173, 212, 162, 175, 156, 164, 114, 192, 183, 253, 147, 38, 54, 63, 247, 204, 52, 165,
+            229, 241, 113, 216, 49, 21, 4, 199, 35, 195, 24, 150, 5, 154, 7, 18, 128, 226, 235, 39, 178, 117, 9, 131,
+            44, 26, 27, 110, 90, 160, 82, 59, 214, 179, 41, 227, 47, 132, 83, 209, 0, 237, 32, 252, 177, 91, 106, 203,
+            190, 57, 74, 76, 88, 207, 208, 239, 170, 251, 67, 77, 51, 133, 69, 249, 2, 127, 80, 60, 159, 168, 81, 163,
+            64, 143, 146, 157, 56, 245, 188, 182, 218, 33, 16, 255, 243, 210, 205, 12, 19, 236, 95, 151, 68, 23, 196,
+            167, 126, 61, 100, 93, 25, 115, 96, 129, 79, 220, 34, 42, 144, 136, 70, 238, 184, 20, 222, 94, 11, 219, 224,
+            50, 58, 10, 73, 6, 36, 92, 194, 211, 172, 98, 145, 149, 228, 121, 231, 200, 55, 109, 141, 213, 78, 169, 108,
+            86, 244, 234, 101, 122, 174, 8, 186, 120, 37, 46, 28, 166, 180, 198, 232, 221, 116, 31, 75, 189, 139, 138,
+            112, 62, 181, 102, 72, 3, 246, 14, 97, 53, 87, 185, 134, 193, 29, 158, 225, 248, 152, 17, 105, 217, 142,
+            148, 155, 30, 135, 233, 206, 85, 40, 223, 140, 161, 137, 13, 191, 230, 66, 104, 65, 153, 45, 15, 176, 84,
+            187, 22};
+    int[] ShiftRowTab = new int[]{0, 5, 10, 15, 4, 9, 14, 3, 8, 13, 2, 7, 12, 1, 6, 11};
+    private int[] Sbox_Inv;
+    private int[] ShiftRowTab_Inv;
+    private int[] xtime;
+
+    public AES() {
+        init();
+    }
+
+    public static AESKey generateAESKey() {
+        String str = AES2.generateAES() + AES2.generateAES();
+        List<Integer> ret = new ArrayList<>();
+        for (int i = 0; i < str.length(); i++) {
+            int c = str.charAt(i);
+            ret.add(c & 0xff);
+        }
+        return new AESKey(ret);
+    }
+
+    public void init() {
+        Sbox_Inv = new int[256];
+        for (int i = 0; i < 256; i++)
+            Sbox_Inv[Sbox[i]] = i;
+        ShiftRowTab_Inv = new int[16];
+        for (int i = 0; i < 16; i++)
+            ShiftRowTab_Inv[ShiftRowTab[i]] = i;
+        xtime = new int[256];
+        for (int i = 0; i < 128; i++) {
+            xtime[i] = i << 1;
+            xtime[128 + i] = (i << 1) ^ 0x1b;
+        }
+    }
+
+    public void expandKey(byte[] key) {
+        List<Integer> key2 = new ArrayList<>();
+        for (byte b : key)
+            key2.add(((int) b) & 0xff);
+        expandKey(key2);
+    }
+
+    public void expandKey(List<Integer> key) {
+        int kl = key.size();
+        int ks = 0, Rcon = 1;
+        switch (kl) {
+            case 16:
+                ks = 16 * (10 + 1);
+                break;
+            case 24:
+                ks = 16 * (12 + 1);
+                break;
+            case 32:
+                ks = 16 * (14 + 1);
+                break;
+            default:
+                System.err.println("AES.expandKey: Only key lengths of 16, 24 or 32 bytes allowed!");
+
+        }
+        for (int i = kl; i < ks; i += 4) {
+            int[] temp = new int[]{key.get(i - 4), key.get(i - 3), key.get(i - 2), key.get(i - 1)};
+            if (i % kl == 0) {
+                temp = new int[]{(Sbox[temp[1]] ^ Rcon), Sbox[temp[2]], Sbox[temp[3]], Sbox[temp[0]]};
+                if ((Rcon <<= 1) >= 256)
+                    Rcon ^= 0x11b;
+            } else if ((kl > 24) && (i % kl == 16))
+                temp = new int[]{Sbox[temp[0]], Sbox[temp[1]], Sbox[temp[2]], Sbox[temp[3]]};
+            for (int j = 0; j < 4; j++)
+                key.add(temp[j] ^ key.get(i + j - kl));
+        }
+    }
+
+    public void encrypt(List<Integer> block, List<Integer> key) {
+        int l = key.size();
+        // log.info("AES before encrypt");
+        // printList(block);
+        addRoundKey(block, key.subList(0, 16));
+        int i;
+        for (i = 16; i < l - 16; i += 16) {
+            subBytes(block, Sbox);
+            shiftRows(block, ShiftRowTab);
+            mixColumns(block);
+            addRoundKey(block, key.subList(i, i + 16));
+        }
+        subBytes(block, Sbox);
+        shiftRows(block, ShiftRowTab);
+        addRoundKey(block, key.subList(i, l));
+        // log.info("AES after encrypt");
+        // printList(block);
+    }
+
+    void printList(List<Integer> block) {
+        System.out.println(JsonUtil.toJson(block));
+    }
+
+    public void decrypt(List<Integer> block, List<Integer> key) {
+        int l = key.size();
+        addRoundKey(block, key.subList(l - 16, l));
+        shiftRows(block, ShiftRowTab_Inv);
+        subBytes(block, Sbox_Inv);
+        for (int i = l - 32; i >= 16; i -= 16) {
+            addRoundKey(block, key.subList(i, i + 16));
+            mixColumns_Inv(block);
+            shiftRows(block, ShiftRowTab_Inv);
+            subBytes(block, Sbox_Inv);
+        }
+        addRoundKey(block, key.subList(0, 16));
+    }
+
+    public void subBytes(List<Integer> state, int[] sbox) {
+        for (int i = 0; i < 16; i++)
+            state.set(i, sbox[state.get(i)]);
+    }
+
+    public void addRoundKey(List<Integer> state, List<Integer> rkey) {
+        for (int i = 0; i < 16; i++)
+            state.set(i, state.get(i) ^ rkey.get(i));
+    }
+
+    public void shiftRows(List<Integer> state, int[] shifttab) {
+        List<Integer> h = new ArrayList<>(state.subList(0, state.size()));
+        for (int i = 0; i < 16; i++)
+            state.set(i, h.get(shifttab[i]));
+    }
+
+    public void mixColumns(List<Integer> state) {
+        for (int i = 0; i < 16; i += 4) {
+            int s0 = state.get(i);
+            int s1 = state.get(i + 1);
+            int s2 = state.get(i + 2);
+            int s3 = state.get(i + 3);
+            int h = s0 ^ s1 ^ s2 ^ s3;
+            state.set(i, state.get(i) ^ h ^ xtime[s0 ^ s1]);
+            state.set(i + 1, state.get(i + 1) ^ h ^ xtime[s1 ^ s2]);
+            state.set(i + 2, state.get(i + 2) ^ h ^ xtime[s2 ^ s3]);
+            state.set(i + 3, state.get(i + 3) ^ h ^ xtime[s3 ^ s0]);
+        }
+    }
+
+    public void mixColumns_Inv(List<Integer> state) {
+        for (int i = 0; i < 16; i += 4) {
+            int s0 = state.get(i);
+            int s1 = state.get(i + 1);
+            int s2 = state.get(i + 2);
+            int s3 = state.get(i + 3);
+            int h = s0 ^ s1 ^ s2 ^ s3;
+            int xh = xtime[h];
+            int h1 = xtime[xtime[xh ^ s0 ^ s2]] ^ h;
+            int h2 = xtime[xtime[xh ^ s1 ^ s3]] ^ h;
+            state.set(i, state.get(i) ^ h1 ^ xtime[s0 ^ s1]);
+            state.set(i + 1, state.get(i + 1) ^ h2 ^ xtime[s1 ^ s2]);
+            state.set(i + 2, state.get(i + 2) ^ h1 ^ xtime[s2 ^ s3]);
+            state.set(i + 3, state.get(i + 3) ^ h2 ^ xtime[s3 ^ s0]);
+        }
+    }
+
+    public String encrypt(byte[] data, AESKey aes) {
+
+        List<Integer> origin = new ArrayList<>();
+        for (byte b : data)
+            origin.add((int) b);
+        List<Integer> key = new ArrayList<>(aes.key);
+        expandKey(key);
+        encrypt(origin, key);
+        byte[] ret = new byte[origin.size()];
+        for (int i = 0; i < origin.size(); i++)
+            ret[i] = (byte) origin.get(i).intValue();
+        return ByteUtil.encodeBASE64(ret);
+    }
+
+    public String decrypt(String data, AESKey aes) {
+        byte[] arr = ByteUtil.decodeBASE64(data);
+        List<Integer> enText = new ArrayList<>();
+        for (byte b : arr)
+            enText.add(b & 0xff);
+
+        List<Integer> key = new ArrayList<>(aes.key);
+        expandKey(key);
+        decrypt(enText, key);
+
+        int end = enText.size();
+        while (end >= 0 && enText.get(end - 1) == 0 || (enText.get(end - 1) == 32)) {
+            end--;
+        }
+        byte[] ret = new byte[end];
+        for (int i = 0; i < end; i++) {
+            ret[i] = (byte) enText.get(i).intValue();
+        }
+        return new String(ret);
+    }
+
+    public String decrypt(String arg, byte[] key) {
+        List<Integer> key2 = new ArrayList<>();
+        for (byte b : key)
+            key2.add(((int) b) & 0xff);
+        return decrypt(arg, new AESKey(key2));
+    }
+
+    public String encrypt(byte[] data, byte[] key) {
+        List<Integer> key2 = new ArrayList<>();
+        for (byte b : key)
+            key2.add(((int) b) & 0xff);
+        return encrypt(data, new AESKey(key2));
+    }
+
+    public static class AESKey {
+        public List<Integer> key;
+
+        public AESKey(List<Integer> k) {
+            key = k;
+        }
+    }
+}
diff --git a/src/main/base/org/bdware/sc/encrypt/AES2.java b/src/main/base/org/bdware/sc/encrypt/AES2.java
new file mode 100644
index 0000000..762ed70
--- /dev/null
+++ b/src/main/base/org/bdware/sc/encrypt/AES2.java
@@ -0,0 +1,51 @@
+package org.bdware.sc.encrypt;
+
+import org.bdware.sc.conn.ByteUtil;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.StandardCharsets;
+import java.util.UUID;
+
+
+public class AES2 {
+    public static String initVector = "0123456789012345";
+
+    public static String generateAES() {
+        String aes = UUID.randomUUID().toString(); // 获取UUID并转化为String对象
+        aes = aes.replace("-", "").substring(0, 16);
+        return aes;
+    }
+
+    public static String encrypt(String key, String value) {
+        try {
+            IvParameterSpec iv = new IvParameterSpec(initVector.getBytes(StandardCharsets.UTF_8));
+            SecretKeySpec skeySpec = new SecretKeySpec(key.getBytes(StandardCharsets.UTF_8), "AES");
+            Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5PADDING");
+            cipher.init(Cipher.ENCRYPT_MODE, skeySpec, iv);
+            byte[] encrypted = cipher.doFinal(value.getBytes());
+            // System.out.println("encrypted string: " + new
+            // BASE64Encoder().encode(encrypted).replaceAll("\n", ""));
+            return ByteUtil.encodeBASE64(encrypted).replaceAll("\n", "");
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        return null;
+    }
+
+    public static String decrypt(String key, String encrypted) {
+        try {
+            IvParameterSpec iv = new IvParameterSpec(initVector.getBytes(StandardCharsets.UTF_8));
+            SecretKeySpec skeySpec = new SecretKeySpec(key.getBytes(StandardCharsets.UTF_8), "AES");
+            Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5PADDING");
+            cipher.init(Cipher.DECRYPT_MODE, skeySpec, iv);
+            byte[] original = cipher.doFinal(ByteUtil.decodeBASE64(encrypted));
+
+            return new String(original);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        return null;
+    }
+}
diff --git a/src/main/base/org/bdware/sc/encrypt/HardwareInfo.java b/src/main/base/org/bdware/sc/encrypt/HardwareInfo.java
new file mode 100644
index 0000000..f98aa88
--- /dev/null
+++ b/src/main/base/org/bdware/sc/encrypt/HardwareInfo.java
@@ -0,0 +1,144 @@
+package org.bdware.sc.encrypt;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Scanner;
+
+public class HardwareInfo {
+    public static OSType type = getOSType();
+
+    private static OSType getOSType() {
+        String osName = System.getProperty("os.name") + " " + System.getProperty("os.version");
+        System.out.println("[HardwareInfo] OS Name:" + osName);
+        if (osName.startsWith("Mac")) return OSType.mac;
+        else if (osName.startsWith("Linux")) {
+            return OSType.linux;
+        } else if (osName.contains("Windows")) {
+            return OSType.win;
+        }
+        return OSType.unknown;
+    }
+
+    public static String getCPUID() {
+        switch (type) {
+            case mac:
+                return getCPUID_Mac();
+            case linux:
+                return getCPUID_Linux();
+            case win:
+                return getCPUID_Windows();
+            default:
+                return "";
+        }
+    }
+
+    public static String getCPUID_Windows() {
+        try {
+            Process process =
+                    Runtime.getRuntime().exec(new String[]{"wmic", "cpu", "get", "ProcessorId"});
+            process.getOutputStream().close();
+            Scanner sc = new Scanner(process.getInputStream());
+            String property = sc.next();
+            String serial = sc.next();
+            System.out.println(property + ": " + serial);
+
+            sc.close();
+            return serial;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "";
+        }
+    }
+
+    public static String getCPUID_Linux() {
+        StringBuilder result = new StringBuilder();
+        String CPU_ID_CMD = "dmidecode";
+        BufferedReader bufferedReader;
+        Process p;
+        try {
+            p = Runtime.getRuntime().exec(new String[]{"sh", "-c", CPU_ID_CMD}); // 管道
+            bufferedReader = new BufferedReader(new InputStreamReader(p.getInputStream()));
+            String line;
+            int index;
+            while ((line = bufferedReader.readLine()) != null) {
+                // 寻找标示字符串[hwaddr]
+                index = line.toLowerCase().indexOf("uuid");
+                if (index >= 0) { // 找到了
+                    result = new StringBuilder(line.substring(index + "uuid".length() + 1).trim());
+                    break;
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        System.out.println("[HardwareInfo] get cpuInfo:" + result + "==");
+        if (result.toString().equals("")) {
+            try {
+                p = Runtime.getRuntime().exec(new String[]{"dmesg"});
+                Scanner sc = new Scanner(p.getInputStream());
+                while (sc.hasNextLine()) {
+                    String line = sc.nextLine();
+                    if (line.contains("Kernel") && line.contains("UUID")) {
+                        result = new StringBuilder(line.replaceAll(".*UUID=", ""));
+                        result = new StringBuilder(result.toString().replaceAll(" .*$", ""));
+                        break;
+                    }
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            } // 管道
+        }
+        if (result.toString().equals("")) {
+            Runtime rt = Runtime.getRuntime();
+            try {
+                Process proc = rt.exec("cat /sys/class/dmi/id/product_uuid");
+                InputStreamReader isr = new InputStreamReader(proc.getInputStream());
+                BufferedReader br = new BufferedReader(isr);
+                String line;
+                while ((line = br.readLine()) != null) {
+                    result.append(line);
+                }
+                isr.close();
+                result = new StringBuilder(result.toString().trim());
+                result = new StringBuilder(result.toString().replace(" ", ""));
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return result.toString().trim();
+    }
+
+    // system_profiler SPHardwareDataType
+    public static String getCPUID_Mac() {
+        Process p;
+        try {
+            p =
+                    Runtime.getRuntime()
+                            .exec(
+                                    new String[]{
+                                            "system_profiler", "SPHardwareDataType",
+                                    }); // 管道
+            Scanner sc = new Scanner(p.getInputStream());
+            while (sc.hasNextLine()) {
+                String line = sc.nextLine();
+                if (line.contains("Hardware UUID:")) {
+                    line = line.replaceAll(".*:", "");
+                    sc.close();
+                    return line;
+                }
+            }
+            sc.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return "";
+    }
+
+    public enum OSType {
+        mac,
+        linux,
+        win,
+        unknown
+    }
+}
diff --git a/src/main/base/org/bdware/sc/encrypt/RSA.java b/src/main/base/org/bdware/sc/encrypt/RSA.java
new file mode 100644
index 0000000..4b5e724
--- /dev/null
+++ b/src/main/base/org/bdware/sc/encrypt/RSA.java
@@ -0,0 +1,179 @@
+package org.bdware.sc.encrypt;
+
+import org.bdware.sc.conn.ByteUtil;
+
+import java.math.BigInteger;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.SecureRandom;
+import java.security.interfaces.RSAPrivateCrtKey;
+import java.security.interfaces.RSAPublicKey;
+import java.util.Arrays;
+
+public class RSA {
+    public BigInteger n, e1, e2;
+
+    private RSA() {
+    }
+
+    public static KeyPair buildKeyPair() {
+        try {
+            final int keySize = 2048;
+            SecureRandom random = new SecureRandom();
+            KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
+            keyPairGenerator.initialize(keySize, random);
+            return keyPairGenerator.genKeyPair();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public static RSA generate() {
+        KeyPair keyPair = buildKeyPair();
+        return generate(keyPair);
+    }
+
+//    public static final String SIGN_ALGORITHMS = "SHA1WithRSA";
+
+    public static RSA generate(KeyPair pair) {
+        if (null == pair) {
+            pair = buildKeyPair();
+        }
+        if (null == pair) {
+            throw new NullPointerException();
+        }
+        RSAPublicKey pubKey = (RSAPublicKey) pair.getPublic();
+        RSA ret = new RSA();
+        ret.n = pubKey.getModulus();
+        ret.e1 = pubKey.getPublicExponent();
+        RSAPrivateCrtKey privateKey = (RSAPrivateCrtKey) pair.getPrivate();
+        ret.e2 = privateKey.getPrivateExponent();
+        return ret;
+    }
+
+    //	public String sign(byte[] content) {
+    //		try {
+    //			KeyFactory keyf = KeyFactory.getInstance("RSA");
+    //			PrivateKey priKey = keyf.generatePrivate(priPKCS8);
+    //			java.security.Signature signature = java.security.Signature.getInstance(SIGN_ALGORITHMS);
+    //			signature.initSign(priKey);
+    //			signature.update(content);
+    //			byte[] signed = signature.sign();
+    //			return new BASE64Encoder().encode(signed);
+    //		} catch (Exception e) {
+    //			e.printStackTrace();
+    //		}
+    //		return null;
+    //	}
+
+    //	public static boolean doCheck(byte[] content, String sign) {
+    //		try {
+    //			KeyFactory keyFactory = KeyFactory.getInstance("RSA");
+    //			byte[] encodedKey = Base64.decode(publicKey);
+    //			PublicKey pubKey = keyFactory.generatePublic(new X509EncodedKeySpec(encodedKey));
+    //
+    //			java.security.Signature signature = java.security.Signature.getInstance(SIGN_ALGORITHMS);
+    //
+    //			signature.initVerify(pubKey);
+    //			signature.update(content.getBytes());
+    //
+    //			boolean bverify = signature.verify(Base64.decode(sign));
+    //			return bverify;
+    //
+    //		} catch (Exception e) {
+    //			e.printStackTrace();
+    //		}
+    //
+    //		return false;
+    //	}
+
+    public static RSA generateFromBase64(String base64) {
+        try {
+            byte[] bytes = ByteUtil.decodeBASE64(base64);
+            RSA rsa = new RSA();
+            if (null == bytes) {
+                throw new NullPointerException();
+            }
+            String str = new String(bytes);
+            String[] strArr = str.split(",");
+            rsa.n = new BigInteger(strArr[0], 16);
+            rsa.e1 = new BigInteger(strArr[1], 16);
+            rsa.e2 = new BigInteger(strArr[2], 16);
+            return rsa;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public static String str2Hex(String str) {
+        if (str.length() % 2 == 1) str = "0" + str;
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < str.length() / 2; i++) {
+            char c = (char) (16 * code(str.charAt(i * 2)) + code(str.charAt(i * 2 + 1)));
+            sb.append(c);
+        }
+        return sb.toString();
+    }
+
+    private static int code(char c) {
+        if (c >= '0' && c <= '9') return c - '0';
+        else return c - 'a' + 10;
+    }
+
+    public String toBase64Pubkey() {
+        String data = n.toString(16) + "," + e1.toString(16) + "," + 0;
+        return ByteUtil.encodeBASE64(data.getBytes()).replaceAll("\n", "");
+    }
+
+    public String toBase64() {
+        String data = n.toString(16) + "," + e1.toString(16) + "," + e2.toString(16);
+        return ByteUtil.encodeBASE64(data.getBytes()).replaceAll("\n", "");
+    }
+
+    public BigInteger bytesToBI(byte[] bytes) {
+        return new BigInteger(1, bytes);
+    }
+
+    public byte[] bIToBytes(BigInteger bi) {
+        int len = (bi.bitLength() + 7) >> 3;
+        byte[] b = bi.toByteArray();
+        int n = b.length;
+        if (n == len) {
+            return b;
+        }
+        // BigInteger prefixed a 0x00 byte for 2's complement form, remove it
+        if ((n == len + 1) && (b[0] == 0)) {
+            byte[] t = new byte[len];
+            System.arraycopy(b, 1, t, 0, len);
+            return t;
+        }
+        // must be smaller
+        assert (n < len);
+        byte[] t = new byte[len];
+        System.arraycopy(b, 0, t, (len - n), n);
+        return t;
+    }
+
+    public byte[] encode(byte[] plain) {
+        return bIToBytes(bytesToBI(plain).modPow(e1, n));
+    }
+
+    public byte[] decode(byte[] plain) {
+        System.out.println("[RSA] decode bytearray:" + Arrays.hashCode(plain));
+        return bIToBytes(bytesToBI(plain).modPow(e2, n));
+    }
+
+    public String encode(BigInteger bi) {
+        String str = bi.modPow(e1, n).toString(16);
+        System.out.println("[RSA.java] encodeStr:" + str);
+        return str2Hex(str);
+    }
+
+    public String decode(BigInteger bi) {
+        String str = bi.modPow(e2, n).toString(16);
+        System.out.println("[RSA.java] decodeStr:" + str);
+        return str2Hex(str);
+    }
+}
diff --git a/src/main/base/org/bdware/sc/event/Event.java b/src/main/base/org/bdware/sc/event/Event.java
new file mode 100644
index 0000000..af1558b
--- /dev/null
+++ b/src/main/base/org/bdware/sc/event/Event.java
@@ -0,0 +1,23 @@
+package org.bdware.sc.event;
+
+import org.bdware.sc.event.REvent.REventSemantics;
+import org.bdware.sc.util.JsonUtil;
+
+public class Event {
+    public String topic;
+    public String content;
+    public REventSemantics semantics;
+
+    public Event(String topic, String content, REventSemantics semantics) {
+        this.topic = topic;
+        this.content = content;
+        this.semantics = semantics;
+        if (REventSemantics.NEED_RETRY.equals(this.semantics)) {
+            this.semantics = REventSemantics.ONLY_ONCE;
+        }
+    }
+
+    public String getAll() {
+        return JsonUtil.toJson(this);
+    }
+}
diff --git a/src/main/base/org/bdware/sc/event/REvent.java b/src/main/base/org/bdware/sc/event/REvent.java
new file mode 100644
index 0000000..cb71895
--- /dev/null
+++ b/src/main/base/org/bdware/sc/event/REvent.java
@@ -0,0 +1,110 @@
+package org.bdware.sc.event;
+
+import org.bdware.sc.bean.SM2Verifiable;
+
+import java.io.Serializable;
+
+/**
+ * Events for requests
+ */
+public class REvent extends SM2Verifiable implements Serializable {
+    private final REventType type;
+    private final String topic;
+    private final String content;
+    private final String requestID;
+    private String txHash;
+    private String hash;
+    private String sender;
+    private REventSemantics semantics = REventSemantics.AT_LEAST_ONCE;
+    private boolean forward = true;
+
+    public REvent(String topic, REventType type, String content, String requestID) {
+        this.topic = topic;
+        this.type = type;
+        this.content = content;
+        this.requestID = requestID;
+    }
+
+    public String getTopic() {
+        return topic;
+    }
+
+    public REventType getType() {
+        return type;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public boolean isForward() {
+        return forward;
+    }
+
+    public void setForward(boolean forward) {
+        this.forward = forward;
+    }
+
+    public String getHash() {
+        return hash;
+    }
+
+    public void setHash(String hash) {
+        this.hash = hash;
+    }
+
+    public String getTxHash() {
+        return txHash;
+    }
+
+    public void setTxHash(String txHash) {
+        this.txHash = txHash;
+    }
+
+    public String getRequestID() {
+        return requestID;
+    }
+
+    public REventSemantics getSemantics() {
+        return semantics;
+    }
+
+    public void setSemantics(REventSemantics semantics) {
+        this.semantics = semantics;
+    }
+
+    public void doSignature(String pubKey, String privKey) {
+        this.setPublicKey(pubKey);
+        this.doSignature(privKey);
+    }
+
+    @Override
+    public String getPublicKey() {
+        return this.sender;
+    }
+
+    @Override
+    public void setPublicKey(String pubkey) {
+        this.sender = pubkey;
+    }
+
+    @Override
+    public String getContentStr() {
+        return String.format("{\"topic\":\"%s\",\"content\":\"%s\",\"type\":\"%s\"," +
+                        "\"semantics\":\"%s\",\"requestID\":\"%s\",\"txHash\":\"%s\"}",
+                topic,
+                content,
+                type,
+                semantics,
+                requestID,
+                (null == txHash ? "" : txHash));
+    }
+
+    public enum REventType {
+        SUBSCRIBE, UNSUBSCRIBE, PUBLISH, PRESUB, PREPUB
+    }
+
+    public enum REventSemantics {
+        AT_LEAST_ONCE, AT_MOST_ONCE, ONLY_ONCE, NEED_RETRY
+    }
+}
diff --git a/src/main/base/org/bdware/sc/ftpcontract.vm b/src/main/base/org/bdware/sc/ftpcontract.vm
new file mode 100644
index 0000000..42e6b64
--- /dev/null
+++ b/src/main/base/org/bdware/sc/ftpcontract.vm
@@ -0,0 +1,12 @@
+contract ftpContract {
+	export function preMain(args){
+		#foreach($prop in $initList)
+		Global.${prop[0]} = ${prop[1]};
+		#end
+	}
+	export function main(args){
+		if (${validate})
+			return false;
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/src/main/base/org/bdware/sc/gen/P$M$C.java b/src/main/base/org/bdware/sc/gen/P$M$C.java
new file mode 100644
index 0000000..7a39a14
--- /dev/null
+++ b/src/main/base/org/bdware/sc/gen/P$M$C.java
@@ -0,0 +1,38 @@
+package org.bdware.sc.gen;
+
+import org.bdware.sc.py.PYEntry;
+import org.bdware.sc.py.bean.PYMethodParams;
+import org.bdware.sc.py.bean.PYObject;
+
+public class P$M$C extends PYObject {
+
+    public P$M$C(Object... params) {
+        PYMethodParams paramObj = new PYMethodParams();
+        paramObj.setParams(params);
+        setID(PYEntry.instance.creatObject("P.M.C", paramObj));
+    }
+
+    public static String staticFunc(Object... params) {
+        PYMethodParams paramObj = new PYMethodParams();
+        paramObj.setParams(params);
+        return PYEntry.instance.invokeClzStaticMethod("P.M.C" + "." + "staticFunc", paramObj);
+    }
+
+    public static String moduleFunc(Object... params) {
+        PYMethodParams paramObj = new PYMethodParams();
+        paramObj.setParams(params);
+        return PYEntry.instance.invokeModuleFunc("P.M", "moduleFunc", paramObj);
+    }
+
+    public String sayHello(Object... params) {
+        PYMethodParams paramObj = new PYMethodParams();
+        paramObj.setParams(params);
+        return PYEntry.instance.invokeObjectMethod(getID(), "sayHello", paramObj);
+    }
+
+    public String clzClassMethod(Object... params) {
+        PYMethodParams paramObj = new PYMethodParams();
+        paramObj.setParams(params);
+        return PYEntry.instance.invokeClzClassMethod("P.M.C" + "." + "clzClassMethod", paramObj);
+    }
+}
diff --git a/src/main/base/org/bdware/sc/gen/PYGenerator.java b/src/main/base/org/bdware/sc/gen/PYGenerator.java
new file mode 100644
index 0000000..56aad78
--- /dev/null
+++ b/src/main/base/org/bdware/sc/gen/PYGenerator.java
@@ -0,0 +1,369 @@
+package org.bdware.sc.gen;
+
+import org.bdware.sc.py.bean.PYClass;
+import org.bdware.sc.py.bean.PYMethod;
+import org.bdware.sc.py.bean.PYModule;
+import org.bdware.sc.py.bean.PYPackage;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+import java.io.IOException;
+import java.util.*;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+public class PYGenerator implements Opcodes {
+    static final String PKG_NAME = "com/yancloud/callpy/";
+    private PYPackage pkgObj;
+
+    public PYPackage getPkgObj() {
+        return pkgObj;
+    }
+
+    public void setPkgObj(PYPackage pkgObj) {
+        this.pkgObj = pkgObj;
+    }
+
+    public void genClassFiles(ZipOutputStream zout, PYPackage pyPkg) throws Exception {
+        if (null == pyPkg) {
+            if (null == this.pkgObj) {
+                System.out.println("please use setPkgObj method to specify pkgObj");
+                return;
+            }
+        } else {
+            this.pkgObj = pyPkg;
+        }
+        Map<String, byte[]> clzs = genClasses();
+        Set<String> dirs = new HashSet<>();
+        for (String str : clzs.keySet()) {
+            System.out.println("[PYGenerator] genFile:" + str);
+            zout.putNextEntry(new ZipEntry(str + ".class"));
+            zout.write(clzs.get(str));
+            zout.closeEntry();
+            System.out.println("add entry:" + str + ".class");
+        }
+    }
+
+    private void putDirs(Set<String> dirs, String dir, ZipOutputStream zout) throws IOException {
+        dir = dir.replaceAll("[^/]*$", "");
+        if (!dirs.contains(dir) && dir.length() > 1) {
+            putDirs(dirs, dir.substring(0, dir.length() - 1), zout);
+            zout.putNextEntry(new ZipEntry(dir));
+            zout.closeEntry();
+            dirs.add(dir);
+            System.out.println("add entry:" + dir);
+        }
+    }
+
+    public Map<String, byte[]> genClasses() {
+        Map<String, byte[]> clzs = new HashMap<>();
+        String pkgName = pkgObj.getName();
+        System.out.println("[genClasses]pkgName:  " + pkgName);
+        for (PYModule module : pkgObj.getModules()) {
+            String moduleName = module.getName();
+            System.out.println("[genClasses]moduleName: " + moduleName);
+            // 生成module中的每个类
+            genClasses(clzs, module.getClzList(), pkgName + "_" + moduleName + "_");
+            // 生成module中静态方法
+            genFuncs(clzs, module.getFuncList(), pkgName + "_" + moduleName);
+        }
+        return clzs;
+    }
+
+    private void genFuncs(Map<String, byte[]> clzs, List<PYMethod> funcList, String classNameStr) {
+        System.out.println("[genFuncs]className: " + classNameStr);
+        if (funcList.size() > 0) {
+            ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
+            MethodVisitor mv;
+            // 生成类
+            cw.visit(
+                    V1_7,
+                    ACC_PUBLIC + ACC_SUPER,
+                    PKG_NAME + classNameStr,
+                    null,
+                    "com/yancloud/py/bean/PYObject",
+                    null);
+            // 生成该module中的静态方法
+            for (PYMethod pyFunction : funcList) {
+                String functionName = pyFunction.getName();
+                {
+                    mv =
+                            cw.visitMethod(
+                                    ACC_PUBLIC + ACC_STATIC + ACC_VARARGS,
+                                    functionName,
+                                    "([Ljava/lang/Object;)Ljava/lang/String;",
+                                    null,
+                                    null);
+                    mv.visitCode();
+                    Label l0 = new Label();
+                    mv.visitLabel(l0);
+                    mv.visitTypeInsn(NEW, "com/yancloud/py/bean/PYMethodParams");
+                    mv.visitInsn(DUP);
+                    mv.visitMethodInsn(INVOKESPECIAL, "com/yancloud/py/bean/PYMethodParams", "<init>", "()V");
+                    mv.visitVarInsn(ASTORE, 1);
+                    Label l1 = new Label();
+                    mv.visitLabel(l1);
+                    mv.visitVarInsn(ALOAD, 1);
+                    mv.visitVarInsn(ALOAD, 0);
+                    mv.visitMethodInsn(
+                            INVOKEVIRTUAL,
+                            "com/yancloud/py/bean/PYMethodParams",
+                            "setParams",
+                            "(Ljava/lang/Object;)V");
+                    Label l2 = new Label();
+                    mv.visitLabel(l2);
+                    mv.visitFieldInsn(
+                            GETSTATIC, "com/yancloud/py/PYEntry", "instance", "Lcom/yancloud/py/PYEntry;");
+                    mv.visitLdcInsn(classNameStr);
+                    mv.visitLdcInsn(functionName);
+                    mv.visitVarInsn(ALOAD, 1);
+                    mv.visitMethodInsn(
+                            INVOKEVIRTUAL,
+                            "com/yancloud/py/PYEntry",
+                            "invokeModuleFunc",
+                            "(Ljava/lang/String;Ljava/lang/String;Lcom/yancloud/py/bean/PYMethodParams;)Ljava/lang/String;");
+                    mv.visitInsn(ARETURN);
+                    Label l3 = new Label();
+                    mv.visitLabel(l3);
+                    mv.visitLocalVariable("params", "[Ljava/lang/Object;", null, l0, l3, 0);
+                    mv.visitLocalVariable(
+                            "paramObj", "Lcom/yancloud/py/bean/PYMethodParams;", null, l1, l3, 1);
+                    mv.visitMaxs(4, 2);
+                    mv.visitEnd();
+                }
+            }
+            cw.visitEnd();
+            byte[] b = cw.toByteArray();
+            clzs.put(PKG_NAME + classNameStr, b);
+        }
+    }
+
+    private void genClasses(Map<String, byte[]> clzs, List<PYClass> clzList, String moduleSig) {
+        for (PYClass pyClass : clzList) {
+            String className = pyClass.getName();
+            ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
+            MethodVisitor mv;
+            String classNameStr = moduleSig + className;
+            System.out.println("[genClasses]className: " + classNameStr);
+
+            // 生成类
+            cw.visit(
+                    V1_7,
+                    ACC_PUBLIC + ACC_SUPER,
+                    PKG_NAME + classNameStr,
+                    null,
+                    "com/yancloud/py/bean/PYObject",
+                    null);
+
+            // 生成该类的构造方法
+            {
+                mv =
+                        cw.visitMethod(
+                                ACC_PUBLIC + ACC_VARARGS, "<init>", "([Ljava/lang/Object;)V", null, null);
+                mv.visitCode();
+                Label l0 = new Label();
+                mv.visitLabel(l0);
+                mv.visitVarInsn(ALOAD, 0);
+                mv.visitMethodInsn(INVOKESPECIAL, "com/yancloud/py/bean/PYObject", "<init>", "()V");
+                Label l1 = new Label();
+                mv.visitLabel(l1);
+                mv.visitTypeInsn(NEW, "com/yancloud/py/bean/PYMethodParams");
+                mv.visitInsn(DUP);
+                mv.visitMethodInsn(INVOKESPECIAL, "com/yancloud/py/bean/PYMethodParams", "<init>", "()V");
+                mv.visitVarInsn(ASTORE, 2);
+                Label l2 = new Label();
+                mv.visitLabel(l2);
+                mv.visitVarInsn(ALOAD, 2);
+                mv.visitVarInsn(ALOAD, 1);
+                mv.visitMethodInsn(
+                        INVOKEVIRTUAL,
+                        "com/yancloud/py/bean/PYMethodParams",
+                        "setParams",
+                        "(Ljava/lang/Object;)V");
+                Label l3 = new Label();
+                mv.visitLabel(l3);
+                mv.visitVarInsn(ALOAD, 0);
+                mv.visitFieldInsn(
+                        GETSTATIC, "com/yancloud/py/PYEntry", "instance", "Lcom/yancloud/py/PYEntry;");
+                mv.visitLdcInsn(classNameStr);
+                mv.visitVarInsn(ALOAD, 2);
+                mv.visitMethodInsn(
+                        INVOKEVIRTUAL,
+                        "com/yancloud/py/PYEntry",
+                        "creatObject",
+                        "(Ljava/lang/String;Lcom/yancloud/py/bean/PYMethodParams;)Ljava/lang/String;");
+                mv.visitMethodInsn(
+                        INVOKEVIRTUAL, PKG_NAME + classNameStr, "setID", "(Ljava/lang/String;)V");
+                Label l4 = new Label();
+                mv.visitLabel(l4);
+                mv.visitInsn(RETURN);
+                Label l5 = new Label();
+                mv.visitLabel(l5);
+                mv.visitLocalVariable("this", "Lcom/yancloud/gen/P$M$C;", null, l0, l5, 0);
+                mv.visitLocalVariable("params", "[Ljava/lang/Object;", null, l0, l5, 1);
+                mv.visitLocalVariable("paramObj", "Lcom/yancloud/py/bean/PYMethodParams;", null, l2, l5, 2);
+                mv.visitMaxs(4, 3);
+                mv.visitEnd();
+            }
+
+            // 遍历methods
+            for (PYMethod pyMethod : pyClass.getMethods()) {
+                String methodName = pyMethod.getName();
+                // 生成该类中的每个method
+                if (pyMethod.isStatic()) {
+                    {
+                        mv =
+                                cw.visitMethod(
+                                        ACC_PUBLIC + ACC_STATIC + ACC_VARARGS,
+                                        methodName,
+                                        "([Ljava/lang/Object;)Ljava/lang/String;",
+                                        null,
+                                        null);
+                        mv.visitCode();
+                        Label l0 = new Label();
+                        mv.visitLabel(l0);
+                        mv.visitTypeInsn(NEW, "com/yancloud/py/bean/PYMethodParams");
+                        mv.visitInsn(DUP);
+                        mv.visitMethodInsn(
+                                INVOKESPECIAL, "com/yancloud/py/bean/PYMethodParams", "<init>", "()V");
+                        mv.visitVarInsn(ASTORE, 1);
+                        Label l1 = new Label();
+                        mv.visitLabel(l1);
+                        mv.visitVarInsn(ALOAD, 1);
+                        mv.visitVarInsn(ALOAD, 0);
+                        mv.visitMethodInsn(
+                                INVOKEVIRTUAL,
+                                "com/yancloud/py/bean/PYMethodParams",
+                                "setParams",
+                                "(Ljava/lang/Object;)V");
+                        Label l2 = new Label();
+                        mv.visitLabel(l2);
+                        mv.visitFieldInsn(
+                                GETSTATIC, "com/yancloud/py/PYEntry", "instance", "Lcom/yancloud/py/PYEntry;");
+                        mv.visitLdcInsn(classNameStr + "." + methodName);
+                        mv.visitVarInsn(ALOAD, 1);
+                        mv.visitMethodInsn(
+                                INVOKEVIRTUAL,
+                                "com/yancloud/py/PYEntry",
+                                "invokeClzStaticMethod",
+                                "(Ljava/lang/String;Lcom/yancloud/py/bean/PYMethodParams;)Ljava/lang/String;");
+                        mv.visitInsn(ARETURN);
+                        Label l3 = new Label();
+                        mv.visitLabel(l3);
+                        mv.visitLocalVariable("params", "[Ljava/lang/Object;", null, l0, l3, 0);
+                        mv.visitLocalVariable(
+                                "paramObj", "Lcom/yancloud/py/bean/PYMethodParams;", null, l1, l3, 1);
+                        mv.visitMaxs(3, 2);
+                        mv.visitEnd();
+                    }
+                } else {
+                    {
+                        mv =
+                                cw.visitMethod(
+                                        ACC_PUBLIC + ACC_VARARGS,
+                                        methodName,
+                                        "([Ljava/lang/Object;)Ljava/lang/String;",
+                                        null,
+                                        null);
+                        mv.visitCode();
+                        Label l0 = new Label();
+                        mv.visitLabel(l0);
+                        mv.visitTypeInsn(NEW, "com/yancloud/py/bean/PYMethodParams");
+                        mv.visitInsn(DUP);
+                        mv.visitMethodInsn(
+                                INVOKESPECIAL, "com/yancloud/py/bean/PYMethodParams", "<init>", "()V");
+                        mv.visitVarInsn(ASTORE, 2);
+                        Label l1 = new Label();
+                        mv.visitLabel(l1);
+                        mv.visitVarInsn(ALOAD, 2);
+                        mv.visitVarInsn(ALOAD, 1);
+                        mv.visitMethodInsn(
+                                INVOKEVIRTUAL,
+                                "com/yancloud/py/bean/PYMethodParams",
+                                "setParams",
+                                "(Ljava/lang/Object;)V");
+                        Label l2 = new Label();
+                        mv.visitLabel(l2);
+                        mv.visitFieldInsn(
+                                GETSTATIC, "com/yancloud/py/PYEntry", "instance", "Lcom/yancloud/py/PYEntry;");
+                        mv.visitVarInsn(ALOAD, 0);
+                        mv.visitMethodInsn(
+                                INVOKEVIRTUAL, "com/yancloud/gen/P$M$C", "getID", "()Ljava/lang/String;");
+                        mv.visitLdcInsn(classNameStr + "." + methodName);
+                        mv.visitVarInsn(ALOAD, 2);
+                        mv.visitMethodInsn(
+                                INVOKEVIRTUAL,
+                                "com/yancloud/py/PYEntry",
+                                "invokeObjectMethod",
+                                "(Ljava/lang/String;Ljava/lang/String;Lcom/yancloud/py/bean/PYMethodParams;)Ljava/lang/String;");
+                        mv.visitInsn(ARETURN);
+                        Label l3 = new Label();
+                        mv.visitLabel(l3);
+                        mv.visitLocalVariable("this", "Lcom/yancloud/gen/P$M$C;", null, l0, l3, 0);
+                        mv.visitLocalVariable("params", "[Ljava/lang/Object;", null, l0, l3, 1);
+                        mv.visitLocalVariable(
+                                "paramObj", "Lcom/yancloud/py/bean/PYMethodParams;", null, l1, l3, 2);
+                        mv.visitMaxs(4, 3);
+                        mv.visitEnd();
+                    }
+                }
+            }
+
+            // 遍历funcs
+            for (PYMethod pyFunction : pyClass.getFuncs()) {
+                String functionName = pyFunction.getName();
+                // 生成该类中的每个function
+                {
+                    mv =
+                            cw.visitMethod(
+                                    ACC_PUBLIC + ACC_VARARGS,
+                                    functionName,
+                                    "([Ljava/lang/Object;)Ljava/lang/String;",
+                                    null,
+                                    null);
+                    mv.visitCode();
+                    Label l0 = new Label();
+                    mv.visitLabel(l0);
+                    mv.visitTypeInsn(NEW, "com/yancloud/py/bean/PYMethodParams");
+                    mv.visitInsn(DUP);
+                    mv.visitMethodInsn(INVOKESPECIAL, "com/yancloud/py/bean/PYMethodParams", "<init>", "()V");
+                    mv.visitVarInsn(ASTORE, 2);
+                    Label l1 = new Label();
+                    mv.visitLabel(l1);
+                    mv.visitVarInsn(ALOAD, 2);
+                    mv.visitVarInsn(ALOAD, 1);
+                    mv.visitMethodInsn(
+                            INVOKEVIRTUAL,
+                            "com/yancloud/py/bean/PYMethodParams",
+                            "setParams",
+                            "(Ljava/lang/Object;)V");
+                    Label l2 = new Label();
+                    mv.visitLabel(l2);
+                    mv.visitFieldInsn(
+                            GETSTATIC, "com/yancloud/py/PYEntry", "instance", "Lcom/yancloud/py/PYEntry;");
+                    mv.visitLdcInsn(classNameStr + "." + functionName);
+                    mv.visitVarInsn(ALOAD, 2);
+                    mv.visitMethodInsn(
+                            INVOKEVIRTUAL,
+                            "com/yancloud/py/PYEntry",
+                            "invokeClzClassMethod",
+                            "(Ljava/lang/String;Lcom/yancloud/py/bean/PYMethodParams;)Ljava/lang/String;");
+                    mv.visitInsn(ARETURN);
+                    Label l3 = new Label();
+                    mv.visitLabel(l3);
+                    mv.visitLocalVariable("this", "Lcom/yancloud/gen/P$M$C;", null, l0, l3, 0);
+                    mv.visitLocalVariable("params", "[Ljava/lang/Object;", null, l0, l3, 1);
+                    mv.visitLocalVariable(
+                            "paramObj", "Lcom/yancloud/py/bean/PYMethodParams;", null, l1, l3, 2);
+                    mv.visitMaxs(3, 3);
+                    mv.visitEnd();
+                }
+            }
+            cw.visitEnd();
+            byte[] b = cw.toByteArray();
+            clzs.put(PKG_NAME + classNameStr, b);
+        }
+    }
+}
diff --git a/src/main/base/org/bdware/sc/get/GetMessage.java b/src/main/base/org/bdware/sc/get/GetMessage.java
new file mode 100644
index 0000000..2aaf989
--- /dev/null
+++ b/src/main/base/org/bdware/sc/get/GetMessage.java
@@ -0,0 +1,20 @@
+package org.bdware.sc.get;
+
+import java.io.Serializable;
+
+public class GetMessage implements Serializable {
+    private static final long serialVersionUID = 1870689578034300371L;
+    public String type;
+    public String pkgName;
+    public String method;
+    public String arg;
+
+    public GetMessage() {
+    }
+
+    public GetMessage(String pkgName, String method, String arg) {
+        this.pkgName = pkgName;
+        this.method = method;
+        this.arg = arg;
+    }
+}
\ No newline at end of file
diff --git a/src/main/base/org/bdware/sc/node/AnnotationHook.java b/src/main/base/org/bdware/sc/node/AnnotationHook.java
new file mode 100644
index 0000000..25e12f3
--- /dev/null
+++ b/src/main/base/org/bdware/sc/node/AnnotationHook.java
@@ -0,0 +1,8 @@
+package org.bdware.sc.node;
+
+import org.bdware.sc.JSEngine;
+import org.bdware.sc.bean.ContractRequest;
+
+public interface AnnotationHook {
+    Object handle(ContractRequest input, JSEngine desktopEngine, Object ret);
+}
diff --git a/src/main/base/org/bdware/sc/node/AnnotationNode.java b/src/main/base/org/bdware/sc/node/AnnotationNode.java
new file mode 100644
index 0000000..7dc7f8e
--- /dev/null
+++ b/src/main/base/org/bdware/sc/node/AnnotationNode.java
@@ -0,0 +1,28 @@
+package org.bdware.sc.node;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+public class AnnotationNode implements Serializable {
+    String type;
+    List<String> args;
+
+    public AnnotationNode(String type) {
+        this.type = type;
+        args = new ArrayList<>();
+    }
+
+    public void addArg(String arg) {
+        args.add(arg);
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public List<String> getArgs() {
+        return args;
+    }
+
+}
diff --git a/src/main/base/org/bdware/sc/node/ClassNode.java b/src/main/base/org/bdware/sc/node/ClassNode.java
new file mode 100644
index 0000000..646b240
--- /dev/null
+++ b/src/main/base/org/bdware/sc/node/ClassNode.java
@@ -0,0 +1,25 @@
+package org.bdware.sc.node;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ClassNode extends Script {
+    String clzName;
+    String fileName;
+    List<FunctionNode> functions;
+
+    public ClassNode(String clzName, String fileName) {
+        this.clzName = clzName;
+        this.fileName = fileName;
+        functions = new ArrayList<>();
+    }
+
+    public void addFunction(FunctionNode function) {
+        functions.add(function);
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+}
diff --git a/src/main/base/org/bdware/sc/node/ContractLogDetail.java b/src/main/base/org/bdware/sc/node/ContractLogDetail.java
new file mode 100644
index 0000000..27943ce
--- /dev/null
+++ b/src/main/base/org/bdware/sc/node/ContractLogDetail.java
@@ -0,0 +1,15 @@
+package org.bdware.sc.node;
+
+public class ContractLogDetail {
+    public boolean logToChain;
+    public boolean logArg;
+    public boolean logBranch;
+    public boolean logResult;
+
+    public ContractLogDetail() {
+        this.logArg = false;
+        this.logBranch = false;
+        this.logResult = false;
+        this.logToChain = false;
+    }
+}
diff --git a/src/main/base/org/bdware/sc/node/ContractManifest.java b/src/main/base/org/bdware/sc/node/ContractManifest.java
new file mode 100644
index 0000000..c3d76fd
--- /dev/null
+++ b/src/main/base/org/bdware/sc/node/ContractManifest.java
@@ -0,0 +1,53 @@
+package org.bdware.sc.node;
+
+import org.bdware.sc.bean.ContractExecType;
+import org.bdware.sc.py.bean.PYPackage;
+
+import java.util.List;
+
+public class ContractManifest {
+    public String main;
+    public String memory;
+    public String doi;
+    public String stateful;
+    public long insnLimit;
+    public long buildTime;
+    public String builder;
+    private ContractExecType type;
+    private List<PYPackage> pyDependences;
+    private List<Permission> permissions;
+    public boolean startAtUnpack;
+    public String sourcePath;
+
+    public List<PYPackage> getPyDependences() {
+        return pyDependences;
+    }
+
+    public void setPyDependences(List<PYPackage> pyDependences) {
+        this.pyDependences = pyDependences;
+    }
+
+    public ContractExecType getType() {
+        return type;
+    }
+
+    public void setType(ContractExecType type) {
+        this.type = type;
+    }
+
+    public List<Permission> getPermissions() {
+        return permissions;
+    }
+
+    public void setPermissions(List<Permission> permissions) {
+        this.permissions = permissions;
+    }
+
+    public long getInsnLimit() {
+        return insnLimit;
+    }
+
+    public void setInsnLimit(long insnLimit) {
+        this.insnLimit = insnLimit;
+    }
+}
diff --git a/src/main/base/org/bdware/sc/node/ContractNode.java b/src/main/base/org/bdware/sc/node/ContractNode.java
new file mode 100644
index 0000000..15910be
--- /dev/null
+++ b/src/main/base/org/bdware/sc/node/ContractNode.java
@@ -0,0 +1,200 @@
+package org.bdware.sc.node;
+
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.bdware.sc.event.REvent.REventSemantics;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.HashSet;
+
+public class ContractNode {
+    private final List<ImportNode> imports;
+    private final List<ClassNode> clzs;
+    private final List<FunctionNode> functions;
+    private final Map<String, FunctionNode> functionMap;
+    public Map<String, REventSemantics> events;
+    public List<AnnotationNode> annotations;
+    public boolean sigRequired;
+    public String memorySet;
+    boolean isBundle;
+    String contractName;
+    List<Permission> permission;
+    List<LogType> logTypes;
+    YjsType yjsType;
+    boolean instrumentBranch;
+    private final Set<String> dependentContracts;
+
+    public ContractNode(String name) {
+        contractName = name;
+        imports = new ArrayList<>();
+        clzs = new ArrayList<>();
+        functions = new ArrayList<>();
+        functionMap = new HashMap<>();
+        isBundle = false;
+        events = new HashMap<>();
+        annotations = new ArrayList<>();
+        permission = new ArrayList<>();
+        instrumentBranch = false;
+        dependentContracts = new HashSet<>();
+    }
+
+    public void addFunction(FunctionNode function) {
+        functionMap.put(function.functionName, function);
+        getFunctions().add(function);
+    }
+
+    public void addClass(ClassNode clzNode) {
+        getClzs().add(clzNode);
+    }
+
+    public List<FunctionNode> getFunctions() {
+        return functions;
+    }
+
+    public List<ClassNode> getClzs() {
+        return clzs;
+    }
+
+    public void initPlainText(CommonTokenStream cts) {
+        for (ClassNode cn : clzs) {
+            cn.initText(cts);
+        }
+        for (FunctionNode fun : functions) {
+            if (fun.isExport) {
+                fun.initTextWithoutExport(cts);
+            } else {
+                fun.initText(cts);
+            }
+            if (fun.isExport || fun.functionName.equals("onCreate")) {
+                fun.initTextWithRequester();
+            }
+        }
+    }
+
+    public int queryLine(String methodName) {
+        FunctionNode cn = functionMap.get(methodName);
+        if (null != cn) {
+            return cn.getLine();
+        }
+        return 0;
+    }
+
+    public String getContractName() {
+        return contractName;
+    }
+
+    public String queryFile(String methodName) {
+        FunctionNode cn = functionMap.get(methodName);
+        if (null != cn) {
+            return cn.getFileName();
+        } else {
+            return "--";
+        }
+    }
+
+    public void addImportStmt(ImportNode importNode) {
+        imports.add(importNode);
+    }
+
+    public List<ImportNode> getImports() {
+        return imports;
+    }
+
+    public boolean isBundle() {
+        return isBundle;
+    }
+
+    public void setIsBundle(boolean b) {
+        isBundle = b;
+    }
+
+    public void merge(ContractNode contract) {
+        sigRequired |= contract.sigRequired;
+        instrumentBranch |= contract.instrumentBranch;
+        for (FunctionNode fn : contract.functions) {
+            functions.add(fn);
+            functionMap.put(fn.functionName, fn);
+        }
+        clzs.addAll(contract.clzs);
+        contract.events.forEach((e, s) -> this.events.put(e, s));
+        if (null != contract.permission) permission.addAll(contract.permission);
+        if (null != contract.annotations) {
+            annotations.addAll(contract.annotations);
+        }
+        dependentContracts.addAll(contract.dependentContracts);
+    }
+
+    public boolean isExport(String action) {
+        FunctionNode node = functionMap.get(action);
+        return (null != node && node.isExport);
+    }
+
+    public FunctionNode getFunction(String action) {
+        return functionMap.get(action);
+    }
+
+    public Set<String> getDependentContracts() {
+        return dependentContracts;
+    }
+
+    public void addDependentContracts(String contractName) {
+        dependentContracts.add(contractName);
+    }
+
+    public void addEvent(String eventName) {
+        this.events.put(eventName, REventSemantics.AT_LEAST_ONCE);
+    }
+
+    public void addEvent(String eventName, String semantics) {
+        try {
+            this.events.put(eventName, REventSemantics.valueOf(semantics));
+        } catch (IllegalArgumentException | NullPointerException e) {
+            this.events.put(eventName, REventSemantics.AT_LEAST_ONCE);
+        }
+    }
+
+    public void addAnnotation(AnnotationNode annNode) {
+        annotations.add(annNode);
+    }
+
+    public void setLogType(List<String> args) {
+        logTypes = new ArrayList<>();
+        for (String str : args) {
+            logTypes.add(LogType.parse(str));
+        }
+    }
+
+    public List<LogType> getLogTypes() {
+        return logTypes;
+    }
+
+    public List<Permission> getPermission() {
+        return permission;
+    }
+
+    public void setPermission(List<String> args) {
+        // permission = new ArrayList<>();
+        for (String str : args) {
+            permission.add(Permission.parse(str));
+        }
+    }
+
+    public YjsType getYjsType() {
+        return yjsType;
+    }
+
+    public void setYjsType(YjsType yjsType1) {
+        this.yjsType = yjsType1;
+    }
+
+    public void setInstrumentBranch(boolean b) {
+        instrumentBranch = b;
+    }
+
+    public boolean getInstrumentBranch() {
+        return instrumentBranch;
+    }
+}
diff --git a/src/main/base/org/bdware/sc/node/ContractZipBundle.java b/src/main/base/org/bdware/sc/node/ContractZipBundle.java
new file mode 100644
index 0000000..25437c6
--- /dev/null
+++ b/src/main/base/org/bdware/sc/node/ContractZipBundle.java
@@ -0,0 +1,45 @@
+package org.bdware.sc.node;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ContractZipBundle {
+    ContractManifest cm;
+    Map<String, ContractNode> path2Node;
+
+    public ContractZipBundle() {
+        path2Node = new HashMap<>();
+    }
+
+    public boolean containsPath(String path) {
+        return path2Node.containsKey(path);
+    }
+
+    public void put(String path, ContractNode cn) {
+        path2Node.put(path, cn);
+    }
+
+    public ContractManifest getManifest() {
+        return cm;
+    }
+
+    public void setManifest(ContractManifest cm) {
+        this.cm = cm;
+    }
+
+    public ContractNode mergeContractNode() {
+        ContractNode cn = new ContractNode(null);
+        cn.memorySet = cm.memory;
+        cn.setIsBundle(true);
+        ContractNode mainNode = path2Node.get(cm.main);
+        cn.contractName = mainNode.contractName;
+        for (String key : path2Node.keySet()) {
+            ContractNode contract = path2Node.get(key);
+            if (key.equals(cm.main)) {
+                cn.setYjsType(contract.getYjsType());
+            }
+            cn.merge(contract);
+        }
+        return cn;
+    }
+}
diff --git a/src/main/base/org/bdware/sc/node/CostDetail.java b/src/main/base/org/bdware/sc/node/CostDetail.java
new file mode 100644
index 0000000..c273a8c
--- /dev/null
+++ b/src/main/base/org/bdware/sc/node/CostDetail.java
@@ -0,0 +1,28 @@
+package org.bdware.sc.node;
+
+public class CostDetail {
+
+    private boolean countGas;
+    private String extraGas;
+
+    public CostDetail() {
+        countGas = false;
+        extraGas = null;
+    }
+
+    public boolean isCountGas() {
+        return countGas;
+    }
+
+    public void setCountGas(boolean countGas) {
+        this.countGas = countGas;
+    }
+
+    public String getExtraGas() {
+        return extraGas;
+    }
+
+    public void setExtraGas(String extraGas) {
+        this.extraGas = extraGas;
+    }
+}
diff --git a/src/main/base/org/bdware/sc/node/FunctionNode.java b/src/main/base/org/bdware/sc/node/FunctionNode.java
new file mode 100644
index 0000000..bd42cb5
--- /dev/null
+++ b/src/main/base/org/bdware/sc/node/FunctionNode.java
@@ -0,0 +1,254 @@
+package org.bdware.sc.node;
+
+import com.google.gson.JsonElement;
+import org.bdware.sc.bean.JoinInfo;
+import org.bdware.sc.bean.RouteInfo;
+
+import java.util.*;
+
+public class FunctionNode extends Script {
+    private final Set<String> dependentFunctions;
+    public String functionName;
+    public List<AnnotationNode> annotations;
+    boolean isStatic;
+    List<Object> stmts;
+    List<String> args;
+    String fileName;
+    boolean isExport;
+    boolean isMask;
+    //    boolean isLogLocally;
+    EnumSet<LogType> logTypes;
+    //    boolean logToChain;
+    LogLocation logLocation = new LogLocation();
+    private CostDetail cost;
+    private RouteInfo routeInfo;
+    private JoinInfo joinInfo;
+    private boolean isHandler;
+    private boolean isConfidential;
+    private boolean isHomomorphicEncrypt;
+    private boolean isHomomorphicDecrypt;
+    private String keyManagerID;
+    private String secretID;
+    private JsonElement homoEncryptConf;
+    private JsonElement homoDecryptConf;
+    private List<AnnotationHook> beforeInvoke;
+    private List<AnnotationHook> afterInvoke;
+
+    public FunctionNode(String name, String fileName) {
+        this.functionName = name;
+        this.stmts = new ArrayList<>();
+        this.args = new ArrayList<>();
+        this.fileName = fileName;
+        this.isExport = false;
+
+        this.annotations = new ArrayList<>();
+        this.dependentFunctions = new HashSet<>();
+        this.logTypes = EnumSet.noneOf(LogType.class);
+        this.isMask = false;
+        this.isConfidential = false;
+        this.isHomomorphicEncrypt = false;
+        this.isHomomorphicDecrypt = false;
+        this.keyManagerID = "";
+        this.secretID = "";
+
+        beforeInvoke = new ArrayList<>();
+        afterInvoke = new ArrayList<>();
+    }
+
+    public Set<String> getDependentFunctions() {
+        return dependentFunctions;
+    }
+
+    public void addDependentFunctions(String functionName) {
+        dependentFunctions.add(functionName);
+    }
+
+    public boolean isConfidential() {
+        return isConfidential;
+    }
+
+    public void setConfidential(boolean isConfidential) {
+        this.isConfidential = isConfidential;
+    }
+
+    public boolean isHandler() {
+        return isHandler;
+    }
+
+    public void setHandler(boolean handler) {
+        isHandler = handler;
+    }
+
+    public CostDetail getCost() {
+        return cost;
+    }
+
+    public void setCost(CostDetail cost) {
+        this.cost = cost;
+    }
+
+    public void setIsExport(boolean b) {
+        isExport = b;
+    }
+
+    public void setIsMask(boolean b) {
+        isMask = b;
+    }
+
+    public void setStatic(boolean b) {
+        isStatic = b;
+    }
+
+    public void addArg(String arg) {
+        args.add(arg);
+        if (arg.equals("requester")) {
+            throw new IllegalArgumentException("The argument shouldn't be requester");
+        }
+    }
+
+    public void addStmt(StmtNode node) {
+        stmts.add(node);
+    }
+
+    public void addStmts(List<StmtNode> l) {
+        stmts.addAll(l);
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public boolean isExport() {
+        return isExport;
+    }
+
+    public boolean isMask() {
+        return isMask;
+    }
+
+    public void initTextWithRequester() {
+        if (args.size() == 0) {
+            plainText = plainText.replaceFirst("\\)", "arg, requester, requesterDOI)");
+        } else {
+            plainText = plainText.replaceFirst("\\)", ", requester, requesterDOI)");
+        }
+    }
+
+    public void addAnnotation(AnnotationNode annNode) {
+        annotations.add(annNode);
+    }
+
+    public void addLogType(LogType v) {
+        if (v == null) {
+            return;
+        }
+        logTypes.add(v);
+    }
+
+    public EnumSet<LogType> getLogTypes() {
+        return logTypes;
+    }
+
+    public boolean getLogToBDContract() {
+        return logLocation.logToBDContract;
+    }
+
+    public void setLogToBDContract(boolean b) {
+        logLocation.logToBDContract = b;
+    }
+
+    public boolean getLogToNamedLedger() {
+        return logLocation.logToNamedLedger;
+    }
+
+    public void setLogToNamedLedger(boolean b) {
+        logLocation.logToNamedLedger = b;
+    }
+
+    public void addLedgerName(String name) {
+        if (logLocation.ledgerNames == null) {
+            logLocation.ledgerNames = new ArrayList<>();
+        }
+        logLocation.ledgerNames.add(name);
+    }
+
+    public List<String> getLedgerNames() {
+        return logLocation.ledgerNames;
+    }
+
+    public void appendAfterInvokeHandler(AnnotationHook handler) {
+        afterInvoke.add(handler);
+    }
+
+    public List<AnnotationHook> afterExecutionAnnotations() {
+        return afterInvoke;
+    }
+
+    public void appendBeforeInvokeHandler(AnnotationHook handler) {
+        beforeInvoke.add(handler);
+    }
+
+    public List<AnnotationHook> beforeExecutionAnnotations() {
+        return beforeInvoke;
+    }
+
+    public void setRouteInfo(RouteInfo routeInfo) {
+        this.routeInfo = routeInfo;
+    }
+
+    public RouteInfo getRouteInfo() {
+        return routeInfo;
+    }
+
+    public boolean isHomomorphicEncrypt() {
+        return isHomomorphicEncrypt;
+    }
+
+    public boolean isHomomorphicDecrypt() {
+        return isHomomorphicDecrypt;
+    }
+
+    public String getKeyManagerID() {
+        return keyManagerID;
+    }
+
+    public String getSecretID() {
+        return secretID;
+    }
+
+    public void setHomomorphicEncrypt(boolean isHomomorphicEncrypt) { this.isHomomorphicEncrypt = isHomomorphicEncrypt; }
+
+    public void setHomomorphicDecrypt(boolean isHomomorphicDecrypt) { this.isHomomorphicDecrypt = isHomomorphicDecrypt; }
+
+    public void setKeyManagerID(String keyManagerID) {
+        this.keyManagerID = keyManagerID;
+    }
+
+    public void setSecretID(String secretID) {
+        this.secretID = secretID;
+    }
+
+    public void setJoinInfo(JoinInfo joinInfo1){
+        this.joinInfo = joinInfo1;
+    }
+
+    public JoinInfo getJoinInfo(){
+        return this.joinInfo;
+    }
+
+    public JsonElement getHomoEncryptConf() {
+        return homoEncryptConf;
+    }
+
+    public void setHomoEncryptConf(JsonElement homoEncryptConf) {
+        this.homoEncryptConf = homoEncryptConf;
+    }
+
+    public JsonElement getHomoDecryptConf() {
+        return homoDecryptConf;
+    }
+
+    public void setHomoDecryptConf(JsonElement homoDecryptConf) {
+        this.homoDecryptConf = homoDecryptConf;
+    }
+}
diff --git a/src/main/base/org/bdware/sc/node/ImportNode.java b/src/main/base/org/bdware/sc/node/ImportNode.java
new file mode 100644
index 0000000..db421a8
--- /dev/null
+++ b/src/main/base/org/bdware/sc/node/ImportNode.java
@@ -0,0 +1,19 @@
+package org.bdware.sc.node;
+
+import org.bdware.sc.parser.YJSParser.ImportStmtContext;
+
+public class ImportNode {
+    String path;
+    int line;
+
+    public static ImportNode createFromCtx(ImportStmtContext importStmt) {
+        ImportNode ret = new ImportNode();
+        ret.path = importStmt.StringLiteral().getText().replaceAll("\"", "");
+        ret.line = importStmt.start.getLine();
+        return ret;
+    }
+
+    public String getPath() {
+        return path;
+    }
+}
diff --git a/src/main/base/org/bdware/sc/node/LogLocation.java b/src/main/base/org/bdware/sc/node/LogLocation.java
new file mode 100644
index 0000000..e529c15
--- /dev/null
+++ b/src/main/base/org/bdware/sc/node/LogLocation.java
@@ -0,0 +1,9 @@
+package org.bdware.sc.node;
+
+import java.util.List;
+
+public class LogLocation {
+    boolean logToBDContract = false;
+    boolean logToNamedLedger = false;
+    List<String> ledgerNames;
+}
\ No newline at end of file
diff --git a/src/main/base/org/bdware/sc/node/LogType.java b/src/main/base/org/bdware/sc/node/LogType.java
new file mode 100644
index 0000000..ea4db67
--- /dev/null
+++ b/src/main/base/org/bdware/sc/node/LogType.java
@@ -0,0 +1,15 @@
+package org.bdware.sc.node;
+
+public enum LogType {
+    Arg, Branch, IO, Result, Code;
+
+    public static LogType parse(String str) {
+        try {
+            str = str.replaceAll("\"", "");
+            return LogType.valueOf(str);
+        } catch (Exception e) {
+            // TODO: handle exception
+        }
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/src/main/base/org/bdware/sc/node/MaskConfig.java b/src/main/base/org/bdware/sc/node/MaskConfig.java
new file mode 100644
index 0000000..f3e0165
--- /dev/null
+++ b/src/main/base/org/bdware/sc/node/MaskConfig.java
@@ -0,0 +1,23 @@
+package org.bdware.sc.node;
+
+import com.google.gson.JsonElement;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class MaskConfig {
+    public Map<String, JsonElement> config = new HashMap<>();
+    public String version;
+
+    public Map<String, JsonElement> getConfig() {
+        return config;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String v) {
+        this.version = v;
+    }
+}
diff --git a/src/main/base/org/bdware/sc/node/MockConfig.java b/src/main/base/org/bdware/sc/node/MockConfig.java
new file mode 100644
index 0000000..aebeb4e
--- /dev/null
+++ b/src/main/base/org/bdware/sc/node/MockConfig.java
@@ -0,0 +1,20 @@
+package org.bdware.sc.node;
+
+import com.google.gson.JsonElement;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class MockConfig {
+    public  Map<String, JsonElement> config= new HashMap<>();
+    public String version;
+    public Map<String, JsonElement> getConfig() {
+        return config;
+    }
+    public String getVersion(){
+        return version;
+    }
+    public void setVersion(String v) {
+        this.version = v;
+    }
+}
diff --git a/src/main/base/org/bdware/sc/node/Op.java b/src/main/base/org/bdware/sc/node/Op.java
new file mode 100644
index 0000000..64c8c1f
--- /dev/null
+++ b/src/main/base/org/bdware/sc/node/Op.java
@@ -0,0 +1,5 @@
+package org.bdware.sc.node;
+
+public enum Op {
+    Goto, Return, Move, STUB, Label, Ifnez
+}
diff --git a/src/main/base/org/bdware/sc/node/Permission.java b/src/main/base/org/bdware/sc/node/Permission.java
new file mode 100644
index 0000000..8b45851
--- /dev/null
+++ b/src/main/base/org/bdware/sc/node/Permission.java
@@ -0,0 +1,42 @@
+package org.bdware.sc.node;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public enum Permission {
+    Http,
+    SQL,
+    File,
+    RocksDB,
+    MongoDB,
+    BDWareTimeSeriesDB,
+    SM2,
+    AES,
+    Ledger,
+    CM,
+    DOIP,
+    Async;
+
+    public static Permission parse(String str) {
+        try {
+            str = str.replaceAll("\"", "");
+            return Permission.valueOf(str);
+        } catch (Exception e) {
+            // TODO: handle exception
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public static List<String> allName() {
+        List<String> allPermission = new ArrayList<>();
+        for (Permission per : Permission.values()) {
+            allPermission.add(per.name());
+        }
+        return allPermission;
+    }
+
+    public String clzName() {
+        return name() + "Util";
+    }
+}
diff --git a/src/main/base/org/bdware/sc/node/Script.java b/src/main/base/org/bdware/sc/node/Script.java
new file mode 100644
index 0000000..62fe552
--- /dev/null
+++ b/src/main/base/org/bdware/sc/node/Script.java
@@ -0,0 +1,43 @@
+package org.bdware.sc.node;
+
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.misc.Interval;
+
+public class Script {
+    int line, pos;
+    String plainText;
+    private Interval interval;
+
+    public String plainText() {
+        return plainText;
+    }
+
+    public int getLine() {
+        return line;
+    }
+
+    public void setLine(int line) {
+        this.line = line;
+    }
+
+    public int getPos() {
+        return pos;
+    }
+
+    public void setPos(int charPositionInLine) {
+        this.pos = charPositionInLine;
+    }
+
+    public void setInterval(Interval intraval) {
+        this.interval = intraval;
+    }
+
+    public void initText(CommonTokenStream cts) {
+        plainText = cts.getText(interval);
+
+    }
+
+    public void initTextWithoutExport(CommonTokenStream cts) {
+        plainText = cts.getText(interval).replaceFirst("export", "");
+    }
+}
diff --git a/src/main/base/org/bdware/sc/node/StmtNode.java b/src/main/base/org/bdware/sc/node/StmtNode.java
new file mode 100644
index 0000000..2ee23e9
--- /dev/null
+++ b/src/main/base/org/bdware/sc/node/StmtNode.java
@@ -0,0 +1,15 @@
+package org.bdware.sc.node;
+
+import org.antlr.v4.runtime.Token;
+
+public class StmtNode {
+    int line;
+    int pos;
+
+    public StmtNode setLineAndPos(Token l) {
+        line = l.getLine();
+        pos = l.getCharPositionInLine();
+        return this;
+    }
+
+}
diff --git a/src/main/base/org/bdware/sc/node/YjsType.java b/src/main/base/org/bdware/sc/node/YjsType.java
new file mode 100644
index 0000000..d8479cd
--- /dev/null
+++ b/src/main/base/org/bdware/sc/node/YjsType.java
@@ -0,0 +1,7 @@
+package org.bdware.sc.node;
+
+public enum YjsType {
+    Oracle,
+    Contract,
+    Module
+}
diff --git a/src/main/base/org/bdware/sc/node/stmt/BranchStmt.java b/src/main/base/org/bdware/sc/node/stmt/BranchStmt.java
new file mode 100644
index 0000000..b3d068a
--- /dev/null
+++ b/src/main/base/org/bdware/sc/node/stmt/BranchStmt.java
@@ -0,0 +1,22 @@
+package org.bdware.sc.node.stmt;
+
+import org.bdware.sc.node.Op;
+import org.bdware.sc.node.StmtNode;
+
+public class BranchStmt extends StmtNode {
+    String reg;
+    LabelStmt target;
+    Op op = Op.Ifnez;
+
+    // if (reg!=0)...else...
+    public BranchStmt setReg(String name) {
+        reg = name;
+        return this;
+    }
+
+    public BranchStmt setTarget(LabelStmt end) {
+        target = end;
+        return this;
+    }
+
+}
diff --git a/src/main/base/org/bdware/sc/node/stmt/GotoStmt.java b/src/main/base/org/bdware/sc/node/stmt/GotoStmt.java
new file mode 100644
index 0000000..aa44dfb
--- /dev/null
+++ b/src/main/base/org/bdware/sc/node/stmt/GotoStmt.java
@@ -0,0 +1,15 @@
+package org.bdware.sc.node.stmt;
+
+import org.bdware.sc.node.Op;
+import org.bdware.sc.node.StmtNode;
+
+public class GotoStmt extends StmtNode {
+    LabelStmt label;
+    Op op = Op.Goto;
+
+    public GotoStmt setTarget(LabelStmt end) {
+        label = end;
+        return this;
+    }
+
+}
diff --git a/src/main/base/org/bdware/sc/node/stmt/LabelStmt.java b/src/main/base/org/bdware/sc/node/stmt/LabelStmt.java
new file mode 100644
index 0000000..1c1d1ae
--- /dev/null
+++ b/src/main/base/org/bdware/sc/node/stmt/LabelStmt.java
@@ -0,0 +1,10 @@
+package org.bdware.sc.node.stmt;
+
+import org.bdware.sc.node.Op;
+import org.bdware.sc.node.StmtNode;
+
+public class LabelStmt extends StmtNode {
+    static int globalID = 0;
+    Op op = Op.Label;
+    int id = globalID++;
+}
diff --git a/src/main/base/org/bdware/sc/node/stmt/Stmt1N.java b/src/main/base/org/bdware/sc/node/stmt/Stmt1N.java
new file mode 100644
index 0000000..4e10e53
--- /dev/null
+++ b/src/main/base/org/bdware/sc/node/stmt/Stmt1N.java
@@ -0,0 +1,14 @@
+package org.bdware.sc.node.stmt;
+
+import org.bdware.sc.node.Op;
+import org.bdware.sc.node.StmtNode;
+
+public class Stmt1N extends StmtNode {
+    Op op;
+    String reg;
+
+    public Stmt1N(Op op, String reg) {
+        this.op = op;
+        this.reg = reg;
+    }
+}
diff --git a/src/main/base/org/bdware/sc/node/stmt/Stmt2N.java b/src/main/base/org/bdware/sc/node/stmt/Stmt2N.java
new file mode 100644
index 0000000..e55a86d
--- /dev/null
+++ b/src/main/base/org/bdware/sc/node/stmt/Stmt2N.java
@@ -0,0 +1,23 @@
+package org.bdware.sc.node.stmt;
+
+import org.bdware.sc.node.Op;
+import org.bdware.sc.node.StmtNode;
+
+public class Stmt2N extends StmtNode {
+    String from;
+    String to;
+    Op op;
+
+    public Stmt2N(Op op) {
+        this.op = op;
+    }
+
+    public void setFrom(String name) {
+        from = name;
+    }
+
+    public void setTo(String name) {
+        to = name;
+    }
+
+}
diff --git a/src/main/base/org/bdware/sc/py/PYEntry.java b/src/main/base/org/bdware/sc/py/PYEntry.java
new file mode 100644
index 0000000..effb87f
--- /dev/null
+++ b/src/main/base/org/bdware/sc/py/PYEntry.java
@@ -0,0 +1,462 @@
+package org.bdware.sc.py;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import org.bdware.sc.py.bean.*;
+import org.bdware.sc.py.utils.HttpClient;
+import org.bdware.sc.py.utils.HttpExt;
+import org.bdware.sc.util.JsonUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PYEntry {
+
+    public static PYEntry instance = new PYEntry();
+    final String ip = "127.0.0.1";
+    final Integer port = 5000;
+
+    public static String getModuleMethodSig(
+            String packageName, String moduleName, String methodName) {
+        return "json";
+    }
+
+    /**
+     * 目前同名不同参，需要添加multimethod装饰器，暂时不考虑那么复杂
+     */
+    public static String getModuleClzMethodSig(
+            String packageName, String moduleName, String className, String methodName) {
+        return "json";
+    }
+
+    public static String getModuleClzClassMethodSig(
+            String packName, String moduleName, String className, String methodName) {
+        return "json";
+    }
+
+    public static String getModuleClzStaticMethodSig(
+            String packName, String moduleName, String className, String methodName) {
+        return "json";
+    }
+
+    public String creatObject(String classFullName, PYMethodParams PYMethodParams) {
+        System.out.println("[PYEntry] createObject");
+        String urlPath = "/api/createObj/";
+        String response = null;
+
+        PYYjsParams pyYjsParams = new PYYjsParams();
+        pyYjsParams.setPackage_name(HttpExt.getPackageName(HttpExt.getModuleName(classFullName)));
+        pyYjsParams.setModule_name(HttpExt.getModuleName(classFullName));
+        pyYjsParams.setModule_class_name(HttpExt.getClassName(classFullName));
+        pyYjsParams.setParams(PYMethodParams);
+
+        PYYjsRequest pyYjsRequest = new PYYjsRequest();
+        pyYjsRequest.setYjsParams(pyYjsParams);
+
+        response = HttpClient.post(ip, port, urlPath, JsonUtil.toJson(pyYjsRequest));
+        JsonObject pyResponse = JsonParser.parseString(response).getAsJsonObject();
+        return pyResponse.getAsJsonObject("yjsResult").get("objectId").getAsString();
+    }
+
+    public String createBuiltinsObj(String moduleClassName, PYMethodParams PYMethodParams) {
+        String urlPath = "/api/createBuiltinsObj/";
+        String httpResponse = null;
+
+
+        PYYjsRequest pyYjsRequest = new PYYjsRequest();
+        PYYjsParams pyYjsParams = new PYYjsParams();
+        if (moduleClassName.length() != 0) {
+            pyYjsParams.setModule_class_name(moduleClassName);
+        }
+        pyYjsParams.setParams(PYMethodParams);
+        pyYjsRequest.setYjsParams(pyYjsParams);
+
+        httpResponse = HttpClient.post(ip, port, urlPath, JsonUtil.toJson(pyYjsRequest));
+
+        JsonObject pyResponse = JsonParser.parseString(httpResponse).getAsJsonObject();
+        return pyResponse.getAsJsonObject("yjsResult").get("objectId").getAsString();
+    }
+
+    public List<PYPackage> availablePackages() {
+        String urlPath = "/api/availablePackages/";
+        String response;
+        response = HttpClient.get(ip, port, urlPath);
+        JsonObject pyResponse = JsonParser.parseString(response).getAsJsonObject();
+        JsonObject availablePackages =
+                pyResponse.getAsJsonObject("yjsResult").getAsJsonObject("availablePackages");
+        JsonArray array = availablePackages.getAsJsonArray("packages");
+        List<PYPackage> pyPackages = new ArrayList<>();
+
+        for (int i = 0; i < array.size(); i++) {
+            PYPackage pyPackage = new PYPackage();
+            pyPackage.setName(array.get(i).getAsString());
+            pyPackages.add(pyPackage);
+        }
+        return pyPackages;
+    }
+
+    public List<PYModule> availableModules() {
+        String urlPath = "/api/availableModules/";
+        String response;
+        response = HttpClient.get(ip, port, urlPath);
+        JsonObject pyResponse = JsonParser.parseString(response).getAsJsonObject();
+        JsonObject availablePackages =
+                pyResponse.getAsJsonObject("yjsResult").getAsJsonObject("availableModules");
+        JsonArray array = availablePackages.getAsJsonArray("modules");
+        // "yjsResult": {"availableModules": {"modules": ["sample", "yjsexample",
+        // "yjsexample.sample"]}}
+        List<PYModule> pyModules = new ArrayList<>();
+        for (int i = 0; i < array.size(); i++) {
+            PYModule pyModule = new PYModule();
+            pyModule.setName(array.get(i).getAsString());
+            pyModules.add(pyModule);
+        }
+        return pyModules;
+    }
+
+    public PYPackage packageInfo(String pkgName) {
+        String urlPath = "/api/packageAllInfo/";
+        String httpResponse;
+
+        PYYjsParams pyYjsParams = new PYYjsParams();
+        pyYjsParams.setPackage_name(pkgName);
+        PYYjsRequest pyYjsRequest = new PYYjsRequest();
+        pyYjsRequest.setYjsParams(pyYjsParams);
+        httpResponse = HttpClient.post(ip, port, urlPath, JsonUtil.toJson(pyYjsRequest));
+
+        // "yjsResult": {"packageTotalInfo": {"package_name": "yjsexample",
+        // "module_names": ["yjsexample.sample"]}}
+        JsonObject pyResponse = JsonParser.parseString(httpResponse).getAsJsonObject();
+        JsonObject packageTotalInfo =
+                pyResponse.getAsJsonObject("yjsResult").getAsJsonObject("packageTotalInfo");
+        PackageInfo packageInfo = JsonUtil.fromJson(packageTotalInfo, PackageInfo.class);
+        PYPackage pyPackage = new PYPackage();
+        pyPackage.setName(packageInfo.getPackage_name());
+
+        List<PYModule> moduleList = new ArrayList<>();
+        List<String> moduleNames = packageInfo.getModule_names();
+        for (String name : moduleNames) {
+            PYModule pyModule = new PYModule();
+            pyModule.setName(name);
+            // todo: add module info
+            moduleList.add(pyModule);
+        }
+        pyPackage.setModules(moduleList);
+        return pyPackage;
+    }
+
+    public PYModule moduleInfo(String moduleFullName) {
+        String urlPath = "/api/moduleInfo/";
+        String httpResponse;
+
+        PYYjsRequest pyYjsRequest = new PYYjsRequest();
+        PYYjsParams pyYjsParams = new PYYjsParams();
+        pyYjsParams.setModule_name(moduleFullName);
+        pyYjsRequest.setYjsParams(pyYjsParams);
+        httpResponse = HttpClient.post(ip, port, urlPath, JsonUtil.toJson(pyYjsRequest));
+
+        // "yjsResult": {"moduleInfo": {"module_func": [{"func_sig": "(arg_a)",
+        // "func_name": "moduleFunc1"}], "classes": [{"class_sig": {"init_sig": "(self,
+        // age)"}, "class_method": [{"method_sign": "()", "method_name":
+        // "classMethod"}], "class_func": [{"func_sign": "(self, name)", "func_name":
+        // "sayHello"}, {"func_sign": "(self, name)", "func_name": "sayHello"}],
+        // "class_name": "A"}
+        ModuleInfo moduleInfo;
+        JsonObject pyResponse = JsonParser.parseString(httpResponse).getAsJsonObject();
+        JsonObject moduleInfoObj =
+                pyResponse.getAsJsonObject("yjsResult").getAsJsonObject("moduleInfo");
+        moduleInfo = JsonUtil.fromJson(moduleInfoObj, ModuleInfo.class);
+
+        PYModule pyModule = new PYModule();
+        // module name
+        pyModule.setName(moduleInfo.getModule_name());
+        // module clzList
+        List<PYClass> pyModuleClassList = new ArrayList<>();
+        for (ClassCollection moduleClasses : moduleInfo.getClasses()) {
+            PYClass pyClass = new PYClass();
+            pyClass.setName(moduleClasses.getClass_name());
+            pyClass.setSig(moduleClasses.getClass_sig().getInit_sig());
+            // module class function
+            List<PYMethod> classFuncs = new ArrayList<>();
+            for (FuncCollection func : moduleClasses.getClass_func()) {
+                PYMethod pyMethod = new PYMethod();
+                pyMethod.setName(func.getFunc_name());
+                pyMethod.setSig(func.getFunc_sig());
+                pyMethod.setClassFunction(true);
+                classFuncs.add(pyMethod);
+            }
+            pyClass.setFuncs(classFuncs);
+            // module class method ClassMethod decorate
+            List<PYMethod> classMethods = new ArrayList<>();
+            for (MethodCollection method : moduleClasses.getClass_method()) {
+                PYMethod pyMethod = new PYMethod();
+                pyMethod.setName(method.getMethod_name());
+                pyMethod.setSig(method.getMethod_sig());
+                pyMethod.setClassMethod(true);
+                classMethods.add(pyMethod);
+            }
+            pyClass.setMethods(classMethods);
+
+            pyModuleClassList.add(pyClass);
+        }
+        pyModule.setClzList(pyModuleClassList);
+
+        // module func
+        List<PYMethod> pyModuleFuncList = new ArrayList<>();
+        for (FuncCollection moduleFunc : moduleInfo.getModule_func()) {
+            PYMethod pyMethod = new PYMethod();
+            pyMethod.setName(moduleFunc.getFunc_name());
+            pyMethod.setSig(moduleFunc.getFunc_sig());
+            pyMethod.setModuleMethod(true);
+            pyModuleFuncList.add(pyMethod);
+        }
+        pyModule.setFuncList(pyModuleFuncList);
+        return pyModule;
+    }
+
+    public PYClass classInfo(String classFullName) {
+        String urlPath = "/api/moduleClassInfo/";
+        String httpResponse;
+
+        PYYjsRequest pyYjsRequest = new PYYjsRequest();
+        PYYjsParams pyYjsParams = new PYYjsParams();
+        pyYjsParams.setModule_name(HttpExt.getModuleName(classFullName));
+        pyYjsParams.setModule_class_name(HttpExt.getClassName(classFullName));
+        pyYjsRequest.setYjsParams(pyYjsParams);
+        System.out.println(JsonUtil.toJson(pyYjsRequest));
+        httpResponse = HttpClient.post(ip, port, urlPath, JsonUtil.toJson(pyYjsRequest));
+
+        PYYjsResponse pyYjsResponse = JsonUtil.fromJson(httpResponse, PYYjsResponse.class);
+
+        PYClass pyClass = new PYClass();
+
+        ClassCollection classInfo;
+        JsonObject pyResponse = JsonParser.parseString(httpResponse).getAsJsonObject();
+        JsonObject classInfoObj =
+                pyResponse.getAsJsonObject("yjsResult").getAsJsonObject("classInfo");
+        classInfo = JsonUtil.fromJson(classInfoObj, ClassCollection.class);
+
+        // 更新class function or method keyword name
+        pyClass.setName(classInfo.getClass_name());
+        pyClass.setSig(classInfo.getClass_sig().getInit_sig());
+
+        // class function
+        List<PYMethod> classFuncs = new ArrayList<>();
+        for (FuncCollection func : classInfo.getClass_func()) {
+            PYMethod pyMethod = new PYMethod();
+            pyMethod.setName(func.getFunc_name());
+            pyMethod.setSig(func.getFunc_sig());
+            pyMethod.setClassFunction(true);
+            classFuncs.add(pyMethod);
+        }
+        pyClass.setFuncs(classFuncs);
+
+        // class method ClassMethod修饰的方法
+        List<PYMethod> classMethods = new ArrayList<>();
+        for (MethodCollection method : classInfo.getClass_method()) {
+            PYMethod pyMethod = new PYMethod();
+            pyMethod.setName(method.getMethod_name());
+            pyMethod.setSig(method.getMethod_sig());
+            pyMethod.setClassMethod(true);
+            classMethods.add(pyMethod);
+        }
+        pyClass.setMethods(classMethods);
+        return pyClass;
+    }
+
+    public String objectInfo(String objectId) {
+        String urlPath = "/api/objInfo/";
+        String httpResponse;
+
+        PYYjsRequest pyYjsRequest = new PYYjsRequest();
+        PYYjsParams pyYjsParams = new PYYjsParams();
+        pyYjsParams.setObjectId(objectId);
+        pyYjsRequest.setYjsParams(pyYjsParams);
+        httpResponse = HttpClient.post(ip, port, urlPath, JsonUtil.toJson(pyYjsRequest));
+        return httpResponse;
+    }
+
+    public String invokeModuleFunc(
+            String moduleFullName, String moduleFuncName, PYMethodParams PYMethodParams) {
+        System.out.println("[PYEntry] invokeModuleFunc");
+        String urlPath = "/api/invokeModuleFunc/";
+        String httpResponse;
+
+        PYYjsRequest pyYjsRequest = new PYYjsRequest();
+        PYYjsParams pyYjsParams = new PYYjsParams();
+        pyYjsParams.setPackage_name(HttpExt.getPackageName(moduleFullName));
+        pyYjsParams.setModule_name(moduleFullName);
+        pyYjsParams.setModule_func_name(moduleFuncName);
+        pyYjsParams.setParams(PYMethodParams);
+        pyYjsRequest.setYjsParams(pyYjsParams);
+        httpResponse = HttpClient.post(ip, port, urlPath, JsonUtil.toJson(pyYjsRequest));
+        JsonObject pyResponse = JsonParser.parseString(httpResponse).getAsJsonObject();
+        JsonObject ysjResult = pyResponse.getAsJsonObject("yjsResult");
+        return ysjResult.toString();
+    }
+
+    public String invokeObjectMethod(
+            String objectId, String methodName, PYMethodParams PYMethodParams) {
+        System.out.println("[PYEntry] invokeObjectGeneralMethod");
+        String urlPath = "/api/invokeObjectGeneralMethod/";
+        String httpResponse;
+
+        PYYjsRequest pyYjsRequest = new PYYjsRequest();
+        PYYjsParams pyYjsParams = new PYYjsParams();
+        pyYjsParams.setObjectId(objectId);
+        pyYjsParams.setObject_method_name(methodName);
+        System.out.println(methodName);
+        pyYjsParams.setParams(PYMethodParams);
+        pyYjsRequest.setYjsParams(pyYjsParams);
+        httpResponse = HttpClient.post(ip, port, urlPath, JsonUtil.toJson(pyYjsRequest));
+        JsonObject pyResponse = JsonParser.parseString(httpResponse).getAsJsonObject();
+        JsonObject ysjResult = pyResponse.getAsJsonObject("yjsResult");
+        return ysjResult.toString();
+    }
+
+    public String invokeClzStaticMethod(String methodFullName, PYMethodParams PYMethodParams) {
+        System.out.println("[PYEntry] invokeModuleClzStaticMethod");
+        String urlPath = "/api/invokeModuleClzStaticMethod/";
+        String httpResponse;
+
+        PYYjsRequest pyYjsRequest = new PYYjsRequest();
+        PYYjsParams pyYjsParams = new PYYjsParams();
+        pyYjsParams.setPackage_name(HttpExt.getPackageName(methodFullName));
+        pyYjsParams.setModule_name(
+                HttpExt.getModuleName(HttpExt.getMethodClassFullName(methodFullName)));
+        pyYjsParams.setModule_class_name(
+                HttpExt.getClassName(HttpExt.getMethodClassFullName(methodFullName)));
+        pyYjsParams.setModule_class_staticmethod_name(HttpExt.getMethodName(methodFullName));
+        pyYjsParams.setParams(PYMethodParams);
+        pyYjsRequest.setYjsParams(pyYjsParams);
+        httpResponse = HttpClient.post(ip, port, urlPath, JsonUtil.toJson(pyYjsRequest));
+        JsonObject pyResponse = JsonParser.parseString(httpResponse).getAsJsonObject();
+        JsonObject ysjResult = pyResponse.getAsJsonObject("yjsResult");
+        return ysjResult.toString();
+    }
+
+    public String invokeClzClassMethod(String methodFullName, PYMethodParams PYMethodParams) {
+        System.out.println("[PYEntry] invokeClzClassMethod");
+        String urlPath = "/api/invokeModuleClzClassMethod/";
+        String httpResponse;
+
+        PYYjsRequest pyYjsRequest = new PYYjsRequest();
+        PYYjsParams pyYjsParams = new PYYjsParams();
+        pyYjsParams.setPackage_name(HttpExt.getPackageName(methodFullName));
+        pyYjsParams.setModule_name(
+                HttpExt.getModuleName(HttpExt.getMethodClassFullName(methodFullName)));
+        pyYjsParams.setModule_class_name(
+                HttpExt.getClassName(HttpExt.getMethodClassFullName(methodFullName)));
+        pyYjsParams.setModule_class_classmethod_name(HttpExt.getMethodName(methodFullName));
+        System.out.println(HttpExt.getMethodName(methodFullName));
+        pyYjsParams.setParams(PYMethodParams);
+        pyYjsRequest.setYjsParams(pyYjsParams);
+        System.out.println(JsonUtil.toJson(pyYjsRequest));
+        httpResponse = HttpClient.post(ip, port, urlPath, JsonUtil.toJson(pyYjsRequest));
+        JsonObject pyResponse = JsonParser.parseString(httpResponse).getAsJsonObject();
+        JsonObject ysjResult = pyResponse.getAsJsonObject("yjsResult");
+        return ysjResult.toString();
+    }
+
+    class MyCollections {
+        List<String> packages;
+        List<String> modules;
+
+        public List<String> getPackages() {
+            return packages;
+        }
+
+        public List<String> getModules() {
+            return modules;
+        }
+    }
+
+    class PackageInfo {
+        String package_name;
+        List<String> module_names;
+
+        public String getPackage_name() {
+            return package_name;
+        }
+
+        public List<String> getModule_names() {
+            return module_names;
+        }
+    }
+
+    class MethodCollection {
+        String method_name;
+        String method_sig;
+
+        public String getMethod_name() {
+            return method_name;
+        }
+
+        public String getMethod_sig() {
+            return method_sig;
+        }
+    }
+
+    class FuncCollection {
+        String func_name;
+        String func_sig;
+
+        public String getFunc_name() {
+            return func_name;
+        }
+
+        public String getFunc_sig() {
+            return func_sig;
+        }
+    }
+
+    class ClassInitSig {
+        String init_sig;
+
+        public String getInit_sig() {
+            return init_sig;
+        }
+    }
+
+    class ClassCollection {
+        String class_name;
+        ClassInitSig class_sig;
+        List<MethodCollection> class_method;
+        List<FuncCollection> class_func;
+
+        public String getClass_name() {
+            return class_name;
+        }
+
+        public ClassInitSig getClass_sig() {
+            return class_sig;
+        }
+
+        public List<MethodCollection> getClass_method() {
+            return class_method;
+        }
+
+        public List<FuncCollection> getClass_func() {
+            return class_func;
+        }
+    }
+
+    class ModuleInfo {
+        String module_name;
+        List<FuncCollection> module_func;
+        List<ClassCollection> classes;
+
+        public String getModule_name() {
+            return module_name;
+        }
+
+        public List<FuncCollection> getModule_func() {
+            return module_func;
+        }
+
+        public List<ClassCollection> getClasses() {
+            return classes;
+        }
+    }
+}
diff --git a/src/main/base/org/bdware/sc/py/PYLoader.java b/src/main/base/org/bdware/sc/py/PYLoader.java
new file mode 100644
index 0000000..b9f54fa
--- /dev/null
+++ b/src/main/base/org/bdware/sc/py/PYLoader.java
@@ -0,0 +1,7 @@
+package org.bdware.sc.py;
+
+public class PYLoader {
+
+    public static void getReqByID(String id) {
+    }
+}
diff --git a/src/main/base/org/bdware/sc/py/bean/PYClass.java b/src/main/base/org/bdware/sc/py/bean/PYClass.java
new file mode 100644
index 0000000..6bb0b1b
--- /dev/null
+++ b/src/main/base/org/bdware/sc/py/bean/PYClass.java
@@ -0,0 +1,42 @@
+package org.bdware.sc.py.bean;
+
+import java.util.List;
+
+public class PYClass {
+    String name;
+    String sig;
+    List<PYMethod> methods;
+    List<PYMethod> funcs;
+
+    public String getSig() {
+        return sig;
+    }
+
+    public void setSig(String sig) {
+        this.sig = sig;
+    }
+
+    public List<PYMethod> getFuncs() {
+        return funcs;
+    }
+
+    public void setFuncs(List<PYMethod> funcs) {
+        this.funcs = funcs;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<PYMethod> getMethods() {
+        return methods;
+    }
+
+    public void setMethods(List<PYMethod> methods) {
+        this.methods = methods;
+    }
+}
diff --git a/src/main/base/org/bdware/sc/py/bean/PYMethod.java b/src/main/base/org/bdware/sc/py/bean/PYMethod.java
new file mode 100644
index 0000000..0638c8b
--- /dev/null
+++ b/src/main/base/org/bdware/sc/py/bean/PYMethod.java
@@ -0,0 +1,64 @@
+package org.bdware.sc.py.bean;
+
+public class PYMethod {
+    String name;
+    String sig;
+
+    boolean isClassMethod;
+    boolean isClassFunction; // python 除ClassMethod修饰的函数
+    boolean isModuleMethod;
+    boolean isObjectMethod;
+
+    public Boolean getClassMethod() {
+        return isClassMethod;
+    }
+
+    public void setClassMethod(Boolean classMethod) {
+        isClassMethod = classMethod;
+    }
+
+    public Boolean getClassFunction() {
+        return isClassFunction;
+    }
+
+    public void setClassFunction(Boolean classFunction) {
+        isClassFunction = classFunction;
+    }
+
+    public Boolean getModuleMethod() {
+        return isModuleMethod;
+    }
+
+    public void setModuleMethod(Boolean moduleMethod) {
+        isModuleMethod = moduleMethod;
+    }
+
+    public Boolean getObjectMethod() {
+        return isObjectMethod;
+    }
+
+    public void setObjectMethod(Boolean objectMethod) {
+        isObjectMethod = objectMethod;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSig() {
+        return sig;
+    }
+
+    public void setSig(String sig) {
+        this.sig = sig;
+    }
+
+    // TODO 1 mengliang check
+    public boolean isStatic() {
+        return isClassMethod || isModuleMethod;
+    }
+}
diff --git a/src/main/base/org/bdware/sc/py/bean/PYMethodParams.java b/src/main/base/org/bdware/sc/py/bean/PYMethodParams.java
new file mode 100644
index 0000000..fe84561
--- /dev/null
+++ b/src/main/base/org/bdware/sc/py/bean/PYMethodParams.java
@@ -0,0 +1,16 @@
+package org.bdware.sc.py.bean;
+
+/**
+ * Created by mengliang on 2018/9/25.
+ */
+public class PYMethodParams {
+    Object params;
+
+    public Object getParams() {
+        return params;
+    }
+
+    public void setParams(Object params) {
+        this.params = params;
+    }
+}
diff --git a/src/main/base/org/bdware/sc/py/bean/PYModule.java b/src/main/base/org/bdware/sc/py/bean/PYModule.java
new file mode 100644
index 0000000..4e1e5ea
--- /dev/null
+++ b/src/main/base/org/bdware/sc/py/bean/PYModule.java
@@ -0,0 +1,33 @@
+package org.bdware.sc.py.bean;
+
+import java.util.List;
+
+public class PYModule {
+    String name;
+    List<PYClass> clzList;
+    List<PYMethod> funcList;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<PYClass> getClzList() {
+        return clzList;
+    }
+
+    public void setClzList(List<PYClass> clzList) {
+        this.clzList = clzList;
+    }
+
+    public List<PYMethod> getFuncList() {
+        return funcList;
+    }
+
+    public void setFuncList(List<PYMethod> funcList) {
+        this.funcList = funcList;
+    }
+}
diff --git a/src/main/base/org/bdware/sc/py/bean/PYObject.java b/src/main/base/org/bdware/sc/py/bean/PYObject.java
new file mode 100644
index 0000000..48d2ce7
--- /dev/null
+++ b/src/main/base/org/bdware/sc/py/bean/PYObject.java
@@ -0,0 +1,16 @@
+package org.bdware.sc.py.bean;
+
+/**
+ * Created by mengliang on 2018/10/11.
+ */
+public class PYObject {
+    private String ID;
+
+    public String getID() {
+        return ID;
+    }
+
+    public void setID(String ID) {
+        this.ID = ID;
+    }
+}
diff --git a/src/main/base/org/bdware/sc/py/bean/PYPackage.java b/src/main/base/org/bdware/sc/py/bean/PYPackage.java
new file mode 100644
index 0000000..47b9b08
--- /dev/null
+++ b/src/main/base/org/bdware/sc/py/bean/PYPackage.java
@@ -0,0 +1,24 @@
+package org.bdware.sc.py.bean;
+
+import java.util.List;
+
+public class PYPackage {
+    String name;
+    List<PYModule> modules;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<PYModule> getModules() {
+        return this.modules;
+    }
+
+    public void setModules(List<PYModule> modules) {
+        this.modules = modules;
+    }
+}
diff --git a/src/main/base/org/bdware/sc/py/bean/PYYjsError.java b/src/main/base/org/bdware/sc/py/bean/PYYjsError.java
new file mode 100644
index 0000000..02413aa
--- /dev/null
+++ b/src/main/base/org/bdware/sc/py/bean/PYYjsError.java
@@ -0,0 +1,34 @@
+package org.bdware.sc.py.bean;
+
+/**
+ * Created by mengliang on 2018/9/25.
+ */
+public class PYYjsError {
+    Integer code;
+    String message;
+    String data;
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getData() {
+        return data;
+    }
+
+    public void setData(String data) {
+        this.data = data;
+    }
+}
diff --git a/src/main/base/org/bdware/sc/py/bean/PYYjsParams.java b/src/main/base/org/bdware/sc/py/bean/PYYjsParams.java
new file mode 100644
index 0000000..dd54aa0
--- /dev/null
+++ b/src/main/base/org/bdware/sc/py/bean/PYYjsParams.java
@@ -0,0 +1,106 @@
+package org.bdware.sc.py.bean;
+
+/**
+ * Created by mengliang on 2018/9/25.
+ */
+public class PYYjsParams {
+    String package_name;
+    String module_name;
+    String moduleFullName;
+    String module_class_name;
+    String module_func_name;
+    String module_class_classmethod_name;
+    String module_class_func_name;
+    String module_class_staticmethod_name;
+    String objectId;
+    String object_method_name;
+    PYMethodParams params;
+
+    public String getObject_method_name() {
+        return object_method_name;
+    }
+
+    public void setObject_method_name(String object_method_name) {
+        this.object_method_name = object_method_name;
+    }
+
+    public String getPackage_name() {
+        return package_name;
+    }
+
+    public void setPackage_name(String package_name) {
+        this.package_name = package_name;
+    }
+
+    public String getModule_name() {
+        return module_name;
+    }
+
+    public void setModule_name(String module_name) {
+        this.module_name = module_name;
+    }
+
+    public String getModuleFullName() {
+        return moduleFullName;
+    }
+
+    public void setModuleFullName(String moduleFullName) {
+        this.moduleFullName = moduleFullName;
+    }
+
+    public String getModule_class_name() {
+        return module_class_name;
+    }
+
+    public void setModule_class_name(String module_class_name) {
+        this.module_class_name = module_class_name;
+    }
+
+    public String getModule_func_name() {
+        return module_func_name;
+    }
+
+    public void setModule_func_name(String module_func_name) {
+        this.module_func_name = module_func_name;
+    }
+
+    public String getModule_class_classmethod_name() {
+        return module_class_classmethod_name;
+    }
+
+    public void setModule_class_classmethod_name(String module_class_classmethod_name) {
+        this.module_class_classmethod_name = module_class_classmethod_name;
+    }
+
+    public String getModule_class_func_name() {
+        return module_class_func_name;
+    }
+
+    public void setModule_class_func_name(String module_class_func_name) {
+        this.module_class_func_name = module_class_func_name;
+    }
+
+    public String getModule_class_staticmethod_name() {
+        return module_class_staticmethod_name;
+    }
+
+    public void setModule_class_staticmethod_name(String module_class_staticmethod_name) {
+        this.module_class_staticmethod_name = module_class_staticmethod_name;
+    }
+
+    public String getObjectId() {
+        return objectId;
+    }
+
+    public void setObjectId(String objectId) {
+        this.objectId = objectId;
+    }
+
+    public PYMethodParams getParams() {
+        return params;
+    }
+
+    public void setParams(PYMethodParams params) {
+        this.params = params;
+    }
+}
diff --git a/src/main/base/org/bdware/sc/py/bean/PYYjsRequest.java b/src/main/base/org/bdware/sc/py/bean/PYYjsRequest.java
new file mode 100644
index 0000000..bb98ca2
--- /dev/null
+++ b/src/main/base/org/bdware/sc/py/bean/PYYjsRequest.java
@@ -0,0 +1,34 @@
+package org.bdware.sc.py.bean;
+
+/**
+ * Created by mengliang on 2018/9/26.
+ */
+public class PYYjsRequest {
+    String yjsJsonRpc;
+    String yjsRespnseId;
+    PYYjsParams yjsParams;
+
+    public String getYjsJsonRpc() {
+        return yjsJsonRpc;
+    }
+
+    public void setYjsJsonRpc(String yjsJsonRpc) {
+        this.yjsJsonRpc = yjsJsonRpc;
+    }
+
+    public String getYjsRespnseId() {
+        return yjsRespnseId;
+    }
+
+    public void setYjsRespnseId(String yjsRespnseId) {
+        this.yjsRespnseId = yjsRespnseId;
+    }
+
+    public PYYjsParams getYjsParams() {
+        return yjsParams;
+    }
+
+    public void setYjsParams(PYYjsParams yjsParams) {
+        this.yjsParams = yjsParams;
+    }
+}
diff --git a/src/main/base/org/bdware/sc/py/bean/PYYjsResponse.java b/src/main/base/org/bdware/sc/py/bean/PYYjsResponse.java
new file mode 100644
index 0000000..e78b8eb
--- /dev/null
+++ b/src/main/base/org/bdware/sc/py/bean/PYYjsResponse.java
@@ -0,0 +1,47 @@
+package org.bdware.sc.py.bean;
+
+import com.google.gson.JsonObject;
+
+import java.util.Map;
+
+/**
+ * Created by mengliang on 2018/9/24.
+ */
+public class PYYjsResponse {
+    String yjsJsonRpc;
+    String yjsRespnseId;
+    org.bdware.sc.py.bean.PYYjsError PYYjsError;
+    Map<String, JsonObject> yjsResult;
+
+    public String getYjsJsonRpc() {
+        return yjsJsonRpc;
+    }
+
+    public void setYjsJsonRpc(String yjsJsonRpc) {
+        this.yjsJsonRpc = yjsJsonRpc;
+    }
+
+    public String getYjsRespnseId() {
+        return yjsRespnseId;
+    }
+
+    public void setYjsRespnseId(String yjsRespnseId) {
+        this.yjsRespnseId = yjsRespnseId;
+    }
+
+    public org.bdware.sc.py.bean.PYYjsError getPYYjsError() {
+        return PYYjsError;
+    }
+
+    public void setPYYjsError(org.bdware.sc.py.bean.PYYjsError PYYjsError) {
+        this.PYYjsError = PYYjsError;
+    }
+
+    public Map<String, JsonObject> getYjsResult() {
+        return yjsResult;
+    }
+
+    public void setYjsResult(Map<String, JsonObject> yjsResult) {
+        this.yjsResult = yjsResult;
+    }
+}
diff --git a/src/main/base/org/bdware/sc/py/utils/HttpClient.java b/src/main/base/org/bdware/sc/py/utils/HttpClient.java
new file mode 100644
index 0000000..48ea3b7
--- /dev/null
+++ b/src/main/base/org/bdware/sc/py/utils/HttpClient.java
@@ -0,0 +1,80 @@
+package org.bdware.sc.py.utils;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+
+public class HttpClient {
+    public static String get(String ip, int port, String urlPath) {
+        URL url;
+        // 线程不安全
+        StringBuilder sb = new StringBuilder();
+        try {
+            url = new URL("http://" + ip + ":" + port + urlPath);
+            HttpURLConnection httpURLConnection;
+            httpURLConnection = (HttpURLConnection) url.openConnection();
+            httpURLConnection.setRequestMethod("GET");
+            httpURLConnection.setConnectTimeout(2000);
+            httpURLConnection.setDoInput(true);
+            httpURLConnection.setDoOutput(true);
+            httpURLConnection.setRequestProperty("Content-Type", "application/json");
+
+            httpURLConnection.connect();
+
+            BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(httpURLConnection.getInputStream(), StandardCharsets.UTF_8));
+            String str;
+            while ((str = bufferedReader.readLine()) != null) {
+                sb.append(str);
+            }
+
+            bufferedReader.close();
+            httpURLConnection.disconnect();
+
+            System.out.println(sb);
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return sb.toString();
+
+    }
+
+    public static String post(String ip, int port, String urlPath, String jsonstr) {
+        URL httpUrl;
+        StringBuilder stringBuilder = new StringBuilder();
+        try {
+            httpUrl = new URL("http://" + ip + ":" + port + urlPath);
+            HttpURLConnection httpURLConnection;
+            httpURLConnection = (HttpURLConnection) httpUrl.openConnection();
+            httpURLConnection.setRequestMethod("POST");
+            httpURLConnection.setDoInput(true);
+            httpURLConnection.setDoOutput(true);
+            httpURLConnection.setRequestProperty("Content-Type", "application/json");
+
+            httpURLConnection.connect();
+            OutputStream outputStream = httpURLConnection.getOutputStream();
+            outputStream.write(jsonstr.getBytes(StandardCharsets.UTF_8));
+            outputStream.flush();
+
+            BufferedReader br = new BufferedReader(new InputStreamReader(httpURLConnection.getInputStream(), StandardCharsets.UTF_8));
+            String line;
+            while ((line = br.readLine()) != null) {
+                stringBuilder.append(line);
+            }
+            br.close();
+            httpURLConnection.disconnect();
+
+            System.out.println(stringBuilder);
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return stringBuilder.toString();
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/base/org/bdware/sc/py/utils/HttpExt.java b/src/main/base/org/bdware/sc/py/utils/HttpExt.java
new file mode 100644
index 0000000..f766fed
--- /dev/null
+++ b/src/main/base/org/bdware/sc/py/utils/HttpExt.java
@@ -0,0 +1,64 @@
+package org.bdware.sc.py.utils;
+
+/**
+ * Created by mengliang on 2018/9/26.
+ */
+public class HttpExt {
+
+    public static String getModuleName(String classFullName) {
+        String[] sArrary = classFullName.split("\\.");
+        int len = sArrary.length;
+        StringBuilder moduleName;
+        if (len > 1) {
+            moduleName = new StringBuilder(sArrary[0]);
+            for (int i = 1; i < len - 1; i++) {
+                moduleName.append(".").append(sArrary[i]);
+            }
+            return moduleName.toString();
+        }
+        return "";
+    }
+
+    public static String getPackageName(String moduleName) {
+        String[] sArrary = moduleName.split("\\.");
+        int len = sArrary.length;
+        if (len > 0) {
+            return sArrary[0];
+        }
+        return "";
+    }
+
+    public static String getClassName(String classFullName) {
+        String[] sArrary = classFullName.split("\\.");
+        int len = sArrary.length;
+        if (len > 0) {
+            return sArrary[len - 1];
+        }
+        return "";
+    }
+
+    public static String getMethodName(String methodFullName) {
+        String[] sArrary = methodFullName.split("\\.");
+        int len = sArrary.length;
+        if (len > 0) {
+            return sArrary[len - 1];
+        }
+        return "";
+    }
+
+    public static String getMethodClassFullName(String methodFullName) {
+        String[] sArrary = methodFullName.split("\\.");
+        int len = sArrary.length;
+        StringBuilder classFullName;
+        if (len > 1) {
+            classFullName = new StringBuilder(sArrary[0]);
+            for (int i = 1; i < len - 1; i++) {
+                classFullName.append(".").append(sArrary[i]);
+            }
+            return classFullName.toString();
+        }
+        return "";
+    }
+
+
+}
diff --git a/src/main/base/org/bdware/sc/redo/TransRecord.java b/src/main/base/org/bdware/sc/redo/TransRecord.java
new file mode 100644
index 0000000..254720a
--- /dev/null
+++ b/src/main/base/org/bdware/sc/redo/TransRecord.java
@@ -0,0 +1,62 @@
+package org.bdware.sc.redo;
+
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+public class TransRecord implements Serializable,Comparable<TransRecord>{
+	private static final long serialVersionUID = 8797692289060677903L;
+
+	boolean needSeq = false;
+	int seq;
+	String functionName;
+	String arg;
+	public Map<String,String> executes = new HashMap<String,String>();   //<innvokdeID,(flag1<seperate>flag<seperate>result)>
+
+	public TransRecord(String s1,String s2,int sequence) {
+		this.functionName = s1;
+		this.arg = s2;
+		seq = sequence;
+		needSeq = true;
+	}
+	public TransRecord(String s1,String s2) {
+		this.functionName = s1;
+		this.arg = s2;
+	}
+
+	public String getFuncName() {
+		return functionName;
+	}
+
+	public String getArg() {
+		return arg;
+	}
+
+	public void addExecutes(String k,String v){
+		executes.put(k,v);
+	}
+
+	public int getSeq(){
+		return seq;
+	}
+
+	public String getExecuteResult(String k){
+		return executes.get(k);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder str = new StringBuilder();
+		str.append("===TransRecord===;" +  needSeq  + ";" + seq + ";" + functionName + ";" + arg);
+		for(String k : executes.keySet()){
+			str.append("\n" + k + ";" + executes.get(k));
+		}
+		return str.toString();
+	}
+
+	@Override
+	public int compareTo(TransRecord cr) {
+		return (seq < cr.seq) ? -1 : ((seq == cr.seq) ? 0 : 1);
+	}
+}
diff --git a/src/main/base/org/bdware/sc/units/RequestCache.java b/src/main/base/org/bdware/sc/units/RequestCache.java
new file mode 100644
index 0000000..14792ca
--- /dev/null
+++ b/src/main/base/org/bdware/sc/units/RequestCache.java
@@ -0,0 +1,56 @@
+package org.bdware.sc.units;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+public class RequestCache {
+    public static final int RESERVED = 10;   //只保留每个合约的仅10条请求缓存
+    //    private static final Logger LOGGER = LogManager.getLogger(RequestCache.class);
+    private final long time;
+    private final Map<Integer, String> requests = new TreeMap<>(); //key is seq
+
+    public RequestCache() {
+        time = System.currentTimeMillis();
+    }
+
+    public synchronized void put(Integer seq, String arg) {
+        requests.put(seq, arg);
+    }
+
+    public synchronized String get(Integer seq) {
+        return requests.get(seq);
+    }
+
+    public synchronized int size() {
+        return requests.size();
+    }
+
+    public synchronized boolean containsKey(Integer id) {
+        return requests.get(id) != null;
+    }
+
+    public synchronized long getTime() {
+        return time;
+    }
+
+    //只保留最近RESERVED条请求
+    public synchronized void decSize() {
+        int size = requests.size();
+        if (size <= RESERVED)
+            return;
+
+        int count = 0, total = size - RESERVED;
+        List<Integer> indexs = new ArrayList<>(total);
+        for (Integer i : requests.keySet()) {
+            if (count == total)
+                break;
+            indexs.add(i);
+            count++;
+        }
+        for (int i = 0; i < total; i++) {
+            requests.remove(indexs.get(i));
+        }
+    }
+}
diff --git a/src/main/base/org/bdware/sc/util/ExceptionUtil.java b/src/main/base/org/bdware/sc/util/ExceptionUtil.java
new file mode 100644
index 0000000..d5901b6
--- /dev/null
+++ b/src/main/base/org/bdware/sc/util/ExceptionUtil.java
@@ -0,0 +1,12 @@
+package org.bdware.sc.util;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+public class ExceptionUtil {
+    public static String exceptionToString(Throwable e) {
+        StringWriter sw = new StringWriter();
+        e.printStackTrace(new PrintWriter(sw));
+        return sw.toString();
+    }
+}
diff --git a/src/main/base/org/bdware/sc/util/FileUtil.java b/src/main/base/org/bdware/sc/util/FileUtil.java
new file mode 100644
index 0000000..a36a5c3
--- /dev/null
+++ b/src/main/base/org/bdware/sc/util/FileUtil.java
@@ -0,0 +1,100 @@
+package org.bdware.sc.util;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import javax.script.ScriptException;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+
+public class FileUtil {
+    private static final Logger LOGGER = LogManager.getLogger(FileUtil.class);
+
+    public static String getDir(String fullFileName) {
+        return fullFileName.substring(0, fullFileName.lastIndexOf(File.separatorChar) + 1);
+    }
+
+    public static void copyFile(String src, String dst) {
+        try {
+            File fromFile = new File(src);
+            File toFile = new File(dst);
+            copyFile(fromFile, toFile);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static void copyFile(InputStream in, OutputStream out) {
+        try {
+            byte[] buffer = new byte[10240];
+            for (int len; (len = in.read(buffer)) > 0; ) {
+                out.write(buffer, 0, len);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static void copyFile(File src, File dst) {
+        try {
+            if (!src.exists()) {
+                throw new ScriptException("src file name");
+            }
+            if (src.isDirectory()) {
+                FileUtils.copyDirectory(src, dst);
+            } else {
+                FileUtils.copyFile(src, dst);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static String getFileName(String string) {
+        return string.substring(string.lastIndexOf("/") + 1);
+    }
+
+    public static String getFileContent(String path) {
+        try {
+            File file = new File(path);
+            long fileLen = file.length();
+            byte[] fileContent = new byte[(int) fileLen];
+            FileInputStream in = new FileInputStream(file);
+            LOGGER.debug("read content from " + path + ": " + in.read(fileContent));
+            in.close();
+            return new String(fileContent, StandardCharsets.UTF_8);
+        } catch (IOException e) {
+            LOGGER.error("getContent Meets Exception: " + e.getMessage());
+        }
+        return null;
+    }
+
+    public static PrintStream openFileAsPrinter(String path, boolean isAppend) {
+        try {
+            File f = new File(path);
+            if (!f.getParentFile().exists()) {
+                LOGGER.trace("create directory " + path + ": " + f.getParentFile().mkdirs());
+            }
+            return new PrintStream(new FileOutputStream(f, isAppend));
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public static String getString(InputStream is) {
+        try {
+            ByteArrayOutputStream bo = new ByteArrayOutputStream();
+            byte[] arr = new byte[1024];
+            int l;
+            while ((l = is.read(arr)) > 0) {
+                bo.write(arr, 0, l);
+            }
+            return bo.toString();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+}
diff --git a/src/main/base/org/bdware/sc/util/HashUtil.java b/src/main/base/org/bdware/sc/util/HashUtil.java
new file mode 100644
index 0000000..57f457a
--- /dev/null
+++ b/src/main/base/org/bdware/sc/util/HashUtil.java
@@ -0,0 +1,110 @@
+package org.bdware.sc.util;
+
+import org.bouncycastle.jcajce.provider.digest.SHA3;
+import org.bouncycastle.util.encoders.Hex;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+
+public class HashUtil {
+    private static final SHA3.DigestSHA3 DIGEST_SHA3 = new SHA3.Digest224();
+
+    public static long bytes2Long(byte[] data) {
+        long ret = 0L;
+        for (int i = 0; i < 8; ++i) {
+            ret <<= 8;
+            ret &= ~0xFFL;
+            ret |= data[i] & 0xFFL;
+        }
+        return ret;
+    }
+
+    public static byte[] str16ToBytes(String byteStr) {
+        byte[] bytes = new byte[byteStr.length() / 2];
+        for (int i = 0; i < byteStr.length() / 2; i++) {
+            byte b1 = char16ToByte(byteStr.charAt(i * 2));
+            byte b2 = char16ToByte(byteStr.charAt(i * 2 + 1));
+            bytes[i] = (byte) ((b1 << 4) + b2);
+        }
+        return bytes;
+    }
+
+    public static byte char16ToByte(char c) {
+        if (c >= '0' && c <= '9') {
+            return (byte) (c - '0');
+        }
+        if (c >= 'a' && c <= 'f') {
+            return (byte) (c - 'a' + 10);
+        }
+        return 0;
+    }
+
+    public static String hashByteArray(byte[] hash) {
+        return String.valueOf(Arrays.hashCode(hash));
+    }
+
+    public static String byteArray2Str(byte[] data) {
+        return byteArray2Str(data, 0);
+    }
+
+    public static String byteArray2Str(byte[] byteArray, int offset) {
+        return byteArray2StrByLen(byteArray, offset, byteArray.length);
+    }
+
+    public static String byteArray2StrByLen(byte[] byteArray, int offset, int len) {
+        StringBuilder sb = new StringBuilder();
+        for (int j = offset; j < byteArray.length && j < len; j++) {
+            byte b = byteArray[j];
+            int i = ((int) b) & 0xff;
+            sb.append(String.format("%x%x", i >> 4, i & 0xf));
+        }
+        return sb.toString();
+    }
+
+    public static String formatByteArray(byte[] byteArray, int len) {
+        StringBuilder sb = new StringBuilder("0x");
+        sb.append(byteArray2StrByLen(byteArray, 0, len));
+        for (int i = 0; i < len - byteArray.length; ++i) {
+            sb.append("00");
+        }
+        return sb.toString();
+    }
+
+    public static byte[] truncation(byte[] source, int len) {
+        byte[] ret = new byte[len];
+        System.arraycopy(source, 0, ret, 0, len);
+        return ret;
+    }
+
+    public static int toLittleEndian(int a) {
+        return (((a & 0xFF) << 24) | (((a >> 8) & 0xFF) << 16) | (((a >> 16) & 0xFF) << 8) | ((a >> 24) & 0xFF));
+    }
+
+    public static long toLittleEndian(long a) {
+        return (((a & 0xFFL) << 56) | (((a >> 8) & 0xFFL) << 48) | (((a >> 16) & 0xFFL) << 40)
+                | (((a >> 24) & 0xFFL) << 32) | (((a >> 32) & 0xFFL) << 24) | (((a >> 40) & 0xFFL) << 16)
+                | (((a >> 48) & 0xFFL) << 8) | (((a >> 56) & 0xFFL)));
+    }
+
+    public static long hashStr2Long(String s) {
+        long h = 1125899906842597L; // prime
+        int len = s.length();
+
+        for (int i = 0; i < len; i++) {
+            h = 31 * h + s.charAt(i);
+        }
+        return h;
+    }
+
+    public static String sha3(String value) {
+        return Hex.toHexString(DIGEST_SHA3.digest(value.getBytes(StandardCharsets.UTF_8)));
+    }
+
+    public static String sha3ToFixedLen(String value, int len) {
+        String hash = sha3(value);
+        while (hash.length() < len) {
+            hash = HashUtil.sha3(hash) + hash;
+        }
+        return hash.substring(hash.length() - len);
+    }
+}
diff --git a/src/main/base/org/bdware/sc/util/JsonUtil.java b/src/main/base/org/bdware/sc/util/JsonUtil.java
new file mode 100644
index 0000000..f02dd62
--- /dev/null
+++ b/src/main/base/org/bdware/sc/util/JsonUtil.java
@@ -0,0 +1,47 @@
+package org.bdware.sc.util;
+
+import com.google.gson.*;
+
+import java.io.Reader;
+import java.lang.reflect.Type;
+
+public class JsonUtil {
+    public static final Gson GSON = new Gson();
+    private static final Gson PRETTY_GSON = new GsonBuilder().setPrettyPrinting().create();
+
+    public static String toJson(Object o) {
+        return GSON.toJson(o);
+    }
+
+    public static <T> T fromJson(String s, Type type) {
+        return GSON.fromJson(s, type);
+    }
+
+    public static <T> T fromJson(String s, Class<T> classOfT) {
+        return GSON.fromJson(s, classOfT);
+    }
+
+    public static <T> T fromJson(Reader s, Type type) {
+        return GSON.fromJson(s, type);
+    }
+
+    public static <T> T fromJson(Reader s, Class<T> classOfT) {
+        return GSON.fromJson(s, classOfT);
+    }
+
+    public static <T> T fromJson(JsonElement je, Type type) {
+        return GSON.fromJson(je, type);
+    }
+
+    public static String toPrettyJson(Object o) {
+        return PRETTY_GSON.toJson(o);
+    }
+
+    public static JsonObject parseString(String json) {
+        return JsonParser.parseString(json).getAsJsonObject();
+    }
+
+    public static JsonObject parseObject(Object obj) {
+        return GSON.toJsonTree(obj).getAsJsonObject();
+    }
+}
diff --git a/src/main/base/org/bdware/sc/util/LRUList.java b/src/main/base/org/bdware/sc/util/LRUList.java
new file mode 100644
index 0000000..ccdbd41
--- /dev/null
+++ b/src/main/base/org/bdware/sc/util/LRUList.java
@@ -0,0 +1,28 @@
+package org.bdware.sc.util;
+
+import java.util.LinkedList;
+
+public class LRUList<T> {
+    LinkedList<T> array = new LinkedList<T>();
+
+    public void add(T t) {
+        // TODO 似乎优化在remove这一行
+        array.remove(t);
+        array.addFirst(t);
+    }
+
+    public T popOldest() {
+        if (array.isEmpty()) {
+            return null;
+        }
+        return array.removeLast();
+    }
+
+    public void remove(T t) {
+        if (array.size() > 0) array.remove(t);
+    }
+
+    public int size() {
+        return array.size();
+    }
+}
diff --git a/src/main/base/org/bdware/sc/util/VersionUtil.java b/src/main/base/org/bdware/sc/util/VersionUtil.java
new file mode 100644
index 0000000..5cf7742
--- /dev/null
+++ b/src/main/base/org/bdware/sc/util/VersionUtil.java
@@ -0,0 +1,37 @@
+package org.bdware.sc.util;
+
+public class VersionUtil {
+    public static int compareVersion(String v1, String v2) {
+        if (v1.equals(v2)) {
+            return 0;
+        }
+        String[] version1Array = v1.split("[._]");
+        String[] version2Array = v2.split("[._]");
+        int index = 0;
+        int minLen = Math.min(version1Array.length, version2Array.length);
+        long diff = 0;
+
+        while (index < minLen
+                && (diff = Long.parseLong(version1Array[index])
+                - Long.parseLong(version2Array[index])) == 0) {
+            index++;
+        }
+        if (diff == 0) {
+            for (int i = index; i < version1Array.length; i++) {
+                if (Long.parseLong(version1Array[i]) > 0) {
+                    return 1;
+                }
+            }
+
+            for (int i = index; i < version2Array.length; i++) {
+                if (Long.parseLong(version2Array[i]) > 0) {
+                    return -1;
+                }
+            }
+            return 0;
+        } else {
+            return diff > 0 ? 1 : -1;
+        }
+    }
+
+}
diff --git a/src/main/base/org/bdware/sc/visitor/ClassReader.java b/src/main/base/org/bdware/sc/visitor/ClassReader.java
new file mode 100644
index 0000000..1f68a93
--- /dev/null
+++ b/src/main/base/org/bdware/sc/visitor/ClassReader.java
@@ -0,0 +1,43 @@
+package org.bdware.sc.visitor;
+
+import org.bdware.sc.node.ClassNode;
+import org.bdware.sc.node.FunctionNode;
+import org.bdware.sc.parser.YJSParser;
+import org.bdware.sc.parser.YJSParser.ClassElementContext;
+import org.bdware.sc.parser.YJSParserBaseVisitor;
+
+import java.util.List;
+
+public class ClassReader extends YJSParserBaseVisitor<ClassNode> {
+    ClassNode cn;
+    String fileName;
+
+    public ClassReader(String fileName) {
+        this.fileName = fileName;
+    }
+
+    @Override
+    public ClassNode visitClassDeclaration(YJSParser.ClassDeclarationContext ctx) {
+        cn = new ClassNode(ctx.Identifier().toString(), fileName);
+        cn.setLine(ctx.start.getLine());
+        cn.setPos(ctx.start.getCharPositionInLine());
+        cn.setInterval(ctx.getSourceInterval());
+        ctx.classTail().accept(this);
+        return cn;
+    }
+
+    @Override
+    public ClassNode visitClassTail(YJSParser.ClassTailContext ctx) {
+        List<ClassElementContext> clzElements = ctx.classElement();
+        if (clzElements != null)
+            for (ClassElementContext clzElement : clzElements) {
+                FunctionReader node = new FunctionReader(fileName);
+                FunctionNode function = node.visitMethodDefinition(clzElement.methodDefinition());
+                if (null != clzElement.Static()) {
+                    function.setStatic(true);
+                }
+                cn.addFunction(function);
+            }
+        return cn;
+    }
+}
diff --git a/src/main/base/org/bdware/sc/visitor/ClassVisitor.java b/src/main/base/org/bdware/sc/visitor/ClassVisitor.java
new file mode 100644
index 0000000..6c81621
--- /dev/null
+++ b/src/main/base/org/bdware/sc/visitor/ClassVisitor.java
@@ -0,0 +1,5 @@
+package org.bdware.sc.visitor;
+
+public class ClassVisitor {
+
+}
diff --git a/src/main/base/org/bdware/sc/visitor/ContractDependencyVisitor.java b/src/main/base/org/bdware/sc/visitor/ContractDependencyVisitor.java
new file mode 100644
index 0000000..5816f32
--- /dev/null
+++ b/src/main/base/org/bdware/sc/visitor/ContractDependencyVisitor.java
@@ -0,0 +1,31 @@
+package org.bdware.sc.visitor;
+
+import org.bdware.sc.node.ContractNode;
+import org.bdware.sc.node.FunctionNode;
+import org.bdware.sc.parser.YJSParser;
+import org.bdware.sc.parser.YJSParserBaseVisitor;
+
+public class ContractDependencyVisitor extends YJSParserBaseVisitor<FunctionNode>{
+
+    private final ContractNode cn;
+    private final FunctionNode fn;
+
+    public ContractDependencyVisitor(ContractNode cn, FunctionNode fn) {
+        this.cn = cn;
+        this.fn = fn;
+    }
+
+    @Override
+    public FunctionNode visitArgumentsExpression(YJSParser.ArgumentsExpressionContext ctx) {
+        super.visitArgumentsExpression(ctx);
+        if (ctx.singleExpression().getText().equals("executeContract")) {
+            String contractName =  ctx.arguments().singleExpression().get(0).getText();
+            if (contractName.contains("\"")) {
+                contractName = contractName.replace("\"", "");
+                cn.addDependentContracts(contractName);
+            }
+            //ctx.arguments().singleExpression().get(1).getText();
+        }
+        return fn;
+    }
+}
\ No newline at end of file
diff --git a/src/main/base/org/bdware/sc/visitor/ContractReader.java b/src/main/base/org/bdware/sc/visitor/ContractReader.java
new file mode 100644
index 0000000..d586d37
--- /dev/null
+++ b/src/main/base/org/bdware/sc/visitor/ContractReader.java
@@ -0,0 +1,118 @@
+package org.bdware.sc.visitor;
+
+import org.bdware.sc.node.*;
+import org.bdware.sc.parser.YJSParser;
+import org.bdware.sc.parser.YJSParser.*;
+import org.bdware.sc.parser.YJSParserBaseVisitor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ContractReader extends YJSParserBaseVisitor<ContractNode> {
+    //    private static final Logger LOGGER = LogManager.getLogger(ContractReader.class);
+    String fileName;
+
+    public ContractReader(String fileName) {
+        this.fileName = fileName;
+    }
+
+    /**
+     * Discover direct dependent functions for all functions. Indirect dependencies are not included.
+     *
+     * @param node contract node
+     * @param ctx  contract declared context
+     */
+    public static void discoverFunctionDependency(ContractNode node, ContractDeclarContext ctx) {
+        List<FunctionNode> functions = node.getFunctions();
+        for (FunctionNode f : functions) {
+            FunctionDependencyVisitor dependencyVisitor = new FunctionDependencyVisitor(node, f);
+            for (ClzOrFunctionDeclarationContext childCtx : ctx.clzOrFunctionDeclaration()) {
+                if (null != childCtx.functionDeclaration()) {
+                    FunctionDeclarationContext fdCtx = childCtx.functionDeclaration();
+                    if (f.functionName.equals(fdCtx.Identifier().toString())) {
+                        dependencyVisitor.visitFunctionDeclaration(fdCtx);
+                    }
+                }
+            }
+        }
+    }
+
+    public static void discoverContractDependency(ContractNode node, ContractDeclarContext ctx) {
+        List<FunctionNode> functions = node.getFunctions();
+        for (FunctionNode f : functions) {
+            ContractDependencyVisitor dependencyVisitor = new ContractDependencyVisitor(node, f);
+            for (ClzOrFunctionDeclarationContext childCtx : ctx.clzOrFunctionDeclaration()) {
+                if (null != childCtx.functionDeclaration()) {
+                    FunctionDeclarationContext fdCtx = childCtx.functionDeclaration();
+                    if (f.functionName.equals(fdCtx.Identifier().toString())) {
+                        dependencyVisitor.visitFunctionDeclaration(fdCtx);
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public ContractNode visitProgram(YJSParser.ProgramContext ctx) {
+        List<ImportStmtContext> importStmts = new ArrayList<>();
+        if (null != ctx.importStmts()) {
+            importStmts = ctx.importStmts().importStmt();
+        }
+        ContractDeclarContext contractDelcar = ctx.contractDeclar();
+        ContractNode node = new ContractNode(contractDelcar.Identifier().toString());
+        for (ImportStmtContext importStmt : importStmts) {
+            node.addImportStmt(ImportNode.createFromCtx(importStmt));
+        }
+        List<AnnotationContext> annotations = new ArrayList<>();
+
+        // judge Oracle、Contract、Module
+        if (null != contractDelcar.Oracle()) {
+            node.setYjsType(YjsType.Oracle);
+        } else if (null != contractDelcar.Contract()) {
+            node.setYjsType(YjsType.Contract);
+        } else if (null != contractDelcar.Module()) {
+            node.setYjsType(YjsType.Module);
+        }
+        if (null != contractDelcar.annotations())
+            annotations = contractDelcar.annotations().annotation();
+        for (AnnotationContext annotation : annotations) {
+            AnnotationNode annNode = new AnnotationNode(annotation.Identifier().toString());
+            if (null != annotation.annotationArgs())
+                for (AnnotationLiteralContext tNode : annotation.annotationArgs().annotationLiteral()) {
+                    if (null != tNode.numericLiteral()) {
+                        annNode.addArg(tNode.numericLiteral().getText());
+                    } else if (null != tNode.StringLiteral()) {
+                        annNode.addArg(tNode.StringLiteral().getText());
+                    } else {
+                        annNode.addArg(tNode.objectLiteral().getText());
+                    }
+                }
+            node.addAnnotation(annNode);
+        }
+
+        List<ClzOrFunctionDeclarationContext> clzOrFunctions = contractDelcar.clzOrFunctionDeclaration();
+        for (ClzOrFunctionDeclarationContext clzOrFunction : clzOrFunctions) {
+            if (null != clzOrFunction.functionDeclaration()) {
+                FunctionReader reader = new FunctionReader(fileName);
+                node.addFunction(reader.visitFunctionDeclaration(clzOrFunction.functionDeclaration()));
+            } else if (null != clzOrFunction.classDeclaration()) {
+                ClassReader reader = new ClassReader(fileName);
+                node.addClass(reader.visitClassDeclaration(clzOrFunction.classDeclaration()));
+            } else if (null != clzOrFunction.eventDeclaration()) {
+                EventDeclarationContext event = clzOrFunction.eventDeclaration();
+                EventSemanticsContext eventSemanticsContext = event.eventSemantics();
+                if (null == eventSemanticsContext) {
+                    node.addEvent(event.Identifier().getText());
+                } else {
+                    node.addEvent(event.Identifier().getText(), eventSemanticsContext.getText());
+                }
+            }
+        }
+        // ctx.getSourceInterval()
+        discoverFunctionDependency(node, contractDelcar);
+        discoverContractDependency(node, contractDelcar);
+
+        return node;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/base/org/bdware/sc/visitor/FunctionDependencyVisitor.java b/src/main/base/org/bdware/sc/visitor/FunctionDependencyVisitor.java
new file mode 100644
index 0000000..af24cd0
--- /dev/null
+++ b/src/main/base/org/bdware/sc/visitor/FunctionDependencyVisitor.java
@@ -0,0 +1,47 @@
+package org.bdware.sc.visitor;
+
+import org.bdware.sc.node.ContractNode;
+import org.bdware.sc.node.FunctionNode;
+import org.bdware.sc.parser.YJSParser;
+import org.bdware.sc.parser.YJSParserBaseVisitor;
+
+public class FunctionDependencyVisitor extends YJSParserBaseVisitor<FunctionNode> {
+
+    public static String APPLY = ".apply";
+    public static String CALL = ".call";
+
+    private final ContractNode cn;
+    private final FunctionNode fn;
+
+    public FunctionDependencyVisitor(ContractNode cn, FunctionNode fn) {
+        this.cn = cn;
+        this.fn = fn;
+    }
+
+    @Override
+    public FunctionNode visitArgumentsExpression(YJSParser.ArgumentsExpressionContext ctx) {
+        super.visitArgumentsExpression(ctx);
+        for (FunctionNode f : cn.getFunctions()) {
+            if (ctx.singleExpression().getText().equals(f.functionName) ||
+                    ctx.singleExpression().getText().equals(f.functionName + APPLY) ||
+                    ctx.singleExpression().getText().equals(f.functionName + CALL)) {
+                fn.addDependentFunctions(f.functionName);
+                break;
+            }
+        }
+        return fn;
+    }
+
+    @Override
+    public FunctionNode visitNewExpression(YJSParser.NewExpressionContext ctx) {
+        super.visitNewExpression(ctx);
+        for (FunctionNode f : cn.getFunctions()) {
+            if (f.functionName.equals(ctx.singleExpression().getText())) {
+                fn.addDependentFunctions(f.functionName);
+                break;
+            }
+        }
+        return fn;
+    }
+
+}
diff --git a/src/main/base/org/bdware/sc/visitor/FunctionReader.java b/src/main/base/org/bdware/sc/visitor/FunctionReader.java
new file mode 100644
index 0000000..215f4c7
--- /dev/null
+++ b/src/main/base/org/bdware/sc/visitor/FunctionReader.java
@@ -0,0 +1,319 @@
+package org.bdware.sc.visitor;
+
+import org.antlr.v4.runtime.misc.Interval;
+import org.antlr.v4.runtime.tree.TerminalNodeImpl;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.bdware.sc.node.AnnotationNode;
+import org.bdware.sc.node.FunctionNode;
+import org.bdware.sc.node.Op;
+import org.bdware.sc.node.StmtNode;
+import org.bdware.sc.node.stmt.*;
+import org.bdware.sc.parser.YJSParser;
+import org.bdware.sc.parser.YJSParser.*;
+import org.bdware.sc.parser.YJSParserBaseVisitor;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Stack;
+
+public class FunctionReader extends YJSParserBaseVisitor<FunctionNode> {
+    private static final Logger LOGGER = LogManager.getLogger(FunctionReader.class);
+    FunctionNode node;
+    Stack<BlockInterval> blockStack;
+    String fileName;
+    // Stack<String> regStack;
+    int regID;
+
+    public FunctionReader(String fileName) {
+        this.fileName = fileName;
+    }
+
+    @Override
+    public FunctionNode visitMethodDefinition(YJSParser.MethodDefinitionContext ctx) {
+        node = new FunctionNode(ctx.propertyName().identifierName().getText(), fileName);
+        blockStack = new Stack<>();
+        // regStack = new Stack<>();
+        regID = 0;
+        initParams(ctx.formalParameterList());
+        initFunctionBody(ctx.functionBody());
+        node.setLine(ctx.start.getLine());
+        node.setPos(ctx.start.getCharPositionInLine());
+        node.setInterval(ctx.getSourceInterval());
+        return node;
+    }
+
+    @Override
+    public FunctionNode visitFunctionDeclaration(YJSParser.FunctionDeclarationContext ctx) {
+        node = new FunctionNode(ctx.Identifier().toString(), fileName);
+        node.setIsExport(ctx.Export() != null);
+        blockStack = new Stack<>();
+        initParams(ctx.formalParameterList());
+        initFunctionBody(ctx.functionBody());
+        node.setLine(ctx.start.getLine());
+        node.setPos(ctx.start.getCharPositionInLine());
+
+        node.setInterval(
+                new Interval(ctx.Function().getSourceInterval().a, ctx.getSourceInterval().b));
+
+        List<AnnotationContext> annotations = new ArrayList<>();
+        if (null != ctx.annotations()) {
+            annotations = ctx.annotations().annotation();
+        }
+        for (AnnotationContext annotation : annotations) {
+            AnnotationNode annNode = new AnnotationNode(annotation.Identifier().toString());
+            if (annNode.getType().equals("Mask")) {
+                node.setIsMask(true);
+            }
+            if (null != annotation.annotationArgs())
+                for (AnnotationLiteralContext tNode :
+                        annotation.annotationArgs().annotationLiteral()) {
+                    if (null != tNode.numericLiteral()) {
+                        annNode.addArg(tNode.numericLiteral().getText());
+                        LOGGER.debug(
+                                "------AnnotationNumericArgs:" + tNode.numericLiteral().getText());
+                    } else if (null != tNode.StringLiteral()) {
+                        annNode.addArg(tNode.StringLiteral().getText());
+                        LOGGER.debug(
+                                "------AnnotationStringArgs:" + tNode.StringLiteral().getText());
+                    } else {
+                        annNode.addArg(tNode.objectLiteral().getText());
+                        LOGGER.debug(
+                                "------AnnotationObjectArgs:" + tNode.objectLiteral().getText());
+                    }
+                }
+            node.addAnnotation(annNode);
+        }
+
+        return node;
+    }
+
+    private void initFunctionBody(FunctionBodyContext functionBody) {
+        if (null == functionBody || null == functionBody.sourceElements()) {
+            return;
+        }
+        List<SourceElementContext> sourceElements = functionBody.sourceElements().sourceElement();
+        if (null != sourceElements)
+            for (SourceElementContext ctx : sourceElements) {
+                StatementContext stmt = ctx.statement();
+                visitStatement(stmt);
+            }
+    }
+
+    private void expandStmt(FunctionNode node, StatementContext stmt) {
+        // stmt.start.getLine();
+        stmt.accept(this);
+        if (null != stmt.block()) {
+            StatementListContext list = stmt.block().statementList();
+            for (StatementContext ctx : list.statement()) {
+                expandStmt(node, ctx);
+            }
+        }
+        /*
+         * | variableStatement | emptyStatement | expressionStatement | ifStatement |
+         * iterationStatement | continueStatement | breakStatement | returnStatement |
+         * labelledStatement | switchStatement
+         */
+    }
+
+    private void initParams(FormalParameterListContext argList) {
+        if (null == argList) {
+            return;
+        }
+        List<FormalParameterArgContext> args = argList.formalParameterArg();
+        for (FormalParameterArgContext arg : args) {
+            node.addArg(arg.Identifier().toString());
+        }
+    }
+
+    public FunctionNode visitBlock(YJSParser.BlockContext ctx) {
+        LabelStmt start = new LabelStmt();
+        start.setLineAndPos(ctx.start);
+        LabelStmt end = new LabelStmt();
+        end.setLineAndPos(ctx.stop);
+        node.addStmt(start);
+        blockStack.push(new BlockInterval(start, end));
+        if (null != ctx.statementList()) {
+            ctx.statementList().accept(this);
+        }
+        node.addStmt(end);
+        blockStack.pop();
+        return node;
+    }
+
+    // ========Now we can handle the stmts========
+
+    public FunctionNode visitVariableStatement(YJSParser.VariableStatementContext ctx) {
+        List<VariableDeclarationContext> list = ctx.variableDeclarationList().variableDeclaration();
+        for (VariableDeclarationContext varCtx : list) {
+            varCtx.accept(this);
+        }
+        return node;
+    }
+
+    public FunctionNode visitVariableDeclaration(YJSParser.VariableDeclarationContext ctx) {
+        Stmt2N stmt = new Stmt2N(Op.Move);
+        stmt.setLineAndPos(ctx.start);
+        stmt.setTo(ctx.Identifier().toString());
+        if (null != ctx.singleExpression()) {
+            node.addStmts(parseSingleExpression(ctx.singleExpression()));
+            stmt.setFrom("Reg" + (regID - 1));
+        } else {
+            stmt.setFrom("undefined");
+            node.addStmt(stmt);
+        }
+        return node;
+    }
+
+    public FunctionNode visitEmptyStatement(YJSParser.EmptyStatementContext ctx) {
+        return node;
+    }
+
+    public FunctionNode visitExpressionStatement(YJSParser.ExpressionStatementContext ctx) {
+        List<SingleExpressionContext> list = ctx.expressionSequence().singleExpression();
+        for (SingleExpressionContext expression : list) {
+            node.addStmts(parseSingleExpression(expression));
+        }
+        return node;
+    }
+
+    public FunctionNode visitIfStatement(YJSParser.IfStatementContext ctx) {
+        BranchStmt stmt = new BranchStmt();
+        LabelStmt start = new LabelStmt();
+        LabelStmt end = new LabelStmt();
+        List<StmtNode> l = parseExpressionSequence(ctx.expressionSequence());
+        node.addStmts(l);
+        stmt.setReg("Reg" + (regID - 1));
+        stmt.setTarget(end);
+        node.addStmt(stmt);
+        node.addStmt(start);
+        List<StatementContext> subBlock = ctx.statement();
+        this.visitStatement(subBlock.get(0));
+        node.addStmt(end);
+        if (null != ctx.Else()) {
+            GotoStmt gotoStmt = new GotoStmt();
+            gotoStmt.setTarget(end);
+            gotoStmt.setLineAndPos(subBlock.get(1).start);
+            node.addStmt(gotoStmt);
+            this.visitStatement(subBlock.get(1));
+        }
+        node.addStmt(end);
+        return node;
+    }
+
+    public FunctionNode visitForStatement(YJSParser.ForStatementContext ctx) {
+        int order = 2;
+        int index = 0;
+        ExpressionSequenceContext prePart, ifPart, tailPart;
+        if (ctx.getChild(order) instanceof TerminalNodeImpl &&
+                ctx.getChild(order).toString().equals(";")) {
+            prePart = null;
+            order++;
+        } else {
+            prePart = ctx.expressionSequence(index);
+            order += 2;
+            index++;
+        }
+        if (ctx.getChild(order) instanceof TerminalNodeImpl &&
+                ctx.getChild(order).toString().equals(";")) {
+            ifPart = null;
+            order++;
+        } else {
+            order += 2;
+            ifPart = ctx.expressionSequence(index);
+            index++;
+        }
+
+        if (ctx.getChild(order) instanceof TerminalNodeImpl &&
+                ctx.getChild(order).toString().equals(")")) {
+            tailPart = null;
+        } else {
+            tailPart = ctx.expressionSequence(index);
+        }
+        LabelStmt start = new LabelStmt();
+        start.setLineAndPos(ctx.start);
+        LabelStmt end = new LabelStmt();
+        end.setLineAndPos(ctx.stop);
+        LabelStmt target = new LabelStmt();
+        target.setLineAndPos(ctx.start);
+        // handle declaring?
+        if (null != prePart) {
+            prePart.accept(this);
+        }
+        node.addStmt(start.setLineAndPos(ctx.start));
+        node.addStmt(new GotoStmt().setTarget(target).setLineAndPos(ctx.start));
+        if (null != tailPart) {
+            tailPart.accept(this);
+        }
+        node.addStmt(target);
+        if (null != ifPart) {
+            ifPart.accept(this);
+            node.addStmt(
+                    new BranchStmt()
+                            .setReg("Reg" + (regID - 1))
+                            .setTarget(end)
+                            .setLineAndPos(ctx.start));
+        }
+        blockStack.push(new BlockInterval(start, end));
+        visitStatement(ctx.statement());
+        blockStack.pop();
+        node.addStmt(new GotoStmt().setTarget(start).setLineAndPos(ctx.start));
+        node.addStmt(end);
+        return node;
+    }
+
+    public FunctionNode visitContinueStatement(YJSParser.ContinueStatementContext ctx) {
+        GotoStmt stmt = new GotoStmt();
+        stmt.setLineAndPos(ctx.start);
+        stmt.setTarget(blockStack.peek().start);
+        node.addStmt(stmt);
+        return node;
+    }
+
+    public FunctionNode visitBreakStatement(YJSParser.BreakStatementContext ctx) {
+        GotoStmt stmt = new GotoStmt();
+        stmt.setLineAndPos(ctx.start);
+        stmt.setTarget(blockStack.peek().end);
+        node.addStmt(stmt);
+        return node;
+    }
+
+    public FunctionNode visitReturnStatement(YJSParser.ReturnStatementContext ctx) {
+        node.addStmts(parseExpressionSequence(ctx.expressionSequence()));
+        if (null == ctx.expressionSequence()) {
+            node.addStmt(new Stmt1N(Op.Return, null).setLineAndPos(ctx.start));
+        } else {
+            node.addStmt(new Stmt1N(Op.Return, "Reg" + (regID - 1)).setLineAndPos(ctx.start));
+        }
+        return node;
+    }
+
+    public FunctionNode visitSwitchStatement(YJSParser.SwitchStatementContext ctx) {
+        return null;
+    }
+
+    private List<StmtNode> parseExpressionSequence(ExpressionSequenceContext expressionSequence) {
+        List<StmtNode> ret = new ArrayList<>();
+
+        for (SingleExpressionContext singleExpression : expressionSequence.singleExpression()) {
+            ret.addAll(parseSingleExpression(singleExpression));
+        }
+        return ret;
+    }
+
+    private List<StmtNode> parseSingleExpression(SingleExpressionContext singleExpression) {
+        List<StmtNode> ret = new ArrayList<>();
+        ret.add(new Stmt1N(Op.STUB, "Reg" + (regID++)).setLineAndPos(singleExpression.start));
+
+        return ret;
+    }
+
+    static class BlockInterval {
+        LabelStmt start, end;
+
+        public BlockInterval(LabelStmt s, LabelStmt e) {
+            start = s;
+            end = e;
+        }
+    }
+}
diff --git a/src/main/config/org/bdware/sc/DoConfig.java b/src/main/config/org/bdware/sc/DoConfig.java
new file mode 100644
index 0000000..8e688fe
--- /dev/null
+++ b/src/main/config/org/bdware/sc/DoConfig.java
@@ -0,0 +1,5 @@
+package org.bdware.sc;
+
+public class DoConfig {
+    public static boolean callContractUsingDOI = true;
+}
diff --git a/src/main/entry/org/bdware/sc/ContractStatus.java b/src/main/entry/org/bdware/sc/ContractStatus.java
new file mode 100644
index 0000000..44231a5
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/ContractStatus.java
@@ -0,0 +1,7 @@
+package org.bdware.sc;
+
+enum ContractStatus {
+    Ready,
+    Executing,
+    Executed
+}
diff --git a/src/main/entry/org/bdware/sc/DoipServiceInfoConfigurer.java b/src/main/entry/org/bdware/sc/DoipServiceInfoConfigurer.java
new file mode 100644
index 0000000..44754b8
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/DoipServiceInfoConfigurer.java
@@ -0,0 +1,14 @@
+package org.bdware.sc;
+
+import org.bdware.doip.application.DoipServiceConfig;
+import org.bdware.doip.endpoint.doipServer.DoipServiceInfo;
+
+public interface DoipServiceInfoConfigurer {
+    String getServiceHandle();
+
+    String resetServiceConfig(String configJson);
+
+    DoipServiceConfig getDoipServiceConfig();
+
+    DoipServiceInfo getDoipServiceInfo();
+}
diff --git a/src/main/entry/org/bdware/sc/NodeCenterConn.java b/src/main/entry/org/bdware/sc/NodeCenterConn.java
new file mode 100644
index 0000000..b98cb22
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/NodeCenterConn.java
@@ -0,0 +1,41 @@
+package org.bdware.sc;
+
+import com.google.gson.JsonObject;
+import org.zz.gmhelper.SM2KeyPair;
+
+import java.math.BigInteger;
+
+public interface NodeCenterConn {
+    boolean deliverEvent(String event, String target);
+
+    NodeKey[] listNodes();
+
+    String getNodeId(String str);
+
+    String routeContract(String contractID);
+
+    String reRouteContract(String contractID);
+
+    void sendMsg(String msg);
+
+    SM2KeyPair getNodeKeyPair();
+
+    JsonObject checkIsContract(String requestID, String json);
+
+    class NodeKey {
+        public String id;
+        public BigInteger biId;
+
+        public NodeKey(String id) {
+            this.id = id;
+            this.biId = new BigInteger(id, 16);
+        }
+    }
+
+    class Response {
+        String responseID;
+        String action;
+        Object data;
+        long executeTime;
+    }
+}
diff --git a/src/main/entry/org/bdware/sc/PermissionStatus.java b/src/main/entry/org/bdware/sc/PermissionStatus.java
new file mode 100644
index 0000000..b48de94
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/PermissionStatus.java
@@ -0,0 +1,5 @@
+package org.bdware.sc;
+
+public class PermissionStatus {
+
+}
diff --git a/src/main/entry/org/bdware/sc/SCAPI.java b/src/main/entry/org/bdware/sc/SCAPI.java
new file mode 100644
index 0000000..831c2a4
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/SCAPI.java
@@ -0,0 +1,96 @@
+package org.bdware.sc;
+
+import org.bdware.sc.bean.Contract;
+import org.bdware.sc.bean.ContractExecType;
+import org.bdware.sc.bean.ContractRequest;
+import org.bdware.sc.conn.SocketGet;
+import org.bdware.sc.util.JsonUtil;
+
+public class SCAPI {
+    public static void main(String[] args) {
+        if (null == args || args.length == 0) {
+            args = new String[]{""};
+        }
+        switch (args[0]) {
+            case "exit":
+            case "execContract":
+            case "startContract":
+            case "requestContract":
+            case "stopContract":
+            case "stopAllContracts":
+            case "listContracts":
+                SocketGet get = new SocketGet("127.0.0.1", 1615);
+
+                if (args.length > 1)
+                    System.out.println(get.syncGet("dd", args[0], args[1]));
+                else
+                    System.out.println(get.syncGet("dd", args[0], "{}"));
+
+                break;
+            default:
+                get = new SocketGet("127.0.0.1", 18000);
+
+                System.out.println("Usage: method arg");
+                System.out.println(get.syncGet("dd", "help", ""));
+                System.out.println("=========Sample1===========");
+                System.out.println(
+                        "java -classpath yjs.jar com.yancloud.sc.SCAPI startContract \"{\\\"type\\\":\\\"Data\\\",\\\"id\\\":\\\"656564\\\"}\\\"");
+                System.out.println(
+                        "java -classpath yjs.jar com.yancloud.sc.SCAPI execContract \"{\\\"arg\\\":\\\"http://www.baidu.com\\\",\\\"contractID\\\":\\\"656564\\\"}\"");
+                System.out.println("=========Sample2===========");
+                System.out.println(
+                        "java -classpath yjs.jar com.yancloud.sc.SCAPI startContract \"{\\\"type\\\":\\\"Algorigthm\\\",\\\"id\\\":\\\"656565\\\",\\\"script\\\":\\\"contract c{function main(arg){return arg/1.0+1;}}\\\"}\"");
+                System.out.println(
+                        "java -classpath yjs.jar com.yancloud.sc.SCAPI execContract \"{\\\"arg\\\":\\\"101\\\",\\\"contractID\\\":\\\"656565\\\"}\"");
+
+        }
+    }
+	
+	/*
+	private static String getAlgorithmSample() {
+		Contract c = new Contract();
+		c.setID("656565");
+		c.setType(Type.Algorithm);
+		c.setScript("contract c{function main(arg){return arg+1;}}");
+		return JsonUtil.toJson(c);
+
+	}
+	
+	private static String getDataSample() {
+		Contract c = new Contract();
+		c.setID("656564");
+		c.setType(Type.Data);
+		return JsonUtil.toJson(c);
+	}
+	*/
+
+    private static String getFixedSample() {
+        Contract c = new Contract();
+        c.setID("656565");
+        c.setType(ContractExecType.Sole);
+        c.setScript("contract c{function main(arg){return arg+1;}}");
+        return JsonUtil.toJson(c);
+
+    }
+
+
+    private static void approveContract(String json) {
+        try {
+            SocketGet get = new SocketGet("127.0.0.1", 1615);
+            ContractRequest app = JsonUtil.fromJson(json, ContractRequest.class);
+            System.out.println(get.syncGet("dd", "approveContract", JsonUtil.toJson(app)));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static void startContract(String json) {
+        try {
+            SocketGet get = new SocketGet("127.0.0.1", 1615);
+            Contract c = JsonUtil.fromJson(json, Contract.class);
+            System.out.println(get.syncGet("dd", "startContract", JsonUtil.toJson(c)));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/src/main/entry/org/bdware/sc/YJSPacker.java b/src/main/entry/org/bdware/sc/YJSPacker.java
new file mode 100644
index 0000000..b3f361e
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/YJSPacker.java
@@ -0,0 +1,290 @@
+package org.bdware.sc;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.bdware.sc.encrypt.HardwareInfo;
+import org.bdware.sc.encrypt.HardwareInfo.OSType;
+import org.bdware.sc.gen.PYGenerator;
+import org.bdware.sc.node.ContractManifest;
+import org.bdware.sc.packer.AvatarHelper;
+import org.bdware.sc.py.PYEntry;
+import org.bdware.sc.py.bean.PYModule;
+import org.bdware.sc.py.bean.PYPackage;
+import org.bdware.sc.util.JsonUtil;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipInputStream;
+import java.util.zip.ZipOutputStream;
+
+public class YJSPacker {
+    private static final String MANIFEST_NAME = "manifest.json";
+    private static final String JAR_NAME = "py.jar";
+    private static final Logger LOGGER = LogManager.getLogger(YJSPacker.class);
+    private static final String LOGO_NAME = "logo.png";
+
+    public static byte[] pack(String dir) {
+        try {
+            File d = new File(dir);
+            ByteArrayOutputStream fout = new ByteArrayOutputStream();
+            ZipOutputStream zout = new ZipOutputStream(fout);
+            updateManifest(dir + "/" + MANIFEST_NAME);
+            generateLogoIfNotExist(dir);
+            walkDir(d.getAbsolutePath(), d, zout);
+            ByteArrayOutputStream bo = new ByteArrayOutputStream();
+            boolean hasContent =
+                    packFromManifest(new ZipOutputStream(bo), dir + "/" + MANIFEST_NAME);
+            if (hasContent) {
+                zout.putNextEntry(new ZipEntry(JAR_NAME));
+                zout.write(bo.toByteArray());
+                zout.closeEntry();
+            }
+            zout.close();
+            fout.close();
+            return fout.toByteArray();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public static void pack(String dir, String target) {
+        try {
+            File d = new File(dir);
+            File parent = new File(target).getParentFile();
+            if (!parent.exists()) {
+                LOGGER.trace("create directory " + parent.getAbsolutePath() + ": " + parent.mkdirs());
+            }
+            FileOutputStream fout = new FileOutputStream(target);
+            ZipOutputStream zout = new ZipOutputStream(fout);
+            //System.out.println("[YJSPaker]"+dir+MANIFEST_NAME);
+            updateManifest(dir + "/" + MANIFEST_NAME);
+            generateLogoIfNotExist(dir);
+            walkDir(d.getAbsolutePath(), d, zout);
+            ByteArrayOutputStream bo = new ByteArrayOutputStream();
+            boolean hasContent =
+                    packFromManifest(new ZipOutputStream(bo), dir + "/" + MANIFEST_NAME);
+            if (hasContent) {
+                zout.putNextEntry(new ZipEntry(JAR_NAME));
+                zout.write(bo.toByteArray());
+                zout.closeEntry();
+            }
+            zout.close();
+            fout.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static void generateLogoIfNotExist(String dir) {
+        File logoDir = new File(dir, "assets");
+        if (!logoDir.exists()) {
+            LOGGER.trace("create directory " + logoDir.getAbsolutePath() + ": " + logoDir.mkdirs());
+        }
+        File logo = new File(logoDir, LOGO_NAME);
+        String builderName = new File(dir).getParentFile().getName();
+        String sourcePath = builderName + "/" + new File(dir).getName();
+        if (!logo.exists()) {
+            try {
+                FileUtils.writeByteArrayToFile(logo, AvatarHelper.create(sourcePath));
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private static void updateManifest(String s) throws Exception {
+        File manifest = new File(s);
+        String content = FileUtils.readFileToString(manifest, "UTF-8");
+        LOGGER.debug(content);
+        ContractManifest cm = JsonUtil.fromJson(content, ContractManifest.class);
+        String builderName = manifest.getParentFile().getParentFile().getName();
+        cm.sourcePath = builderName + "/" + manifest.getParentFile().getName();
+        LOGGER.info("DOI:"+cm.doi);
+        if (null == cm.doi || cm.doi.isEmpty()) {
+            cm.doi = "Contract_" + cm.sourcePath.hashCode();
+        }
+        cm.buildTime = System.currentTimeMillis();
+        if (builderName.length() > 100 && builderName.startsWith("04")) {
+            cm.builder = builderName;
+        } else {
+            cm.builder = "ContractEngine";
+        }
+        FileUtils.writeStringToFile(manifest, JsonUtil.toPrettyJson(cm), "UTF-8");
+    }
+
+    private static void walkDir(String preFix, File d, ZipOutputStream zout) {
+        try {
+            if (d.isDirectory()) {
+                for (File f : d.listFiles()) {
+                    walkDir(preFix, f, zout);
+                }
+            } else {
+                String entryName = d.getAbsolutePath().replace(preFix, "");
+                if (HardwareInfo.type == OSType.win) {
+                    entryName = entryName.replaceAll("\\\\", "/");
+                }
+                zout.putNextEntry(new ZipEntry(entryName));
+                FileInputStream fin = new FileInputStream(d);
+                byte[] buff = new byte[1024];
+                for (int l; (l = fin.read(buff)) > 0; ) {
+                    zout.write(buff, 0, l);
+                }
+                zout.closeEntry();
+                fin.close();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static boolean packFromManifest(ZipOutputStream zout, String manifestPath) {
+        boolean hasContent = false;
+        try {
+            // 解析manifest.json文件
+            LOGGER.debug("manifestPath = " + manifestPath);
+            File file = new File(manifestPath);
+            String content = FileUtils.readFileToString(file, "UTF-8");
+            LOGGER.debug(content);
+            ContractManifest cm = JsonUtil.fromJson(content, ContractManifest.class);
+            if (cm.getInsnLimit() != 0) {
+                LOGGER.debug(cm.insnLimit);
+            }
+            // System.out.println(cm.packages.get(1).getModules().get(0).getName());
+            // 调用接口获得PYPackage对象
+            if (cm.getPyDependences() != null)
+                for (PYPackage pyPkg : cm.getPyDependences()) {
+                    List<PYModule> list = new ArrayList<>();
+                    if (pyPkg.getModules() == null || pyPkg.getModules().isEmpty()) {
+                        pyPkg = PYEntry.instance.packageInfo(pyPkg.getName());
+                    } else {
+                        for (PYModule pyModule : pyPkg.getModules()) {
+                            PYModule info =
+                                    PYEntry.instance.moduleInfo(
+                                            pyPkg.getName() + "." + pyModule.getName());
+                            info.setName(pyModule.getName());
+                            LOGGER.debug(pyPkg.getName() + "." + pyModule.getName());
+                            list.add(info);
+                        }
+                    }
+                    if (!list.isEmpty()) {
+                        pyPkg.setModules(list);
+                    }
+                    // 调用GenP$M$C生成classfiles
+                    PYGenerator pmc = new PYGenerator();
+                    hasContent = true;
+                    pmc.genClassFiles(zout, pyPkg);
+                }
+            zout.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return hasContent;
+    }
+
+    public static <T> T getConfig(String input, String path, Class<T> clz) {
+        ZipFile zin = null;
+        try {
+            zin = new ZipFile(new File(input));
+            ZipEntry entry = zin.getEntry(path);
+            return JsonUtil.fromJson(new InputStreamReader(zin.getInputStream(entry)), clz);
+        } catch (Exception e) {
+            LOGGER.warn("read " + clz.getSimpleName() + " failed: " + e.getMessage());
+        } finally {
+            if (null != zin) {
+                try {
+                    zin.close();
+                } catch (Exception e) {
+                    LOGGER.error("closing zin failed: " + e.getMessage());
+                }
+            }
+        }
+        return null;
+    }
+
+    public static ContractManifest getMan2(String input, String path) {
+        ZipFile zin = null;
+        try {
+            zin = new ZipFile(new File(input));
+            ZipEntry entry = zin.getEntry(path);
+            return JsonUtil.fromJson(new InputStreamReader(zin.getInputStream(entry)), ContractManifest.class);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        } finally {
+            if (zin != null) {
+                try {
+                    zin.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+    }
+
+    public static ContractManifest getManifest(String input) {
+        try {
+            ZipInputStream zin = new ZipInputStream(new FileInputStream(input));
+            byte[] buff = new byte[1024 * 100];
+            InputStream manifestInput = null;
+            for (ZipEntry entry; (entry = zin.getNextEntry()) != null; ) {
+                if (entry.getName().endsWith("manifest.json")) {
+                    for (int k; (k = zin.read(buff)) > 0; ) {
+                        manifestInput = new ByteArrayInputStream(buff, 0, k);
+                    }
+                }
+                zin.closeEntry();
+            }
+            zin.close();
+            if (manifestInput != null) {
+                return JsonUtil.fromJson(
+                        new InputStreamReader(manifestInput), ContractManifest.class);
+            } else {
+                return null;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public static void unpack(String input, String dir) {
+        try {
+            unpackInternal(new FileInputStream(input), dir);
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static void unpack(byte[] input, String dir) {
+        unpackInternal(new ByteArrayInputStream(input), dir);
+    }
+
+    private static void unpackInternal(InputStream input, String dir) {
+        try {
+            ZipInputStream zin = new ZipInputStream(input);
+            byte[] buff = new byte[1024 * 100];
+            for (ZipEntry entry; (entry = zin.getNextEntry()) != null; ) {
+                File target = new File(dir, entry.getName());
+                File parent = target.getParentFile();
+                if (!parent.exists()) {
+                    LOGGER.trace("create directory " + parent.getAbsolutePath() + ": " + parent.mkdirs());
+                }
+                FileOutputStream fout = new FileOutputStream(target);
+                for (int k; (k = zin.read(buff)) > 0; ) {
+                    fout.write(buff, 0, k);
+                }
+                fout.close();
+                zin.closeEntry();
+            }
+            zin.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/src/main/entry/org/bdware/sc/bean/Contract.java b/src/main/entry/org/bdware/sc/bean/Contract.java
new file mode 100644
index 0000000..4849867
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/bean/Contract.java
@@ -0,0 +1,227 @@
+package org.bdware.sc.bean;
+
+import com.google.gson.JsonElement;
+import org.bdware.sc.node.YjsType;
+import org.bouncycastle.crypto.CryptoException;
+import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
+import org.bouncycastle.pqc.math.linearalgebra.ByteUtils;
+import org.zz.gmhelper.SM2Util;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.HashMap;
+
+public class Contract extends SM2Verifiable implements Serializable {
+    public String key;
+    public ContractStartInfo startInfo = new ContractStartInfo();
+    public int shadingId;
+    public String sourcePath; // 用作name
+    // 通过setMask实现
+    public HashMap<String, JsonElement> Mask = new HashMap<>();
+    ContractExecType type;
+    String script;
+    String owner;
+    String pubkey;
+    String doi;
+    String authInfoPersistDOI;
+    String nodeCenterRepoDOI;
+    boolean doipFlag;
+    int numOfCopies = 1;
+    boolean isDebug;
+    int consensusType;
+    int responseType;
+    int networkType;
+    long buildTime;
+    boolean isConfigUnit;
+    private String id;
+    private String hash;
+    private boolean stateful = true; // manifest可配置
+    private YjsType yjsType;
+
+    public int getShadingId() {
+        return this.shadingId;
+    }
+
+    public void setShadingId(int shadingId1) {
+        this.shadingId = shadingId1;
+    }
+
+    public boolean getConfigUnit() {
+        return isConfigUnit;
+    }
+
+    public void setConfigUnit(boolean unit) {
+        this.isConfigUnit = unit;
+    }
+
+    public String getID() {
+        return id;
+    }
+
+    public void setID(String id) {
+        this.id = id;
+    }
+
+    public String getDOI() {
+        return doi;
+    }
+
+    public void setDOI(String doi) {
+        this.doi = doi;
+    }
+
+    public String getAuthInfoPersistDOI() {
+        return authInfoPersistDOI;
+    }
+
+    public void setAuthInfoPersistDOI(String authInfoPersistDOI) {
+        this.authInfoPersistDOI = authInfoPersistDOI;
+    }
+
+    public String getNodeCenterRepoDOI() {
+        return nodeCenterRepoDOI;
+    }
+
+    public void setNodeCenterRepoDOI(String nodeCenterRepoDOI) {
+        this.nodeCenterRepoDOI = nodeCenterRepoDOI;
+    }
+
+    public boolean getDoipFlag() {
+        return doipFlag;
+    }
+
+    public void setDoipFlag(boolean doipFlag) {
+        this.doipFlag = doipFlag;
+    }
+
+    public ContractExecType getType() {
+        return type;
+    }
+
+    public void setType(ContractExecType t) {
+        type = t;
+    }
+
+    public InputStream getScript() {
+        return new ByteArrayInputStream(script.getBytes());
+    }
+
+    public void setScript(String str) {
+        script = str;
+    }
+
+    public String getScriptStr() {
+        return script;
+    }
+
+    public String getOwner() {
+        return this.owner;
+    }
+
+    public void setOwner(String owner) {
+        this.owner = owner;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String rsa) {
+        this.key = rsa;
+    }
+
+    public int getConsensusType() {
+        return this.consensusType;
+    }
+
+    public void setConsensusType(int i) {
+        this.consensusType = i;
+    }
+
+    public int getNetworkType() {
+        return this.networkType;
+    }
+
+    public void setNetworkType(int i) {
+        this.networkType = i;
+    }
+
+    public int getResponseType() {
+        return this.responseType;
+    }
+
+    public void setResponseType(int i) {
+        this.responseType = i;
+    }
+
+    @Override
+    public String getPublicKey() {
+        return pubkey;
+    }
+
+    @Override
+    public void setPublicKey(String pubkey) {
+        this.pubkey = pubkey;
+    }
+
+    @Override
+    public String getContentStr() {
+        return type + "|" + script + "|" + owner;
+    }
+
+    public String signResult(String result) {
+        ECPrivateKeyParameters priKey =
+                new ECPrivateKeyParameters(new BigInteger(key, 16), SM2Util.DOMAIN_PARAMS);
+        try {
+            return ByteUtils.toHexString(SM2Util.sign(priKey, result.getBytes()));
+        } catch (CryptoException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public boolean getStateful() {
+        return stateful;
+    }
+
+    public void setStateful(boolean b) {
+        stateful = b;
+    }
+
+    public int getNumOfCopies() {
+        return numOfCopies;
+    }
+
+    public void setNumOfCopies(int size) {
+        numOfCopies = size;
+    }
+
+    public boolean isDebug() {
+        return isDebug;
+    }
+
+    public void setDebug(boolean b) {
+        isDebug = b;
+    }
+
+    public YjsType getYjsType() {
+        return yjsType;
+    }
+
+    public void setYjsType(YjsType yjsType) {
+        this.yjsType = yjsType;
+    }
+
+    public void setMask(String FunctionName, JsonElement Mask) {
+        this.Mask.put(FunctionName, Mask);
+    }
+
+    public void setBuildTime(long buildTime) {
+        this.buildTime = buildTime;
+    }
+
+    public long getBuildTime() { return buildTime; }
+
+}
diff --git a/src/main/entry/org/bdware/sc/bean/ContractDesp.java b/src/main/entry/org/bdware/sc/bean/ContractDesp.java
new file mode 100644
index 0000000..cf6e228
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/bean/ContractDesp.java
@@ -0,0 +1,29 @@
+package org.bdware.sc.bean;
+
+import org.bdware.sc.event.REvent;
+import org.bdware.sc.node.AnnotationNode;
+import org.bdware.sc.node.YjsType;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class ContractDesp {
+    public String contractID;
+    public String contractName;
+    public Map<String, REvent.REventSemantics> events;
+    public List<FunctionDesp> exportedFunctions;
+    public ContractExecType type;
+    public YjsType yjsType;
+    public List<AnnotationNode> annotations;
+    public Set<String> dependentContracts;
+    private volatile boolean isMaster;
+
+    public synchronized boolean getIsMaster() {
+        return isMaster;
+    }
+
+    public synchronized void setIsMaster(boolean b) {
+        isMaster = b;
+    }
+}
\ No newline at end of file
diff --git a/src/main/entry/org/bdware/sc/bean/ContractExecType.java b/src/main/entry/org/bdware/sc/bean/ContractExecType.java
new file mode 100644
index 0000000..0411edb
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/bean/ContractExecType.java
@@ -0,0 +1,68 @@
+package org.bdware.sc.bean;
+
+import java.io.Serializable;
+
+public enum ContractExecType implements Serializable {
+    Sole, // 单点锚定合约
+    RequestOnce, // 多点不同步合约
+    ResponseOnce, // 多点不同步合约，超时的时候再请求一个, 直到获得一个response
+    RequestAllResponseFirst,
+    RequestAllResponseHalf,
+    RequestAllResponseAll,
+    Shading;//分片执行模式
+
+    public static boolean needSeq(ContractExecType ct) {
+        boolean res = true;
+        switch (ct) {
+            case Sole:
+            case RequestOnce:
+            case ResponseOnce:
+                res = false;
+                break;
+            case RequestAllResponseAll:
+            case RequestAllResponseFirst:
+            case RequestAllResponseHalf:
+            case Shading:
+            default:
+                break;
+        }
+        return res;
+    }
+
+    public static ContractExecType getContractTypeByInt(int i) {
+        switch (i) {
+            case 1:
+                return RequestOnce;
+            case 2:
+                return ResponseOnce;
+            case 3:
+                return RequestAllResponseFirst;
+            case 4:
+                return RequestAllResponseHalf;
+            case 5:
+                return RequestAllResponseAll;
+            case 6:
+                return Shading;
+            default:
+                return Sole;
+        }
+    }
+
+    public boolean needSeq() {
+        boolean res = true;
+        switch (this) {
+            case Sole:
+            case RequestOnce:
+            case ResponseOnce:
+                res = false;
+                break;
+            case RequestAllResponseAll:
+            case RequestAllResponseFirst:
+            case RequestAllResponseHalf:
+            case Shading:
+            default:
+                break;
+        }
+        return res;
+    }
+}
diff --git a/src/main/entry/org/bdware/sc/bean/ContractInstanceDO.java b/src/main/entry/org/bdware/sc/bean/ContractInstanceDO.java
new file mode 100644
index 0000000..e13c5bc
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/bean/ContractInstanceDO.java
@@ -0,0 +1,15 @@
+package org.bdware.sc.bean;
+
+import java.io.Serializable;
+
+public class ContractInstanceDO implements Serializable {
+    public String id;
+    public String publicKey;
+    public byte[] script;
+
+    public ContractInstanceDO(String id, String publicKey, byte[] script) {
+        this.id = id;
+        this.publicKey = publicKey;
+        this.script = script;
+    }
+}
diff --git a/src/main/entry/org/bdware/sc/bean/ContractRequest.java b/src/main/entry/org/bdware/sc/bean/ContractRequest.java
new file mode 100644
index 0000000..1877ea5
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/bean/ContractRequest.java
@@ -0,0 +1,163 @@
+package org.bdware.sc.bean;
+
+import java.io.*;
+
+public class ContractRequest extends SM2Verifiable
+        implements Serializable, Comparable<ContractRequest> {
+    private static final long serialVersionUID = 5516141428163407726L;
+    public long hasValue;
+    public long gasLimit;
+    public Boolean needSeq = false; // not requestAll do not need sequent
+    public int seq = 0; // only requestAll type contract need
+    public boolean withDynamicAnalysis = false;
+    public boolean withEvaluatesAnalysis = false;
+    public String fromContract;
+    String contractID;
+    String contractDOI;
+    // requester = reqPubKey
+    String requester;   
+    // DOI of requester
+    String requesterDOI;
+    // action = rsaPrivKeyEncoded(aesKey);
+    String action;
+    // arg = aesKeyEncoded({action,arg});
+    String arg;
+    String requestID;
+    boolean fromDebug = false;
+
+    public static ContractRequest parse(byte[] content) {
+        try {
+            ObjectInputStream input = new ObjectInputStream(new ByteArrayInputStream(content));
+            return (ContractRequest) input.readObject();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public String getContractID() {
+        return contractID;
+    }
+
+    public ContractRequest setContractID(String id) {
+        contractID = id;
+        return this;
+    }
+
+    public String getContractDOI() {
+        return contractDOI;
+    }
+
+    public void setContractDOI(String doi) {
+        contractDOI = doi;
+    }
+
+    public String getRequester() {
+        return requester;
+    }
+
+    public void setRequester(String requester) {
+        this.requester = requester;
+    }
+
+    public String getRequesterDOI() {
+        if (null == requesterDOI || requesterDOI.isEmpty()) {
+            return "empty";
+        }
+        return requesterDOI;
+    }
+
+    public void setRequesterDOI(String requesterDOI) {
+        this.requesterDOI = requesterDOI;
+    }
+
+    public String getArg() {
+        return arg;
+    }
+
+    public ContractRequest setArg(String arg) {
+        this.arg = arg;
+        return this;
+    }
+
+
+    public String getAction() {
+        return action;
+    }
+
+    public ContractRequest setAction(String action) {
+        this.action = action;
+        return this;
+    }
+
+    public long getValue() {
+        return hasValue;
+    }
+
+    public ContractRequest setValue(long hasValue) {
+        this.hasValue = hasValue;
+        return this;
+    }
+
+    public long getGasLimit() {
+        return gasLimit;
+    }
+
+    public void setGasLimit(long gasLimit) {
+        this.gasLimit = gasLimit;
+    }
+
+    public void setFromDebug(boolean fromDebug) {
+        this.fromDebug = fromDebug;
+    }
+
+    public boolean fromDebug() {
+        return fromDebug;
+    }
+
+    @Override
+    public String getPublicKey() {
+        return requester;
+    }
+
+    @Override
+    public void setPublicKey(String pubkey) {
+        setRequester(pubkey);
+    }
+
+    @Override
+    public String getContentStr() {
+        return String.format(
+                "%s|%s|%s%s|%s",
+                (contractDOI != null && contractDOI.length() > 0) ? contractDOI : contractID,
+                action,
+                arg,
+                gasLimit > 0 ? "|" + gasLimit : "",
+                requester);
+    }
+
+    public byte[] toByte() {
+        try {
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            ObjectOutputStream bo = new ObjectOutputStream(out);
+            bo.writeObject(this);
+            return out.toByteArray();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public String getRequestID() {
+        return requestID;
+    }
+
+    public void setRequestID(String str) {
+        this.requestID = str;
+    }
+
+    @Override
+    public int compareTo(ContractRequest cr) {
+        return Integer.compare(seq, cr.seq);
+    }
+}
diff --git a/src/main/entry/org/bdware/sc/bean/ContractStartInfo.java b/src/main/entry/org/bdware/sc/bean/ContractStartInfo.java
new file mode 100644
index 0000000..fa04f5d
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/bean/ContractStartInfo.java
@@ -0,0 +1,28 @@
+package org.bdware.sc.bean;
+
+import java.io.Serializable;
+
+public class ContractStartInfo implements Serializable {
+    public boolean isYPK = false;
+    public boolean isPrivate = false;
+    public String pubKeyPath;
+    public String ypkName;
+
+    public ContractStartInfo() {
+    }
+
+    public ContractStartInfo(boolean b1, boolean b2, String path, String name) {
+        isYPK = b1;
+        isPrivate = b2;
+        pubKeyPath = path;
+        ypkName = name;
+    }
+
+    public String toString() {
+        return String.format("isYPK=%s\n\tisPrivate=%s\n\tpubKeyPath=%s\n\typkName=%s (ContractStartInfo)",
+                isYPK,
+                isPrivate,
+                (pubKeyPath == null ? "null" : pubKeyPath),
+                (ypkName == null ? "null" : ypkName));
+    }
+}
diff --git a/src/main/entry/org/bdware/sc/bean/DefaultJoinRule.java b/src/main/entry/org/bdware/sc/bean/DefaultJoinRule.java
new file mode 100644
index 0000000..6361302
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/bean/DefaultJoinRule.java
@@ -0,0 +1,6 @@
+package org.bdware.sc.bean;
+
+public enum DefaultJoinRule {
+    add,//加法
+    multiply//乘法
+}
diff --git a/src/main/entry/org/bdware/sc/bean/DefaultRouteRule.java b/src/main/entry/org/bdware/sc/bean/DefaultRouteRule.java
new file mode 100644
index 0000000..1355e0d
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/bean/DefaultRouteRule.java
@@ -0,0 +1,7 @@
+package org.bdware.sc.bean;
+
+public enum DefaultRouteRule {
+    byRequester,
+    byArgHash,
+    byTarget;
+}
diff --git a/src/main/entry/org/bdware/sc/bean/FunctionDesp.java b/src/main/entry/org/bdware/sc/bean/FunctionDesp.java
new file mode 100644
index 0000000..4513cc9
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/bean/FunctionDesp.java
@@ -0,0 +1,22 @@
+package org.bdware.sc.bean;
+
+import org.bdware.sc.node.AnnotationNode;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class FunctionDesp implements Serializable {
+    public List<AnnotationNode> annotations;
+    public String functionName;
+    public RouteInfo routeInfo;
+
+    public FunctionDesp(String name, List<AnnotationNode> anno, RouteInfo routeInfo) {
+        functionName = name;
+        annotations = anno;
+        this.routeInfo = routeInfo;
+    }
+
+    public RouteInfo getRoute() {
+        return routeInfo;
+    }
+}
diff --git a/src/main/entry/org/bdware/sc/bean/IDSerializable.java b/src/main/entry/org/bdware/sc/bean/IDSerializable.java
new file mode 100644
index 0000000..6b73005
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/bean/IDSerializable.java
@@ -0,0 +1,7 @@
+package org.bdware.sc.bean;
+
+import java.io.Serializable;
+
+public interface IDSerializable extends Serializable {
+    String getID();
+}
diff --git a/src/main/entry/org/bdware/sc/bean/JoinInfo.java b/src/main/entry/org/bdware/sc/bean/JoinInfo.java
new file mode 100644
index 0000000..3b70b75
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/bean/JoinInfo.java
@@ -0,0 +1,28 @@
+package org.bdware.sc.bean;
+
+import org.bdware.sc.node.AnnotationNode;
+import org.bdware.sc.node.ContractNode;
+import org.bdware.sc.util.JsonUtil;
+
+import java.io.Serializable;
+
+public class JoinInfo implements Serializable {
+    public DefaultJoinRule joinRule;
+
+    public static JoinInfo create(AnnotationNode annotationNode, ContractNode contractNode) {
+        JoinInfo info = new JoinInfo();
+        info.joinRule = null;
+        if (annotationNode.getArgs().size() == 1) {
+            switch (annotationNode.getArgs().get(0)) {
+                case "add":
+                    info.joinRule = DefaultJoinRule.add;
+                    break;
+                case "multiply":
+                    info.joinRule = DefaultJoinRule.multiply;
+                    break;
+            }
+        }
+        System.out.println("[JoinInfo] annotationNode:" + JsonUtil.toJson(annotationNode));
+        return info;
+    }
+}
diff --git a/src/main/entry/org/bdware/sc/bean/OtherNCInfo.java b/src/main/entry/org/bdware/sc/bean/OtherNCInfo.java
new file mode 100644
index 0000000..857bdd6
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/bean/OtherNCInfo.java
@@ -0,0 +1,13 @@
+package org.bdware.sc.bean;
+
+public class OtherNCInfo {
+    public String contractID;
+    public String contractName;
+    public String master;
+
+    public OtherNCInfo(String id, String name, String m) {
+        contractID = id;
+        contractName = name;
+        master = m;
+    }
+}
diff --git a/src/main/entry/org/bdware/sc/bean/ProjectConfig.java b/src/main/entry/org/bdware/sc/bean/ProjectConfig.java
new file mode 100644
index 0000000..b768491
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/bean/ProjectConfig.java
@@ -0,0 +1,73 @@
+package org.bdware.sc.bean;
+
+import com.google.gson.JsonElement;
+import org.bdware.sc.node.MaskConfig;
+import org.bdware.sc.node.MockConfig;
+
+public class ProjectConfig implements IDSerializable {
+    String sourcePath;
+    MockConfig mockConfig;
+    MaskConfig maskConfig;
+    // Map<String,String> mockConfig;
+    // Map<String,JsonElement> maskConfig;
+    String dumpPeriod;
+
+    public ProjectConfig(String sourcePath) {
+        this.sourcePath = sourcePath;
+        mockConfig = null;
+        maskConfig = null;
+    }
+
+    @Override
+    public String getID() {
+        return sourcePath;
+    }
+
+    public void setMock(String operation, JsonElement mock) {
+        mockConfig.config.put(operation, mock);
+    }
+
+    public String getMock(String action) {
+        if (null != mockConfig &&
+                null != mockConfig.config &&
+                null != mockConfig.config.get(action)) {
+            return mockConfig.config.get(action).toString();
+        }
+        return null;
+    }
+
+    public MaskConfig getMaskConfig() {
+        return this.maskConfig;
+    }
+
+    public void setMaskConfig(MaskConfig mc) {
+        this.maskConfig = mc;
+    }
+
+    public MockConfig getMockConfig() {
+        return this.mockConfig;
+    }
+
+    public void setMockConfig(MockConfig mc) {
+        this.mockConfig = mc;
+    }
+
+    public JsonElement getMask(String action) {
+        if (null != maskConfig && null != maskConfig.config) {
+            return maskConfig.config.get(action);
+        }
+        return null;
+    }
+
+    public void setMask(String operation, JsonElement mask) {
+        maskConfig.config.put(operation, mask);
+    }
+
+    public String getDumpPeriod() {
+        return dumpPeriod;
+    }
+
+    public void setDumpPeriod(String dumpPeriod) {
+        this.dumpPeriod = dumpPeriod;
+    }
+}
diff --git a/src/main/entry/org/bdware/sc/bean/RouteInfo.java b/src/main/entry/org/bdware/sc/bean/RouteInfo.java
new file mode 100644
index 0000000..e004d7d
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/bean/RouteInfo.java
@@ -0,0 +1,22 @@
+package org.bdware.sc.bean;
+
+import org.bdware.sc.node.AnnotationNode;
+import org.bdware.sc.node.ContractNode;
+import org.bdware.sc.util.JsonUtil;
+
+import java.io.Serializable;
+
+public class RouteInfo implements Serializable {
+    public DefaultRouteRule useDefault;
+
+    public static RouteInfo create(AnnotationNode annotationNode, ContractNode contractNode) {
+        RouteInfo info = new RouteInfo();
+        info.useDefault = null;
+        if (annotationNode.getArgs().size() == 1) {
+            String str = annotationNode.getArgs().get(0);
+            info = JsonUtil.fromJson(str, RouteInfo.class);
+        }
+        System.out.println("[RouteInfo] annotationNode:" + JsonUtil.toJson(annotationNode));
+        return info;
+    }
+}
diff --git a/src/main/entry/org/bdware/sc/bean/SM2Verifiable.java b/src/main/entry/org/bdware/sc/bean/SM2Verifiable.java
new file mode 100644
index 0000000..fe317a8
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/bean/SM2Verifiable.java
@@ -0,0 +1,62 @@
+package org.bdware.sc.bean;
+
+import org.bouncycastle.crypto.params.ECPublicKeyParameters;
+import org.bouncycastle.math.ec.ECPoint;
+import org.bouncycastle.pqc.math.linearalgebra.ByteUtils;
+import org.zz.gmhelper.BCECUtil;
+import org.zz.gmhelper.SM2KeyPair;
+import org.zz.gmhelper.SM2Util;
+
+import java.math.BigInteger;
+
+public abstract class SM2Verifiable {
+    // signature is der encoded
+    public String signature;
+
+    public abstract String getPublicKey();
+
+    public abstract void setPublicKey(String pubkey);
+
+    public abstract String getContentStr();
+
+    public void doSignature(String privateKey) {
+        BigInteger pKey = new BigInteger(privateKey, 16);
+        ECPoint p = SM2Util.G_POINT.multiply(pKey).normalize();
+        doSignature(new SM2KeyPair(new ECPublicKeyParameters(p, SM2Util.DOMAIN_PARAMS), pKey));
+    }
+
+    public void doSignature(SM2KeyPair pair) {
+        try {
+            setPublicKey(pair.getPublicKeyStr());
+
+            signature =
+                    ByteUtils.toHexString(
+                            SM2Util.sign(
+                                    pair.getPrivateKeyParameter(), getContentStr().getBytes()));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public boolean verifySignature() {
+        try {
+            String verifiedStr = getContentStr();
+            ECPublicKeyParameters pubKey =
+                    BCECUtil.createECPublicKeyFromStrParameters(
+                            getPublicKey(), SM2Util.CURVE, SM2Util.DOMAIN_PARAMS);
+            return SM2Util.verify(
+                    pubKey, verifiedStr.getBytes(), ByteUtils.fromHexString(signature));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    public String getSignature() {
+        return signature;
+    }
+
+    public void setSignature(String signature) {
+        this.signature = signature;
+    }
+}
diff --git a/src/main/entry/org/bdware/sc/db/CMTables.java b/src/main/entry/org/bdware/sc/db/CMTables.java
new file mode 100644
index 0000000..dfc67fd
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/db/CMTables.java
@@ -0,0 +1,22 @@
+package org.bdware.sc.db;
+
+public enum CMTables {
+    LocalNodeLogDB,
+    LocalContractLogDB,
+    NodeRole,
+    LockedUser,
+    NodeTime,
+    ApplyRole,
+    ApplyTime,
+    ConfigDB,
+    ContractInfo,
+    EventRegistry,
+    LastExeSeq,
+    UnitContracts,
+    CheckPointLastHash,
+    ProjectConfig;
+
+    public String toString() {
+        return "CM_" + super.name();
+    }
+}
\ No newline at end of file
diff --git a/src/main/entry/org/bdware/sc/db/FIFOCache.java b/src/main/entry/org/bdware/sc/db/FIFOCache.java
new file mode 100644
index 0000000..2da9dc5
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/db/FIFOCache.java
@@ -0,0 +1,45 @@
+package org.bdware.sc.db;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+
+
+public class FIFOCache<T, V> {
+    Map<T, LinkedList<V>> cache;
+    int limit;
+
+    public FIFOCache(int limit) {
+        cache = new HashMap<>();
+        this.limit = limit;
+    }
+
+    public void add(T key, V val) {
+        LinkedList<V> list = null;
+        if (cache.containsKey(key)) {
+            list = cache.get(key);
+        } else {
+            list = new LinkedList<>();
+            cache.put(key, list);
+        }
+        list.addFirst(val);
+        if (list.size() > limit) {
+            list.removeLast();
+        }
+    }
+
+    public LinkedList<V> getValues(T key) {
+        return cache.get(key);
+    }
+
+    public Map<T, LinkedList<V>> getCache() {
+        return cache;
+    }
+
+    public void remove(T key){
+        cache.remove(key);
+    }
+    public void clear(){
+        cache.clear();
+    }
+}
\ No newline at end of file
diff --git a/src/main/entry/org/bdware/sc/db/KeyValueDBUtil.java b/src/main/entry/org/bdware/sc/db/KeyValueDBUtil.java
new file mode 100644
index 0000000..e613475
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/db/KeyValueDBUtil.java
@@ -0,0 +1,122 @@
+package org.bdware.sc.db;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.bdware.sc.Jedion;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class KeyValueDBUtil {
+    private static final Logger LOGGER = LogManager.getLogger(KeyValueDBUtil.class);
+    public static KeyValueDBUtil instance;
+    private final Map<String, Jedion> dbLink;
+    public String dbPath;
+
+    private KeyValueDBUtil(String path) {
+        dbLink = new HashMap<>();
+        dbPath = path;
+    }
+
+    public static void setupNC() {
+        if (null == instance) {
+            instance = new KeyValueDBUtil("./NodeCenterDB");
+            LOGGER.info("init nc Jedion in ./NodeCenterDB");
+        }
+    }
+
+    public static void setupCM() {
+        if (null == instance) {
+            instance = new KeyValueDBUtil("./ContractManagerDB");
+            LOGGER.info("init cm Jedion in ./ContractManagerDB");
+        }
+    }
+
+    private static void deleteJelck(File file) {
+        if (file.exists()) {
+            LOGGER.trace("delete file" + file.getAbsolutePath() + ": " + file.delete());
+        }
+    }
+
+    private Jedion getDB(String dbName) {
+        if (!dbLink.containsKey(dbName)) {
+            setupDB(dbName);
+        }
+        return dbLink.get(dbName);
+    }
+
+    public boolean containsKey(String dbName, String key) {
+        String res = getValue(dbName, key);
+        return res != null && !res.isEmpty();
+    }
+
+    public List<String> getKeys(String dbName) {
+        Jedion db = getDB(dbName);
+        return db.getEveryItem();
+    }
+
+    public List<Jedion.KV> getKeyValues(String dbName) {
+        Jedion db = getDB(dbName);
+        return db.getEveryKeyValue();
+    }
+
+    public String getValue(String dbName, String key) {
+        try {
+            Jedion db = getDB(dbName);
+            return db.readFromDatabase(key);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    public void setValue(String dbName, String key, String value) {
+        try {
+            Jedion db = getDB(dbName);
+            db.writeToDatabase(key, value, true);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void delete(String dbName, String key) {
+        try {
+            Jedion db = getDB(dbName);
+            db.deleteFromDatabase(key);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void setupDB(String dbName) {
+        Jedion db = new Jedion(dbName);
+        File file = new File(dbPath + "/" + dbName);
+        deleteJelck(new File(file, "je.lck"));
+        if (!file.exists()) {
+            LOGGER.trace("create directory " + file.getAbsolutePath() + ": " + file.mkdirs());
+        }
+        db.configEnvironment(file);
+        db.createDatabase();
+        dbLink.put(dbName, db);
+    }
+
+    public long getCount(String dbName) {
+        try {
+            Jedion db = getDB(dbName);
+            return db.getCount();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return 0L;
+    }
+
+    public void visitDB(String dbName, Jedion.JedionVisitor visitor) {
+        try {
+            Jedion db = getDB(dbName);
+            db.visitAllItem(visitor);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/src/main/entry/org/bdware/sc/db/KeyValueRocksDBUtil.java b/src/main/entry/org/bdware/sc/db/KeyValueRocksDBUtil.java
new file mode 100644
index 0000000..271406a
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/db/KeyValueRocksDBUtil.java
@@ -0,0 +1,146 @@
+package org.bdware.sc.db;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.bdware.sc.Jedion;
+import org.rocksdb.Options;
+import org.rocksdb.RocksDB;
+import org.rocksdb.RocksDBException;
+import org.rocksdb.RocksIterator;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class KeyValueRocksDBUtil {
+    private static final Logger LOGGER = LogManager.getLogger(KeyValueRocksDBUtil.class);
+    public static KeyValueRocksDBUtil instance = null;
+    private final Map<String, RocksDB> dbLink;
+    public String dbPath;
+
+    private KeyValueRocksDBUtil(String path) {
+        dbLink = new ConcurrentHashMap<>();
+        dbPath = path;
+    }
+
+    public static void setupNC() {
+        if (null == instance) {
+            instance = new KeyValueRocksDBUtil("./NodeCenterDB");
+            LOGGER.info("init nc Rocksdb in ./NodeCenterDB");
+        }
+    }
+
+    public static void setupCM() {
+        if (null == instance) {
+            instance = new KeyValueRocksDBUtil("./ContractManagerDB");
+            LOGGER.info("init cm Rocksdb in ./ContractManagerDB");
+        }
+    }
+
+    private synchronized RocksDB getDB(String dbName) {
+        if (!dbLink.containsKey(dbName)) {
+            setupDB(dbName);
+        }
+        return dbLink.get(dbName);
+    }
+
+    public boolean containsKey(String dbName, String key) {
+        String res = getValue(dbName, key);
+        return res != null && !res.isEmpty();
+    }
+
+    public List<String> getKeys(String dbName) {
+        List<String> ret = new ArrayList<>();
+        visitDB(
+                dbName,
+                new Jedion.JedionVisitor() {
+                    @Override
+                    public void visit(String key, String value) {
+                        ret.add(key);
+                    }
+                });
+        return ret;
+    }
+
+    public List<Jedion.KV> getKeyValues(String dbName) {
+        List<Jedion.KV> ret = new ArrayList<>();
+        visitDB(
+                dbName,
+                new Jedion.JedionVisitor() {
+                    @Override
+                    public void visit(String key, String value) {
+                        Jedion.KV kv = new Jedion.KV();
+                        kv.key = key;
+                        kv.value = value;
+                        ret.add(kv);
+                    }
+                });
+        return ret;
+    }
+
+    public void visitDB(String dbName, Jedion.JedionVisitor visitor) {
+        RocksDB db = getDB(dbName);
+        RocksIterator iter = db.newIterator();
+        iter.seekToFirst();
+        for (; iter.isValid(); iter.next()) {
+            visitor.visit(new String(iter.key()), new String(iter.value()));
+        }
+    }
+
+    public String getValue(String dbName, String key) {
+        try {
+            RocksDB db = getDB(dbName);
+            return new String(db.get(key.getBytes()));
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    public void setValue(String dbName, String key, String value) {
+        try {
+            RocksDB db = getDB(dbName);
+            db.put(key.getBytes(), value.getBytes());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void delete(String dbName, String key) {
+        try {
+            RocksDB db = getDB(dbName);
+            db.delete(key.getBytes());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void setupDB(String dbName) {
+        File file = new File(dbPath + "/" + dbName);
+        Options options = new Options();
+        options.setCreateIfMissing(true);
+        File lockFile = new File(file, "LOCK");
+        RocksDB db = null;
+        LOGGER.trace("delete file" + lockFile.getAbsolutePath() + ": " + lockFile.delete());
+        try {
+            if (!file.exists()) {
+                LOGGER.trace("create directory " + file.getAbsolutePath() + ": " + file.mkdirs());
+            }
+            // logger.info("OpenDB:" + file.getAbsolutePath());
+            db = RocksDB.open(options, file.getAbsolutePath());
+        } catch (RocksDBException e) {
+            e.printStackTrace();
+        }
+        dbLink.put(dbName, db);
+    }
+
+    public long getCount(String dbName) {
+        try {
+            return getKeys(dbName).size();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return 0L;
+    }
+}
diff --git a/src/main/entry/org/bdware/sc/db/MultiIndexTimeDBUtil.java b/src/main/entry/org/bdware/sc/db/MultiIndexTimeDBUtil.java
new file mode 100644
index 0000000..5518b8f
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/db/MultiIndexTimeDBUtil.java
@@ -0,0 +1,245 @@
+package org.bdware.sc.db;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.gson.reflect.TypeToken;
+import com.sleepycat.je.DatabaseException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.bdware.sc.Jedion;
+import org.bdware.sc.index.TimeSerialIndex;
+import org.bdware.sc.util.JsonUtil;
+
+import java.io.File;
+import java.util.*;
+
+public class MultiIndexTimeDBUtil implements MultiIndexTimeDBUtilIntf {
+    private static final Logger LOGGER = LogManager.getLogger(MultiIndexTimeDBUtil.class);
+    private final Map<String, TimeSerialIndex> secondaryIndex;
+    public String dbPath;
+    public String tableName;
+    Random random = new Random();
+    private Jedion db;
+    private TimeSerialIndex primaryIndex;
+
+    public MultiIndexTimeDBUtil(String path, String tableName) {
+        secondaryIndex = new HashMap<>();
+        dbPath = path;
+        this.tableName = tableName;
+        setupDB();
+    }
+
+    private static void deleteJelck(File file) {
+        if (file.exists()) {
+            LOGGER.trace("delete file" + file.getAbsolutePath() + ": " + file.delete());
+        }
+    }
+
+    private void setupDB() {
+        db = new Jedion(tableName);
+        File file = new File(dbPath + "/" + tableName);
+        File timeIndex = new File(dbPath + "/" + tableName + "/DB.primary.timeindex");
+        deleteJelck(new File(file, "je.lck"));
+        if (!file.exists()) {
+            LOGGER.trace("create directory " + file.getAbsolutePath() + ": " + file.mkdirs());
+        }
+        db.configEnvironment(file);
+        db.createDatabase();
+
+        primaryIndex = new TimeSerialIndex(timeIndex.getAbsolutePath());
+    }
+
+    public synchronized void put(String label, String val) {
+        TimeSerialIndex index = getIndex(label);
+        long key = random.nextLong();
+        index.index(key);
+        if (index != primaryIndex) {
+            primaryIndex.index(key);
+        }
+        db.writeToDatabase(String.valueOf(key), val, true);
+    }
+
+    public synchronized long queryOffset(String label, long begin) {
+        TimeSerialIndex index = getIndex(label);
+        return index.findNearest(begin);
+    }
+
+    public synchronized List<String> queryByDateAsString(String label, long begin, long end) {
+        List<String> ret = new ArrayList<>();
+        TimeSerialIndex index = getIndex(label);
+        long offset = index.findNearest(begin);
+        long size = index.findNearest(end);
+        int len = (int) (size - offset + 1);
+        List<Long> data = index.request(offset, len);
+        for (Long l : data) {
+            try {
+                String t = db.readFromDatabase(l.toString());
+                if (!t.isEmpty()) {
+                    ret.add(t);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return ret;
+    }
+
+    public synchronized List<JsonObject> queryByDateAsJson(String label, long begin, long end) {
+        List<JsonObject> ret = new ArrayList<>();
+        TimeSerialIndex index = getIndex(label);
+        long offset = index.findNearest(begin);
+        long size = index.findNearest(end);
+        int len = (int) (size - offset + 1);
+        List<Long> data = index.request(offset, len);
+        for (Long l : data) {
+            String t = null;
+            try {
+                t = db.readFromDatabase(l.toString());
+                if (t != null && !t.isEmpty()) {
+                    JsonObject jo = JsonUtil.parseString(t);
+                    jo.addProperty("key", l.toString());
+                    ret.add(jo);
+                }
+            } catch (Exception e) {
+                LOGGER.error("parse db json error:" + t);
+            }
+        }
+        return ret;
+    }
+
+    public long size() {
+        return primaryIndex.size();
+    }
+
+    public long size(String label) {
+        try {
+            TimeSerialIndex index = getIndex(label);
+            if (index != null) return index.size();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return 0L;
+    }
+
+    public List<JsonObject> queryByOffset(String label, long offset, int count) {
+        List<JsonObject> ret = new ArrayList<>();
+        TimeSerialIndex index = getIndex(label);
+        List<Long> data = index.request(offset, count);
+        for (Long l : data) {
+            try {
+                String t = db.readFromDatabase(l.toString());
+                JsonObject jo;
+                if (t != null && !t.isEmpty()) {
+                    jo = JsonUtil.parseString(t);
+                } else {
+                    jo = new JsonObject();
+                }
+                jo.addProperty("key", l.toString());
+                ret.add(jo);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return ret;
+    }
+
+    public String get(String key) {
+        try {
+            return db.readFromDatabase(key);
+        } catch (DatabaseException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private TimeSerialIndex getIndex(String label) {
+        if (null == label) {
+            return primaryIndex;
+        }
+        if (secondaryIndex.containsKey(label)) {
+            return secondaryIndex.get(label);
+        } else {
+            TimeSerialIndex index =
+                    new TimeSerialIndex(dbPath + "/" + tableName + "/" + label + ".timeindex");
+            secondaryIndex.putIfAbsent(label, index);
+            return index;
+        }
+    }
+
+    // TODO remove this method, using index by type instead
+    public Map<String, Integer> querySort(String label, long date) {
+        List<String> ret = new ArrayList<>();
+        Map<String, Integer> map = new HashMap<>();
+        Map<String, String> data2;
+        TimeSerialIndex index = getIndex(label);
+        long offset = index.findNearest(date);
+        int len = (int) (index.size() - offset);
+        List<Long> data = index.request(offset, len);
+        String action;
+        for (Long l : data) {
+            String t = null;
+            try {
+                t = db.readFromDatabase(l.toString());
+                data2 = JsonUtil.fromJson(t, new TypeToken<Map<String, String>>() {
+                }.getType());
+                if (null != data2) {
+                    action = data2.get("action");
+                    if (map.containsKey(action)) {
+                        int count = map.get(action) + 1;
+                        map.put(action, count);
+                    } else {
+                        map.put(action, 1);
+                    }
+                }
+            } catch (Exception e) {
+                LOGGER.error("parse db json error:" + t);
+            }
+        }
+        return map;
+    }
+
+    public JsonArray countInInterval(String label, long start, long interval, long end) {
+        TimeSerialIndex index = getIndex(label);
+        long offset = index.findNearest(start);
+        JsonArray array = new JsonArray();
+        do {
+            start += interval;
+            long offset2 = index.findNearest(start);
+            array.add(offset2 - offset);
+            offset = offset2;
+        } while (start < end);
+        return array;
+    }
+
+    // TODO
+    public void rebuildIndex(String labelField) {
+        try {
+            List<Jedion.KV> dataKVs = db.getEveryKeyValue();
+            Map<Long, Jedion.KV> memoryIndex = new HashMap<>();
+            List<Long> times = new ArrayList<>();
+            for (Jedion.KV dataKV : dataKVs) {
+                JsonObject jo = JsonUtil.fromJson(dataKV.value, JsonObject.class);
+                Long time = jo.get("date").getAsLong();
+                if (time < 0) continue;
+                times.add(time);
+                memoryIndex.put(time, dataKV);
+            }
+            times.sort(Long::compareTo);
+            for (Long time : times) {
+                Jedion.KV dataKV = memoryIndex.get(time);
+                JsonObject jo = JsonUtil.fromJson(dataKV.value, JsonObject.class);
+                TimeSerialIndex tsi = getIndex(jo.get(labelField).getAsString());
+                tsi.manullyIndex(time, Long.parseLong(dataKV.key));
+                primaryIndex.manullyIndex(time, Long.parseLong(dataKV.key));
+            }
+            // System.out.println("leak size = " + (dataKVs.size() - memoryIndex.size()));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        // 每一条data都是json串
+        // 转为JsonObject_obj后，获取obj.date，obj.labelField, key，
+        // 按date排序后，
+        // 把每个TimeIndex都primaryIndex.manuellyIndex(obj.data,key);
+        // manuellyIndex可参考LenVarTimeIndex写法
+    }
+}
diff --git a/src/main/entry/org/bdware/sc/db/MultiIndexTimeDBUtilIntf.java b/src/main/entry/org/bdware/sc/db/MultiIndexTimeDBUtilIntf.java
new file mode 100644
index 0000000..73766e2
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/db/MultiIndexTimeDBUtilIntf.java
@@ -0,0 +1,16 @@
+package org.bdware.sc.db;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+
+import java.util.List;
+
+public interface MultiIndexTimeDBUtilIntf {
+    List<JsonObject> queryByDateAsJson(String label, long date, long end);
+
+    long size(String label);
+
+    List<JsonObject> queryByOffset(String label, long offset, int count);
+
+    JsonArray countInInterval(String str, long startTime, long interval, long endTime);
+}
diff --git a/src/main/entry/org/bdware/sc/db/MultiIndexTimeRocksDBUtil.java b/src/main/entry/org/bdware/sc/db/MultiIndexTimeRocksDBUtil.java
new file mode 100644
index 0000000..52f618f
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/db/MultiIndexTimeRocksDBUtil.java
@@ -0,0 +1,287 @@
+package org.bdware.sc.db;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.gson.reflect.TypeToken;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.bdware.sc.index.TimeSerialIndex;
+import org.bdware.sc.util.JsonUtil;
+import org.rocksdb.Options;
+import org.rocksdb.RocksDB;
+import org.rocksdb.RocksDBException;
+import org.rocksdb.RocksIterator;
+
+import java.io.File;
+import java.util.*;
+
+public class MultiIndexTimeRocksDBUtil implements MultiIndexTimeDBUtilIntf {
+    private static final Logger LOGGER = LogManager.getLogger(MultiIndexTimeRocksDBUtil.class);
+    private final Map<String, TimeSerialIndex> secondaryIndex;
+    public String dbPath;
+    public String tableName;
+    Random random = new Random();
+    private RocksDB db;
+    private TimeSerialIndex primaryIndex;
+
+    public MultiIndexTimeRocksDBUtil(String path, String tableName) {
+        secondaryIndex = new HashMap<>();
+        dbPath = path;
+        this.tableName = tableName;
+        setupDB();
+    }
+
+    private static void deleteJelck(File file) {
+        if (file.exists()) {
+            LOGGER.trace("delete file" + file.getAbsolutePath() + ": " + file.delete());
+        }
+    }
+
+    private void setupDB() {
+        File file = new File(dbPath + "/" + tableName);
+        Options options = new Options();
+        options.setCreateIfMissing(true);
+        File lockFile = new File(file, "LOCK");
+        File timeIndex = new File(dbPath + "/" + tableName + "/DB.primary.timeindex");
+        LOGGER.trace("create directory " + file.getAbsolutePath() + ": " + file.mkdirs());
+        LOGGER.trace("delete file" + lockFile.getAbsolutePath() + ": " + lockFile.delete());
+        try {
+            LOGGER.debug("OpenDB:" + file.getAbsolutePath());
+            db = RocksDB.open(options, file.getAbsolutePath());
+        } catch (RocksDBException e) {
+            e.printStackTrace();
+        }
+
+        primaryIndex = new TimeSerialIndex(timeIndex.getAbsolutePath());
+    }
+
+    public synchronized void put(String label, String val) {
+        try {
+            TimeSerialIndex index = getIndex(label);
+            long key = random.nextLong();
+            index.index(key);
+            if (index != primaryIndex) primaryIndex.index(key);
+
+            db.put(longToByte(key), val.getBytes());
+        } catch (RocksDBException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private long byteToLong(byte[] bytes) {
+        long ret = 0;
+        for (byte aByte : bytes) {
+            ret <<= 8;
+            ret |= aByte;
+        }
+        return ret;
+    }
+
+    private byte[] longToByte(long l) {
+        byte[] ret = new byte[8];
+        for (int i = 56; i >= 0; i -= 8) {
+            byte val = (byte) (l & 0xff);
+            ret[i / 8] = val;
+            l >>= 8;
+        }
+        return ret;
+    }
+
+    public synchronized long queryOffset(String label, long begin) {
+        TimeSerialIndex index = getIndex(label);
+        return index.findNearest(begin);
+    }
+
+    public synchronized List<String> queryByDateAsString(String label, long begin, long end) {
+        List<String> ret = new ArrayList<>();
+        TimeSerialIndex index = getIndex(label);
+        long offset = index.findNearest(begin);
+        long size = index.findNearest(end);
+        int len = (int) (size - offset + 1);
+        List<Long> data = index.request(offset, len);
+        for (Long l : data) {
+            try {
+                String t = new String(db.get(longToByte(l)));
+                if (!t.isEmpty()) {
+                    ret.add(t);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return ret;
+    }
+
+    public synchronized List<JsonObject> queryByDateAsJson(String label, long begin, long end) {
+        List<JsonObject> ret = new ArrayList<>();
+        TimeSerialIndex index = getIndex(label);
+        long offset = index.findNearest(begin);
+        long size = index.findNearest(end);
+        int len = (int) (size - offset + 1);
+        List<Long> data = index.request(offset, len);
+        for (Long l : data) {
+            String t = null;
+            try {
+                t = new String(db.get(longToByte(l)));
+                if (!t.isEmpty()) {
+                    JsonObject jo = JsonUtil.parseString(t);
+                    jo.addProperty("key", l.toString());
+                    ret.add(jo);
+                }
+            } catch (Exception e) {
+                LOGGER.error("parse db json error:" + t);
+            }
+        }
+        return ret;
+    }
+
+    public long size() {
+        return primaryIndex.size();
+    }
+
+    public long size(String label) {
+        try {
+            TimeSerialIndex index = getIndex(label);
+            if (index != null) return index.size();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return 0L;
+    }
+
+    public List<JsonObject> queryByOffset(String label, long offset, int count) {
+        List<JsonObject> ret = new ArrayList<>();
+        TimeSerialIndex index = getIndex(label);
+        List<Long> data = index.request(offset, count);
+        for (Long l : data) {
+            try {
+                String t = new String(db.get(longToByte(l)));
+                JsonObject jo;
+                if (!t.isEmpty()) {
+                    jo = JsonUtil.parseString(t);
+                } else {
+                    jo = new JsonObject();
+                }
+                jo.addProperty("key", l.toString());
+                ret.add(jo);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return ret;
+    }
+
+    public String get(String key) {
+        try {
+            return new String(db.get(longToByte(Long.parseLong(key))));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private TimeSerialIndex getIndex(String label) {
+        if (null == label) {
+            return primaryIndex;
+        }
+        if (secondaryIndex.containsKey(label)) {
+            return secondaryIndex.get(label);
+        } else {
+            TimeSerialIndex index =
+                    new TimeSerialIndex(dbPath + "/" + tableName + "/" + label + ".timeindex");
+            secondaryIndex.putIfAbsent(label, index);
+            return index;
+        }
+    }
+
+    // TODO remove this method, using index by type instead
+    public Map<String, Integer> querySort(String label, long date) {
+        List<String> ret = new ArrayList<>();
+        Map<String, Integer> map = new HashMap<>();
+        Map<String, String> data2;
+        TimeSerialIndex index = getIndex(label);
+        long offset = index.findNearest(date);
+        int len = (int) (index.size() - offset);
+        List<Long> data = index.request(offset, len);
+        String action;
+        for (Long l : data) {
+            String t = null;
+            try {
+                t = new String(db.get(longToByte(l)));
+                data2 = JsonUtil.fromJson(t, new TypeToken<Map<String, String>>() {
+                }.getType());
+                if (null != data2) {
+                    action = data2.get("action");
+                    if (map.containsKey(action)) {
+                        int count = map.get(action) + 1;
+                        map.put(action, count);
+                    } else {
+                        map.put(action, 1);
+                    }
+                }
+            } catch (Exception e) {
+                LOGGER.error("parse db json error:" + t);
+            }
+        }
+        return map;
+    }
+
+    public JsonArray countInInterval(String label, long start, long interval, long end) {
+        TimeSerialIndex index = getIndex(label);
+        long offset = index.findNearest(start);
+        JsonArray array = new JsonArray();
+        do {
+            start += interval;
+            long offset2 = index.findNearest(start);
+            array.add(offset2 - offset);
+            offset = offset2;
+        } while (start < end);
+        return array;
+    }
+
+    public void rebuildIndex(String labelField) {
+        try {
+            List<Long> times = new ArrayList<>();
+            Map<Long, BytesPair> memoryIndex = new HashMap<>();
+            RocksIterator iter = db.newIterator();
+            iter.seekToFirst();
+            for (; iter.isValid(); iter.next()) {
+                JsonObject jo = JsonUtil.parseString(new String(iter.value()));
+                Long time = jo.get("date").getAsLong();
+                if (time < 0) {
+                    continue;
+                }
+                times.add(time);
+                memoryIndex.put(time, new BytesPair(iter.key(), iter.value()));
+            }
+
+            times.sort(Long::compareTo);
+            for (Long time : times) {
+                BytesPair dataKV = memoryIndex.get(time);
+                JsonObject jo = JsonUtil.fromJson(new String(dataKV.value), JsonObject.class);
+                TimeSerialIndex tsi = getIndex(jo.get(labelField).getAsString());
+                long key = byteToLong(dataKV.key);
+                tsi.manullyIndex(time, key);
+                primaryIndex.manullyIndex(time, key);
+            }
+            // System.out.println("leak size = " + (dataKVs.size() - memoryIndex.size()));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        // 每一条data都是json串
+        // 转为JsonObject_obj后，获取obj.date，obj.labelField, key，
+        // 按date排序后，
+        // 把每个TimeIndex都primaryIndex.manuellyIndex(obj.data,key);
+        // manuellyIndex可参考LenVarTimeIndex写法
+    }
+
+    // TODO
+    static class BytesPair {
+        byte[] key, value;
+
+        BytesPair(byte[] k, byte[] v) {
+            key = k;
+            value = v;
+        }
+    }
+}
diff --git a/src/main/entry/org/bdware/sc/db/SqliteDBUtil.java b/src/main/entry/org/bdware/sc/db/SqliteDBUtil.java
new file mode 100644
index 0000000..d471682
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/db/SqliteDBUtil.java
@@ -0,0 +1,64 @@
+package org.bdware.sc.db;
+
+import org.bdware.sc.commParser.BlockBody;
+import org.bdware.sc.util.HashUtil;
+
+import java.io.File;
+import java.sql.*;
+
+public class SqliteDBUtil {
+    private Connection conn;
+
+    public static SqliteDBUtil connect(String url) {
+        try {
+            String name = "org.sqlite.JDBC";
+            SqliteDBUtil util = new SqliteDBUtil();
+            String path = "jdbc:sqlite:";
+            File file = new File(url);
+            path = path + file.getAbsolutePath();
+            System.out.println("[SqliteDBUtil] connect:" + path);
+            Class.forName(name);
+            util.conn = DriverManager.getConnection(path);
+            return util;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public BlockBody getBlockBody(String headerHash, String bodyHash) {
+        try {
+            Statement stmt = conn.createStatement();
+            // ResultSet result = stmt.executeQuery("select * from BlockHeader where hash =
+            // " + headerHash);
+            String sql = "select * from BlockBody where ID = ?";
+            PreparedStatement pre = conn.prepareStatement(sql);
+            pre.setBytes(1, HashUtil.str16ToBytes(bodyHash));
+            ResultSet result = pre.executeQuery();
+            // Assert we get only one!!!!
+            result.next();
+            System.out.println(result.getBytes("ID"));
+            return BlockBody.fromBytes(result.getBytes("Data"));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public byte[] selectAll() {
+        try {
+            Statement stmt = conn.createStatement();
+            // ResultSet result = stmt.executeQuery("select * from BlockHeader where hash =
+            // " + headerHash);
+            String sql = "select * from BlockBody limit 0,1";
+            PreparedStatement pre = conn.prepareStatement(sql);
+            ResultSet result = pre.executeQuery();
+            // Assert we get only one!!!!
+            result.next();
+            return result.getBytes(1);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+}
diff --git a/src/main/entry/org/bdware/sc/db/StatusRecorder.java b/src/main/entry/org/bdware/sc/db/StatusRecorder.java
new file mode 100644
index 0000000..b969c4a
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/db/StatusRecorder.java
@@ -0,0 +1,112 @@
+package org.bdware.sc.db;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.bdware.sc.bean.IDSerializable;
+import org.bdware.sc.index.TimeSerialIndex;
+import org.bdware.sc.util.JsonUtil;
+import org.rocksdb.Options;
+import org.rocksdb.RocksDB;
+import org.rocksdb.RocksDBException;
+import org.rocksdb.RocksIterator;
+
+import java.io.*;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+public abstract class StatusRecorder<T extends IDSerializable> {
+    private static final Logger LOGGER = LogManager.getLogger(StatusRecorder.class);
+    private final Map<String, T> status;
+    TimeSerialIndex versionIndex;
+    RocksDB db;
+    String preFix;
+
+    public StatusRecorder(String dirPath, String dbName, String preFix) {
+        this.preFix = preFix;
+        status = new ConcurrentHashMap<>();
+        versionIndex = new TimeSerialIndex(dirPath + "/" + dbName + ".timeindex");
+        db = setUpDB(new File(dirPath, dbName).getAbsolutePath());
+        RocksIterator iter = db.newIterator();
+        iter.seekToFirst();
+        Set<String> toRemove = new HashSet<>();
+        for (; iter.isValid(); iter.next()) {
+            try {
+
+                ObjectInputStream os =
+                        new ObjectInputStream(new ByteArrayInputStream(iter.value()));
+                T meta = (T) os.readObject();
+                status.put(meta.getID(), meta);
+
+            } catch (Exception e) {
+                e.printStackTrace();
+                toRemove.add(new String(iter.key()));
+            }
+        }
+        try {
+            for (String toDelete : toRemove) {
+                db.delete(toDelete.getBytes());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        LOGGER.debug(dbName + " load size:" + status.size());
+        LOGGER.debug(dbName + " toRemoveKeys:" + JsonUtil.toJson(toRemove));
+    }
+
+    private RocksDB setUpDB(String absolutePath) {
+        File file = new File(absolutePath);
+        Options options = new Options();
+        options.setCreateIfMissing(true);
+        File lockFile = new File(file, "LOCK");
+        RocksDB db = null;
+        LOGGER.trace("delete file" + lockFile.getAbsolutePath() + ": " + lockFile.delete());
+        try {
+            if (!file.exists()) {
+                LOGGER.trace("create directory " + file.getAbsolutePath() + ": " + file.mkdirs());
+            }
+            db = RocksDB.open(options, file.getAbsolutePath());
+            return db;
+        } catch (RocksDBException e) {
+            e.printStackTrace();
+        }
+        return db;
+    }
+
+    public synchronized void updateValue(T t) {
+        // 同步更新到数据库
+        if (null == t) {
+            return;
+        }
+        try {
+            status.put(t.getID(), t);
+            String key = preFix + t.getID();
+            ByteArrayOutputStream bo = new ByteArrayOutputStream();
+            ObjectOutputStream oo = new ObjectOutputStream(bo);
+            oo.writeObject(t);
+            oo.close();
+            db.put(key.getBytes(), bo.toByteArray());
+            versionIndex.index(t.getID().hashCode());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    List<T> getLast(int count) {
+        List<T> ret = new ArrayList<>();
+        Set<Long> set = new HashSet<>(versionIndex.requestLast(count));
+        for (T t : status.values()) {
+            if (null != t && set.contains((long) t.getID().hashCode())) {
+                ret.add(t);
+            }
+        }
+        return ret;
+    }
+
+    public long getVersion() {
+        return versionIndex.size();
+    }
+
+    public Map<String, T> getStatus() {
+        return status;
+    }
+}
diff --git a/src/main/entry/org/bdware/sc/db/TimeDBUtil.java b/src/main/entry/org/bdware/sc/db/TimeDBUtil.java
new file mode 100644
index 0000000..27924e1
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/db/TimeDBUtil.java
@@ -0,0 +1,359 @@
+package org.bdware.sc.db;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.gson.reflect.TypeToken;
+import com.sleepycat.je.DatabaseException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.bdware.sc.Jedion;
+import org.bdware.sc.index.TimeSerialIndex;
+import org.bdware.sc.util.JsonUtil;
+
+import java.io.File;
+import java.util.*;
+
+public class TimeDBUtil {
+    private static final Logger LOGGER = LogManager.getLogger(TimeDBUtil.class);
+    public static TimeDBUtil instance;
+    private final Map<String, Jedion> dbLink;
+    private final Map<String, TimeSerialIndex> index;
+    public String dbPath;
+    Random random = new Random();
+
+    public TimeDBUtil(String path) {
+        dbLink = new HashMap<>();
+        index = new HashMap<>();
+        dbPath = path;
+    }
+
+    public static void setupNC() {
+        instance = new TimeDBUtil("./NodeCenterDB");
+    }
+
+    public static void setupCM() {
+        instance = new TimeDBUtil("./ContractManagerDB");
+    }
+
+    private static void deleteJelck(File file) {
+        if (file.exists()) {
+            LOGGER.trace("delete file" + file.getAbsolutePath() + ": " + file.delete());
+        }
+    }
+
+    private Jedion getDB(String dbName) {
+        if (!dbLink.containsKey(dbName)) {
+            setupDB(dbName);
+        }
+        return dbLink.get(dbName);
+    }
+
+    private void setupDB(String dbName) {
+        Jedion db = new Jedion(dbName);
+        File file = new File(dbPath + "/" + dbName);
+        File timeIndex = new File(dbPath + "/" + dbName + ".timeindex");
+        deleteJelck(new File(file, "je.lck"));
+        if (!file.exists()) {
+            LOGGER.trace("create directory " + file.getAbsolutePath() + ": " + file.mkdirs());
+        }
+        db.configEnvironment(file);
+        db.createDatabase();
+        dbLink.put(dbName, db);
+        index.put(dbName, new TimeSerialIndex(timeIndex.getAbsolutePath()));
+    }
+
+    public void put(String dbName, String val) {
+        Jedion db = getDB(dbName);
+        TimeSerialIndex index = getIndex(dbName);
+        long key = random.nextLong();
+        index.index(key);
+
+        db.writeToDatabase(String.valueOf(key), val, true);
+    }
+
+    public JsonArray countInIntreval(String dbName, long start, long interval, long end) {
+        TimeSerialIndex index = getIndex(dbName);
+        long offset = index.findNearest(start);
+        JsonArray array = new JsonArray();
+        do {
+            start += interval;
+            long offset2 = index.findNearest(start);
+            array.add(offset2 - offset);
+            offset = offset2;
+        } while (start < end);
+        return array;
+    }
+
+    public List<String> query(String dbName, long end) {
+        List<String> ret = new ArrayList<>();
+        Jedion db = getDB(dbName);
+        TimeSerialIndex index = getIndex(dbName);
+        long size = index.size();
+        long offset = index.findNearest(end);
+        int len = (int) (size - offset);
+        List<Long> data = index.request(offset, len);
+        for (Long l : data) {
+            try {
+                String t = db.readFromDatabase(l.toString());
+                if (!t.isEmpty()) {
+                    ret.add(t);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return ret;
+    }
+
+    public String queryDetail(String dbName, String key) {
+//        if (!dbName.equals(CMTables.LocalContractLogDB.toString())) {
+//            return null;
+//        }
+        try {
+            Jedion db = getDB(dbName);
+            return db.readFromDatabase(key);
+        } catch (DatabaseException e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+    public List<JsonObject> queryLogBefore(String dbName, long end, String contractName) {
+        if (!dbName.equals(CMTables.LocalContractLogDB.toString())) {
+            return null;
+        }
+        List<JsonObject> ret = new ArrayList<>();
+        Jedion db = getDB(dbName);
+        TimeSerialIndex index = getIndex(dbName);
+        long size = index.size();
+        long offset = index.findNearest(end);
+        int len = (int) (size - offset);
+        List<Long> data = index.request(offset, len);
+        for (Long l : data) {
+            try {
+                String t = db.readFromDatabase(l.toString());
+                if (null != t && !t.isEmpty()) {
+                    JsonObject jo = JsonUtil.parseString(t);
+                    jo.addProperty("key", l.toString());
+                    if (jo.has("contractName")
+                            && jo.get("contractName").getAsString().equals(contractName)) {
+                        ret.add(jo);
+                    }
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return ret;
+    }
+
+    public List<String> queryWithKey(String dbName, long end) {
+        if (!dbName.equals(CMTables.LocalContractLogDB.toString())) {
+            return null;
+        }
+
+        List<String> ret = new ArrayList<>();
+        Jedion db = getDB(dbName);
+        TimeSerialIndex index = getIndex(dbName);
+        long size = index.size();
+        long offset = index.findNearest(end);
+        int len = (int) (size - offset);
+        List<Long> data = index.request(offset, len);
+
+        for (Long l : data) {
+            try {
+                String t = db.readFromDatabase(l.toString());
+                if (t != null && !t.isEmpty()) {
+                    t = t.substring(0, t.length() - 1);
+                    t += (",\"key\":\"" + l + "\"}");
+                    ret.add(t);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return ret;
+    }
+
+    public List<String> querySort(String dbName, long end) {
+        if (!(dbName.equals("NC_CMLog")
+                || dbName.equals("NC_NodeLogDB")
+                || dbName.equals(CMTables.LocalNodeLogDB.toString())
+                || dbName.equals(CMTables.LocalContractLogDB.toString()))) {
+            return null;
+        }
+
+        List<String> ret = new ArrayList<>();
+        Map<String, Integer> map = new HashMap<>();
+        Map<String, String> data2;
+
+        Jedion db = getDB(dbName);
+        TimeSerialIndex index = getIndex(dbName);
+        long size = index.size();
+        long offset = index.findNearest(end);
+        int len = (int) (size - offset);
+        List<Long> data = index.request(offset, len);
+
+        String action;
+        for (Long l : data) {
+            try {
+                String t = db.readFromDatabase(l.toString());
+                data2 = JsonUtil.fromJson(t, new TypeToken<Map<String, String>>() {
+                }.getType());
+                if (data2 != null) {
+                    action = data2.get("action");
+                    if (map.containsKey(action)) {
+                        int count = map.get(action) + 1;
+                        map.put(action, count);
+                    } else {
+                        map.put(action, 1);
+                    }
+                }
+
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+        for (String key : map.keySet()) {
+            ret.add("{\"action\":\"" + key + "\",\"times\":" + map.get(key) + "}");
+        }
+
+        return ret;
+    }
+
+    public List<String> queryDate(String dbName, long end) {
+        if (!dbName.equals("NC_CMLog") &&
+                !dbName.equals("NC_NodeLogDB") &&
+                !dbName.equals(CMTables.LocalNodeLogDB.toString()) &&
+                !dbName.equals(CMTables.LocalContractLogDB.toString())) {
+            return null;
+        }
+
+        List<String> ret = new ArrayList<>();
+        Map<String, String> data2;
+
+        Jedion db = getDB(dbName);
+        TimeSerialIndex index = getIndex(dbName);
+        long size = index.size();
+        long offset = index.findNearest(end);
+        int len = (int) (size - offset);
+        List<Long> data = index.request(offset, len);
+
+        String date;
+        for (Long l : data) {
+            try {
+                data2 =
+                        JsonUtil.fromJson(
+                                db.readFromDatabase(l.toString()),
+                                new TypeToken<Map<String, String>>() {
+                                }.getType());
+                if (data2 != null) {
+                    date = data2.get("date");
+                    ret.add(date);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return ret;
+    }
+
+    public List<String> queryByOffset(String dbName, int offset, int len) {
+        List<String> ret = new ArrayList<>();
+        Jedion db = getDB(dbName);
+        TimeSerialIndex index = getIndex(dbName);
+        List<Long> data = index.request(offset, len);
+        for (Long l : data) {
+            try {
+                String t = db.readFromDatabase(l.toString());
+                ret.add(t);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return ret;
+    }
+
+    public List<JsonObject> queryActionDatePair(String dbName, long end, List<String> category) {
+        if (!(dbName.equals("NC_CMLog") || (dbName.equals("NC_NodeLogDB")))) {
+            return null;
+        }
+
+        List<JsonObject> ret = new ArrayList<>();
+        JsonObject data2;
+        Jedion db = getDB(dbName);
+        TimeSerialIndex index = getIndex(dbName);
+        long size = index.size();
+        long offset = index.findNearest(end);
+        int len = (int) (size - offset);
+        List<Long> data = index.request(offset, len);
+
+        for (Long l : data) {
+            try {
+                String t = db.readFromDatabase(l.toString());
+                data2 = JsonUtil.parseString(t);
+                ret.add(data2);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+        return ret;
+    }
+
+    public List<JsonObject> queryActionDatePair(String dbName, long end) {
+        if (!(dbName.equals("NC_CMLog") || (dbName.equals("NC_NodeLogDB")))) {
+            return null;
+        }
+
+        List<JsonObject> ret = new ArrayList<>();
+        JsonObject data2;
+
+        Jedion db = getDB(dbName);
+        TimeSerialIndex index = getIndex(dbName);
+        long size = index.size();
+        long offset = index.findNearest(end);
+        int len = (int) (size - offset);
+        List<Long> data = index.request(offset, len);
+
+        for (Long l : data) {
+            String t = null;
+
+            try {
+                t = db.readFromDatabase(l.toString());
+                data2 = JsonUtil.parseString(t);
+                ret.add(data2);
+            } catch (Exception e) {
+                LOGGER.error("parse json error:" + t);
+            }
+        }
+
+        return ret;
+    }
+
+    public String get(String dbName, String key) {
+        Jedion db = getDB(dbName);
+        try {
+            return db.readFromDatabase(key);
+        } catch (DatabaseException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private TimeSerialIndex getIndex(String dbName) {
+        return index.get(dbName);
+    }
+
+    public long getCount(String dbName) {
+        try {
+            Jedion db = getDB(dbName);
+            return db.getCount();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return 0L;
+    }
+}
diff --git a/src/main/entry/org/bdware/sc/db/TimeRocksDBUtil.java b/src/main/entry/org/bdware/sc/db/TimeRocksDBUtil.java
new file mode 100644
index 0000000..263e8e7
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/db/TimeRocksDBUtil.java
@@ -0,0 +1,313 @@
+package org.bdware.sc.db;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.gson.reflect.TypeToken;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.bdware.sc.index.TimeSerialIndex;
+import org.bdware.sc.util.JsonUtil;
+import org.rocksdb.Options;
+import org.rocksdb.RocksDB;
+import org.rocksdb.RocksDBException;
+
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+
+public class TimeRocksDBUtil {
+    private static final Logger LOGGER = LogManager.getLogger(TimeRocksDBUtil.class);
+    private final Map<String, RocksDB> dbLink;
+    private final Map<String, TimeSerialIndex> index;
+    public String dbPath;
+    Random random = new Random();
+
+    public TimeRocksDBUtil(String path) {
+        dbLink = new HashMap<>();
+        index = new HashMap<>();
+        dbPath = path;
+    }
+
+    private RocksDB getDB(String dbName) {
+        if (!dbLink.containsKey(dbName)) {
+            setupDB(dbName);
+        }
+        return dbLink.get(dbName);
+    }
+
+    private void setupDB(String dbName) {
+        Options options = new Options();
+        options.setCreateIfMissing(true);
+        File file = new File(dbPath + "/" + dbName);
+        String path = file.getAbsolutePath();
+        File lockFile = new File(path, "LOCK");
+        lockFile.delete();
+        RocksDB rocksDB = null;
+        try {
+            rocksDB = RocksDB.open(options, path);
+        } catch (RocksDBException e) {
+            e.printStackTrace();
+        }
+        File timeIndex = new File(dbPath + "/" + dbName + ".timeindex");
+        dbLink.put(dbName, rocksDB);
+        index.put(dbName, new TimeSerialIndex(timeIndex.getAbsolutePath()));
+    }
+
+    public void put(String dbName, String val) {
+        RocksDB db = getDB(dbName);
+        TimeSerialIndex index = getIndex(dbName);
+        long key = random.nextLong();
+        index.index(key);
+        try {
+            db.put(
+                    String.valueOf(key).getBytes(StandardCharsets.UTF_8),
+                    val.getBytes(StandardCharsets.UTF_8));
+        } catch (RocksDBException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void reIndex(String dbName, String date, String val) {
+        RocksDB db = getDB(dbName);
+        TimeSerialIndex index = getIndex(dbName);
+        long key = random.nextLong();
+        index.manullyIndex(Long.parseLong(date), key);
+        try {
+            db.put(
+                    String.valueOf(key).getBytes(StandardCharsets.UTF_8),
+                    val.getBytes(StandardCharsets.UTF_8));
+        } catch (RocksDBException e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    public JsonArray countInIntreval(String dbName, long start, long interval, long end) {
+        TimeSerialIndex index = getIndex(dbName);
+        long offset = index.findNearest(start);
+        JsonArray array = new JsonArray();
+        do {
+            start += interval;
+            long offset2 = index.findNearest(start);
+            array.add(offset2 - offset);
+            offset = offset2;
+        } while (start < end);
+        return array;
+    }
+
+    public List<String> query(String dbName, long end) {
+        List<String> ret = new ArrayList<>();
+        RocksDB db = getDB(dbName);
+        TimeSerialIndex index = getIndex(dbName);
+        long size = index.size();
+        long offset = index.findNearest(end);
+        int len = (int) (size - offset);
+        List<Long> data = index.request(offset, len);
+        for (Long l : data) {
+            try {
+                String t = new String(db.get(l.toString().getBytes(StandardCharsets.UTF_8)));
+                if (!t.isEmpty()) {
+                    ret.add(t);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return ret;
+    }
+
+    public String queryDetail(String dbName, String key) {
+        //        if (!dbName.equals(CMTables.LocalContractLogDB.toString())) {
+        //            return null;
+        //        }
+        try {
+            RocksDB db = getDB(dbName);
+            return new String(db.get(key.getBytes(StandardCharsets.UTF_8)));
+        } catch (RocksDBException e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+    public List<JsonObject> queryLogBefore(String dbName, long end, String contractName) {
+        if (!dbName.equals(CMTables.LocalContractLogDB.toString())) {
+            return null;
+        }
+        List<JsonObject> ret = new ArrayList<>();
+        RocksDB db = getDB(dbName);
+        TimeSerialIndex index = getIndex(dbName);
+        long size = index.size();
+        long offset = index.findNearest(end);
+        int len = (int) (size - offset);
+        List<Long> data = index.request(offset, len);
+        for (Long l : data) {
+            try {
+                String t = new String(db.get(l.toString().getBytes(StandardCharsets.UTF_8)));
+                if (null != t && !t.isEmpty()) {
+                    JsonObject jo = JsonUtil.parseString(t);
+                    jo.addProperty("key", l.toString());
+                    if (jo.has("contractName")
+                            && jo.get("contractName").getAsString().equals(contractName)) {
+                        ret.add(jo);
+                    }
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return ret;
+    }
+
+    public List<String> queryWithKey(String dbName, long end) {
+        if (!dbName.equals(CMTables.LocalContractLogDB.toString())) {
+            return null;
+        }
+
+        List<String> ret = new ArrayList<>();
+        RocksDB db = getDB(dbName);
+        TimeSerialIndex index = getIndex(dbName);
+        long size = index.size();
+        long offset = index.findNearest(end);
+        int len = (int) (size - offset);
+        List<Long> data = index.request(offset, len);
+
+        for (Long l : data) {
+            try {
+                String t = new String(db.get(l.toString().getBytes(StandardCharsets.UTF_8)));
+                if (t != null && !t.isEmpty()) {
+                    t = t.substring(0, t.length() - 1);
+                    t += (",\"key\":\"" + l + "\"}");
+                    ret.add(t);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return ret;
+    }
+
+    public List<String> querySort(String dbName, long end) {
+        if (!(dbName.equals("NC_CMLog")
+                || dbName.equals("NC_NodeLogDB")
+                || dbName.equals(CMTables.LocalNodeLogDB.toString())
+                || dbName.equals(CMTables.LocalContractLogDB.toString()))) {
+            return null;
+        }
+
+        List<String> ret = new ArrayList<>();
+        Map<String, Integer> map = new HashMap<>();
+        Map<String, String> data2;
+
+        RocksDB db = getDB(dbName);
+        TimeSerialIndex index = getIndex(dbName);
+        long size = index.size();
+        long offset = index.findNearest(end);
+        int len = (int) (size - offset);
+        List<Long> data = index.request(offset, len);
+
+        String action;
+        for (Long l : data) {
+            try {
+                String t = new String(db.get(l.toString().getBytes(StandardCharsets.UTF_8)));
+                data2 = JsonUtil.fromJson(t, new TypeToken<Map<String, String>>() {
+                }.getType());
+                if (data2 != null) {
+                    action = data2.get("action");
+                    if (map.containsKey(action)) {
+                        int count = map.get(action) + 1;
+                        map.put(action, count);
+                    } else {
+                        map.put(action, 1);
+                    }
+                }
+
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+        for (String key : map.keySet()) {
+            ret.add("{\"action\":\"" + key + "\",\"times\":" + map.get(key) + "}");
+        }
+
+        return ret;
+    }
+
+    public List<String> queryDate(String dbName, long end) {
+        if (!dbName.equals("NC_CMLog")
+                && !dbName.equals("NC_NodeLogDB")
+                && !dbName.equals(CMTables.LocalNodeLogDB.toString())
+                && !dbName.equals(CMTables.LocalContractLogDB.toString())) {
+            return null;
+        }
+
+        List<String> ret = new ArrayList<>();
+        Map<String, String> data2;
+
+        RocksDB db = getDB(dbName);
+        TimeSerialIndex index = getIndex(dbName);
+        long size = index.size();
+        long offset = index.findNearest(end);
+        int len = (int) (size - offset);
+        List<Long> data = index.request(offset, len);
+
+        String date;
+        for (Long l : data) {
+            try {
+                data2 =
+                        JsonUtil.fromJson(
+                                new String(db.get(l.toString().getBytes(StandardCharsets.UTF_8))),
+                                new TypeToken<Map<String, String>>() {
+                                }.getType());
+                if (data2 != null) {
+                    date = data2.get("date");
+                    ret.add(date);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return ret;
+    }
+
+    public List<String> queryByOffset(String dbName, int offset, int len) {
+        List<String> ret = new ArrayList<>();
+        RocksDB db = getDB(dbName);
+        TimeSerialIndex index = getIndex(dbName);
+        List<Long> data = index.request(offset, len);
+        for (Long l : data) {
+            try {
+                String t = new String(db.get(l.toString().getBytes(StandardCharsets.UTF_8)));
+                ret.add(t);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return ret;
+    }
+
+    public String get(String dbName, String key) {
+        RocksDB db = getDB(dbName);
+        try {
+            return new String(db.get(key.toString().getBytes(StandardCharsets.UTF_8)));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private TimeSerialIndex getIndex(String dbName) {
+        return index.get(dbName);
+    }
+
+    public long getCount(String dbName) {
+        try {
+            TimeSerialIndex index = getIndex(dbName);
+            return index.size();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return 0L;
+    }
+}
diff --git a/src/main/entry/org/bdware/sc/http/ApiGate.java b/src/main/entry/org/bdware/sc/http/ApiGate.java
new file mode 100644
index 0000000..d89ef42
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/http/ApiGate.java
@@ -0,0 +1,74 @@
+package org.bdware.sc.http;
+
+import org.bdware.sc.util.JsonUtil;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLEncoder;
+import java.util.Scanner;
+
+public class ApiGate {
+    private final Get get;
+
+    public ApiGate(String ipAddress, int port) {
+        this.get = new HttpGet(ipAddress, port);
+    }
+
+    public ApiGate(String ipAddress) {
+        this.get = new HttpGet(ipAddress, 6161);
+    }
+
+    public String get(String pkgName, String method, String arg) {
+        return get.get(pkgName, method, arg);
+    }
+
+    private interface Get {
+        String get(String pkgName, String methodName, String arg);
+    }
+
+    static class Args {
+        String pkgName;
+        String method;
+        String arg;
+    }
+
+    private static class HttpGet implements Get {
+        String url;
+
+        public HttpGet(String ip, int port) {
+            url = "http://" + ip + ":" + port + "/CMDManager?getMessage=";
+        }
+
+        public String get(String pkgName, String name, String arg) {
+            Args args = new Args();
+            args.pkgName = pkgName;
+            args.method = name;
+            args.arg = arg;
+            return sendHttpGet(url + URLEncoder.encode(JsonUtil.toJson(args)));
+        }
+
+        private String sendHttpGet(String str) {
+            try {
+                System.out.println("[APIGate] sendHttp:" + str);
+                URL url = new URL((str));
+                URLConnection connection = url.openConnection();
+                connection.setReadTimeout(10 * 1000);
+                InputStream input = connection.getInputStream();
+                Scanner sc = new Scanner(input);
+                StringBuilder sb = new StringBuilder();
+                while (sc.hasNextLine()) {
+                    sb.append(sc.nextLine()).append("\n");
+                }
+                sc.close();
+                return sb.toString();
+            } catch (Exception e) {
+                ByteArrayOutputStream bo = new ByteArrayOutputStream();
+                e.printStackTrace(new PrintStream(bo));
+                return bo.toString();
+            }
+        }
+    }
+}
diff --git a/src/main/entry/org/bdware/sc/http/HttpPostForm.java b/src/main/entry/org/bdware/sc/http/HttpPostForm.java
new file mode 100644
index 0000000..ae37f86
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/http/HttpPostForm.java
@@ -0,0 +1,95 @@
+package org.bdware.sc.http;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+
+public class HttpPostForm {
+    public static void postForm(String url, Map<String, String> params) {
+        String responseMessage;
+        StringBuilder response = new StringBuilder();
+        HttpURLConnection httpConnection = null;
+        OutputStreamWriter out = null;
+        BufferedReader reader;
+        try {
+            URL urlPost = new URL(url);
+            httpConnection = (HttpURLConnection) urlPost.openConnection();
+            httpConnection.setDoOutput(true);
+            httpConnection.setDoInput(true);
+            httpConnection.setRequestMethod("POST");
+            httpConnection.setUseCaches(false);
+            httpConnection.setInstanceFollowRedirects(true);
+            httpConnection.setRequestProperty("Connection", "Keep-Alive");
+            httpConnection.setRequestProperty("Charset", "UTF-8");
+            // 设置边界
+            String BOUNDARY = "----------" + System.currentTimeMillis();
+            // httpConnection.setRequestProperty("Content-Type", "multipart/form-data;
+            // boundary=" + BOUNDARY);
+            httpConnection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded;boundary=" + BOUNDARY);
+
+            // 连接，从postUrl.openConnection()至此的配置必须要在connect之前完成，
+            // 要注意的是connection.getOutputStream会隐含的进行connect。
+            // 实际上只是建立了一个与服务器的tcp连接，并没有实际发送http请求。
+
+            httpConnection.connect();
+            out = new OutputStreamWriter(httpConnection.getOutputStream(), StandardCharsets.UTF_8);
+
+            StringBuilder sb = new StringBuilder();
+            int count = params.size();
+            for (String key : params.keySet()) {
+                sb.append(key).append("=").append(URLEncoder.encode(params.get(key), "utf-8"));
+                count--;
+                if (count > 0) {
+                    sb.append("&");
+                }
+            }
+            out.write(sb.toString());
+            System.out.println("send_url:" + url);
+            System.out.println("send_data:" + sb);
+            // flush and close
+            out.flush();
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                if (null != out) {
+                    out.close();
+                }
+                if (null != httpConnection) {
+                    httpConnection.disconnect();
+                }
+            } catch (Exception e2) {
+                e2.printStackTrace();
+            }
+        }
+
+        try {
+            if (null == httpConnection) {
+                throw new NullPointerException();
+            }
+            reader = new BufferedReader(new InputStreamReader(httpConnection.getInputStream(), StandardCharsets.UTF_8));
+            while ((responseMessage = reader.readLine()) != null) {
+                response.append(responseMessage);
+                response.append("\n");
+            }
+
+            if (!"failure".equals(response.toString())) {
+                System.out.println("success");
+            } else {
+                System.out.println("failure");
+            }
+            // 将该url的配置信息缓存起来
+            System.out.println(response);
+            System.out.println(httpConnection.getResponseCode());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/src/main/entry/org/bdware/sc/http/HttpUtil.java b/src/main/entry/org/bdware/sc/http/HttpUtil.java
new file mode 100644
index 0000000..626dfe4
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/http/HttpUtil.java
@@ -0,0 +1,167 @@
+package org.bdware.sc.http;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Scanner;
+
+public class HttpUtil {
+    static final String RESPONSE = "__response";
+    protected static String BOUNDARY = "DHFKJSHIDSKFSDFSFDS";
+
+    public static Map<String, Object> httpGet(String str) {
+        Map<String, Object> ret = new HashMap<>();
+
+        try {
+            URL url = new URL(str);
+            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+            connection.setConnectTimeout(40000);
+            connection.setReadTimeout(40000);
+            ret.put("responseCode", connection.getResponseCode());
+            InputStream input = connection.getInputStream();
+            Scanner sc = new Scanner(input);
+            StringBuilder sb = new StringBuilder();
+            while (sc.hasNextLine()) {
+                sb.append(sc.nextLine()).append("\n");
+            }
+            sc.close();
+            ret.put("response", sb.toString());
+        } catch (Throwable e) {
+            ret.put("responseCode", 505);
+            ByteArrayOutputStream bo = new ByteArrayOutputStream();
+            e.printStackTrace(new PrintStream(bo));
+            ret.put("response", bo.toString());
+        }
+        return ret;
+    }
+
+    public static String postForm(String baseUrl, Map<String, String> header, File f) {
+        HttpURLConnection connection = null;
+        try {
+            URL url = new URL(baseUrl);
+            connection = (HttpURLConnection) url.openConnection();
+            connection.setRequestMethod("POST");
+            for (String key : header.keySet()) connection.setRequestProperty(key, header.get(key));
+            connection.setDoOutput(true);
+            connection.setDoInput(true);
+            OutputStream out = connection.getOutputStream();
+            //	ByteArrayOutputStream out = new ByteArrayOutputStream();
+            out.write(("\r\n--" + BOUNDARY + "\r\n").getBytes(StandardCharsets.UTF_8));
+            String resSB = "Content-Disposition: form-data; name=\"file\";" +
+                    " filename=\"" +
+                    (f.getName()) +
+                    "\r\n\r\n";
+            out.write(resSB.getBytes(StandardCharsets.UTF_8));
+
+            // 开始写文件
+            DataInputStream in = new DataInputStream(new FileInputStream(f));
+            int bytes = 0;
+            byte[] bufferOut = new byte[1024 * 5];
+            while ((bytes = in.read(bufferOut)) != -1) {
+                // out.write(bufferOut, 0, bytes);
+            }
+            out.write("Hello".getBytes());
+            out.write(("\r\n--" + BOUNDARY + "--\r\n").getBytes(StandardCharsets.UTF_8));
+            in.close();
+            out.close();
+
+            InputStream input = connection.getInputStream();
+            Scanner sc = new Scanner(input);
+            StringBuilder sb = new StringBuilder();
+            while (sc.hasNextLine()) {
+                sb.append(sc.nextLine()).append("\n");
+            }
+            sc.close();
+            return sb.toString();
+        } catch (Exception e) {
+            e.printStackTrace();
+            if (null != connection) {
+                InputStream error = connection.getErrorStream();
+                Scanner sc = new Scanner(error);
+                StringBuilder sb = new StringBuilder();
+                while (sc.hasNextLine()) {
+                    sb.append(sc.nextLine()).append("\n");
+                }
+                System.out.println(sb);
+            }
+        }
+        return "failed";
+    }
+
+    public static String request(
+            String baseUrl,
+            String method,
+            Map<String, String> header,
+            Map<String, String> argMap,
+            List<String> reservedList) {
+        switch (method.toUpperCase()) {
+            case "GET":
+            case "POST":
+            case "DELETE":
+            case "PUT":
+                System.out.println("baseUrl:" + baseUrl + " method:" + method);
+                Map<String, String> r = http(method, baseUrl, getParamStr(argMap), header);
+                return r.get(RESPONSE);
+            default:
+                return "Unsupported RequestMethod:" + method;
+        }
+    }
+
+    private static String getParamStr(Map<String, String> argMap) {
+        if (argMap.keySet().size() == 0) return "";
+        StringBuilder sb = new StringBuilder();
+        sb.append("?");
+        boolean isFirst = true;
+        for (String key : argMap.keySet()) {
+            sb.append(isFirst ? "?" : "&").append(argMap.get(key));
+            isFirst = false;
+        }
+        return sb.toString();
+    }
+
+    public static Map<String, String> http(
+            String app, String str, String param, Map<String, String> props) {
+        HttpURLConnection connection;
+        Map<String, String> result = new HashMap<>();
+        try {
+            URL url = new URL(str);
+            connection = (HttpURLConnection) url.openConnection();
+            connection.setRequestMethod(app);
+            for (String key : props.keySet()) connection.setRequestProperty(key, props.get(key));
+            connection.setDoOutput(true);
+            connection.setDoInput(true);
+            if (param.length() > 0) {
+                connection.getOutputStream().write(param.getBytes());
+                connection.getOutputStream().flush();
+            }
+            loadHeader(result, connection);
+            InputStream input = connection.getInputStream();
+
+            Scanner sc = new Scanner(input);
+            StringBuilder sb = new StringBuilder();
+            while (sc.hasNextLine()) {
+                sb.append(sc.nextLine()).append("\n");
+            }
+            sc.close();
+            result.put(RESPONSE, sb.toString());
+            return result;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return new HashMap<>();
+    }
+
+    private static void loadHeader(Map<String, String> result, HttpURLConnection connection) {
+        try {
+            for (String key : connection.getHeaderFields().keySet()) {
+                result.put(key, connection.getHeaderField(key));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/src/main/entry/org/bdware/sc/index/LenVarTimeSerialIndex.java b/src/main/entry/org/bdware/sc/index/LenVarTimeSerialIndex.java
new file mode 100644
index 0000000..58ff022
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/index/LenVarTimeSerialIndex.java
@@ -0,0 +1,135 @@
+package org.bdware.sc.index;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.util.ArrayList;
+import java.util.List;
+
+public class LenVarTimeSerialIndex {
+    private static final Logger LOGGER = LogManager.getLogger(LenVarTimeSerialIndex.class);
+    //    static int chunckSize = 10240;
+//    public String fileDir;
+//    File currentFile;
+    RandomAccessFile file;
+    int dataSize = 20;
+    long fileSize = 0;
+    byte[] dateBuff = new byte[8];
+
+    public LenVarTimeSerialIndex(String fileName, int dataSize) {
+        try {
+            File f = new File(fileName);
+            File parent = f.getParentFile();
+            if (!parent.exists()) {
+                LOGGER.trace("create directory " + parent.getAbsolutePath() + ": " + parent.mkdirs());
+            }
+            if (!f.exists()) {
+                LOGGER.trace("create file " + f.getAbsolutePath() + ": " + f.createNewFile());
+            }
+            file = new RandomAccessFile(f, "rw");
+            this.dataSize = dataSize;
+            fileSize = file.length() / (dataSize + 8L);
+            this.file.seek(fileSize * (dataSize + 8L));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    protected void finalize() {
+        try {
+            file.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public synchronized void seek(int pos) {
+        try {
+            file.seek(pos);
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    public synchronized void manullyIndex(long date, byte[] hash) {
+        try {
+            checkData(hash);
+            fileSize++;
+            for (int i = 0; i < 8; i++) {
+                dateBuff[i] = (byte) ((date >> (56 - i * 8)) & 0xFF);
+            }
+            file.write(dateBuff);
+            file.write(hash);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void checkData(byte[] hash) {
+        if (hash == null || hash.length != dataSize)
+            throw new IllegalArgumentException("unsupported data size:" +
+                    (null == hash ? "null" : hash.length));
+    }
+
+    public synchronized long index(byte[] hash) {
+        long ret = 0;
+        try {
+            checkData(hash);
+            fileSize++;
+            ret = System.currentTimeMillis();
+            for (int i = 0; i < 8; i++) {
+                dateBuff[i] = (byte) ((ret >> (56 - i * 8)) & 0xFF);
+            }
+            file.write(dateBuff);
+            file.write(hash);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return ret;
+    }
+
+    public synchronized List<byte[]> request(long offset, int len) {
+        List<byte[]> ret = new ArrayList<>();
+        if (offset < 0) {
+            offset = 0;
+        }
+        if (offset < fileSize) {
+            long pos = 0;
+            try {
+                pos = file.getFilePointer();
+                file.seek(offset * (dataSize + 8L));
+                for (; offset < fileSize && len > 0; len--) {
+                    byte[] data = new byte[dataSize + 8];
+                    file.read(data);
+                    ret.add(data);
+                    offset++;
+                }
+                file.seek(pos);
+            } catch (IOException e) {
+                e.printStackTrace();
+            } finally {
+                try {
+                    file.seek(pos);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            return ret;
+        } else
+            return new ArrayList<>();
+    }
+
+    public long size() {
+        return fileSize;
+    }
+
+    public synchronized List<byte[]> requestLast(int count) {
+        long offset = fileSize - count;
+        return request(offset, count);
+    }
+}
diff --git a/src/main/entry/org/bdware/sc/index/LenVarTimeSerialIndex2.java b/src/main/entry/org/bdware/sc/index/LenVarTimeSerialIndex2.java
new file mode 100644
index 0000000..0d597a2
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/index/LenVarTimeSerialIndex2.java
@@ -0,0 +1,163 @@
+package org.bdware.sc.index;
+
+import org.bdware.sc.util.HashUtil;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.util.ArrayList;
+import java.util.List;
+
+public class LenVarTimeSerialIndex2 {
+    static int chunckSize = 10240;
+    public String fileDir;
+    public int dataSize = 20;
+    public long fileSize = 0;
+    File currentFile;
+    RandomAccessFile file;
+    byte[] dateBuff = new byte[8];
+
+    public LenVarTimeSerialIndex2(String fileName) {
+        File f2 = new File(fileName + ".datasize");
+        if (!f2.exists())
+            throw new IllegalArgumentException("index file don't exists");
+        try {
+            File f = new File(fileName);
+
+            if (!f.exists()) {
+                f.createNewFile();
+            }
+            file = new RandomAccessFile(fileName, "rw");
+            this.dataSize = (int) f2.length();
+            fileSize = file.length() / (dataSize + 8L);
+            this.file.seek(fileSize * (dataSize + 8L));
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    public static long toDate(byte[] buff) {
+        long ret = 0;
+        for (int i = 0; i < 8; i++) {
+            ret <<= 8;
+            ret |= (buff[i] & 0xFF);
+        }
+        return ret;
+    }
+
+    @Override
+    protected void finalize() {
+        try {
+            file.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public synchronized void seek(int pos) {
+        try {
+            file.seek(pos);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public synchronized void manullyIndex(long date, byte[] hash) {
+        try {
+            if (hash == null || hash.length != dataSize)
+                throw new IllegalArgumentException("unsupported data size:" + hash.length);
+            fileSize++;
+            for (int i = 0; i < 8; i++)
+                dateBuff[i] = (byte) ((date >> (56 - i * 8)) & 0xFF);
+            file.seek(file.length());
+            file.write(dateBuff);
+            file.write(hash);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public synchronized long index(byte[] hash) {
+        long ret = 0;
+        try {
+            if (hash == null || hash.length != dataSize)
+                throw new IllegalArgumentException("unsupported data size:" + hash.length);
+            fileSize++;
+            ret = System.currentTimeMillis();
+            for (int i = 0; i < 8; i++)
+                dateBuff[i] = (byte) ((ret >> (56 - i * 8)) & 0xFF);
+            file.seek(file.length());
+            file.write(dateBuff);
+            file.write(hash);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return ret;
+    }
+
+    public synchronized List<byte[]> request(long offset, int len) {
+        List<byte[]> ret = new ArrayList<byte[]>();
+        if (offset < 0)
+            offset = 0;
+        if (offset < fileSize) {
+            long pos = 0;
+            try {
+                pos = file.getFilePointer();
+                file.seek(offset * (dataSize + 8L));
+                for (; offset < fileSize && len > 0; len--) {
+                    byte[] data = new byte[dataSize + 8];
+                    file.read(data);
+                    ret.add(data);
+                    offset++;
+                }
+                file.seek(pos);
+            } catch (IOException e) {
+                e.printStackTrace();
+            } finally {
+                try {
+                    file.seek(pos);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            return ret;
+        } else
+            return new ArrayList<byte[]>();
+    }
+
+    public long size() {
+        return fileSize;
+    }
+
+    public synchronized List<byte[]> requestLast(int count) {
+        long offset = fileSize - count;
+        return request(offset, count);
+    }
+
+    public synchronized List<byte[]> requestByTime(long startTime, long endTime) {
+        long start = bsearch(0, fileSize, startTime);
+        long end = bsearch(0, fileSize, endTime);
+        return request(start, (int) (end - start + 1));
+    }
+
+    private long bsearch(long s, long e, long time) {
+        // TODO 这个bsearch一看就有毒，楚天你可以改它。
+        if (e <= s + 1)
+            return s;
+        long offset = (s + e) / 2;
+        try {
+            file.seek(offset * (dataSize + 8L));
+            file.read(dateBuff);
+            long date = HashUtil.bytes2Long(dateBuff);
+            if (date < time)
+                return bsearch(offset + 1, e, time);
+            else
+                return bsearch(s, offset, time);
+        } catch (IOException e1) {
+            e1.printStackTrace();
+            return -1;
+        }
+
+    }
+}
diff --git a/src/main/entry/org/bdware/sc/index/TimeSerialIndex.java b/src/main/entry/org/bdware/sc/index/TimeSerialIndex.java
new file mode 100644
index 0000000..dd41800
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/index/TimeSerialIndex.java
@@ -0,0 +1,143 @@
+package org.bdware.sc.index;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.util.ArrayList;
+import java.util.List;
+
+public class TimeSerialIndex {
+    private static final Logger LOGGER = LogManager.getLogger(TimeSerialIndex.class);
+    //    static int chunkSize = 10240;
+//    public String fileDir;
+//    File currentFile;
+    RandomAccessFile file;
+    long fileSize = 0;
+
+    public TimeSerialIndex(String fileName) {
+        try {
+            File f = new File(fileName);
+            File parent = f.getParentFile();
+            if (!parent.exists()) {
+                LOGGER.trace("create directory " + parent.getAbsolutePath() + ": " + parent.mkdirs());
+            }
+            if (!f.exists()) {
+                LOGGER.trace("create file " + f.getAbsolutePath() + ": " + f.createNewFile());
+            }
+            file = new RandomAccessFile(f, "rw");
+            fileSize = file.length() / 16L;
+            this.file.seek(fileSize * 16L);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    protected void finalize() {
+        try {
+            file.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public synchronized long index(long hash) {
+        long ret = 0;
+        try {
+            fileSize++;
+            ret = System.currentTimeMillis();
+            file.writeLong(ret);
+            file.writeLong(hash);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return ret;
+    }
+
+    public synchronized List<Long> request(long offset, int len) {
+        List<Long> ret = new ArrayList<>();
+        if (offset < 0) offset = 0;
+
+        if (offset < fileSize) {
+            long pos = 0;
+            try {
+                pos = file.getFilePointer();
+                file.seek(2L * offset * 8L);
+                for (; offset < fileSize && len > 0; len--) {
+                    file.readLong();
+                    ret.add(file.readLong());
+                    offset++;
+                }
+                file.seek(pos);
+            } catch (IOException e) {
+                e.printStackTrace();
+            } finally {
+                try {
+                    file.seek(pos);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            return ret;
+        } else return new ArrayList<>();
+    }
+
+    private long getIndex(long offset) {
+        if (offset < fileSize) {
+            try {
+                file.seek(2L * offset * 8L);
+                return file.readLong();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        throw new IllegalStateException("Array out of index exception");
+    }
+
+    public long size() {
+        return fileSize;
+    }
+
+    public synchronized List<Long> requestLast(int count) {
+        long offset = fileSize - count;
+        return request(offset, count);
+    }
+
+    public synchronized long findNearest(long timeStamp) {
+        try {
+            long pos = file.getFilePointer();
+            long ret = binarySearch(0L, fileSize + 1, timeStamp);
+            file.seek(pos);
+            return ret;
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return 0;
+    }
+
+    private long binarySearch(long start, long end, long timeStamp) {
+        if (start >= end - 1) return start;
+        long mid = (start + end) / 2;
+        if (mid >= end - 1) return mid;
+        long key = getIndex(mid);
+        if (key >= timeStamp) {
+            return binarySearch(start, mid, timeStamp);
+        } else {
+            return binarySearch(mid + 1, end, timeStamp);
+        }
+    }
+
+    public synchronized void manullyIndex(long date, long key) {
+        try {
+            fileSize++;
+            file.writeLong(date);
+            file.writeLong(key);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/src/main/entry/org/bdware/sc/packer/AvatarHelper.java b/src/main/entry/org/bdware/sc/packer/AvatarHelper.java
new file mode 100644
index 0000000..8f94090
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/packer/AvatarHelper.java
@@ -0,0 +1,93 @@
+package org.bdware.sc.packer;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.Base64;
+import java.util.Random;
+
+public class AvatarHelper {
+    private static Random random;
+
+    // 可以直接在<img/>标签或者浏览器地址栏预览的base64编码头
+    public static final String BASE64_PREFIX = "data:image/png;base64,";
+
+    /**
+     * 生成头像的base64编码
+     *
+     * @param idStr
+     * @return
+     * @throws IOException
+     */
+    public static String createBase64Avatar(String idStr) throws IOException {
+
+        return new String(Base64.getEncoder().encode(create(idStr)));
+    }
+
+    /**
+     * 根据id生成一个头像，颜色随机。如果是使用hashCode()值的话，值可能为负数。需要要注意。
+     *
+     * @param idStr
+     * @return
+     * @throws IOException
+     */
+    public static byte[] create(String idStr) throws IOException {
+        random = new Random();
+        random.setSeed(idStr.hashCode());
+        int id = Math.abs(idStr.hashCode());
+        int width = 6;
+        int grid = 15;
+        int padding = width / 2;
+        int size = width * grid + width;
+        BufferedImage img = new BufferedImage(size, size, BufferedImage.TYPE_INT_RGB);
+        Graphics2D _2d = img.createGraphics();
+        _2d.setColor(new Color(240, 240, 240));
+        _2d.fillRect(0, 0, size, size);
+        _2d.setColor(randomColor(80, 200));
+        char[] idchars = createIdent(id);
+        int i = idchars.length;
+        for (int x = 0; x < Math.ceil(grid / 2.0); x++) {
+            for (int y = 0; y < grid; y++) {
+                i = i - 1;
+                if (i < 0) i += idchars.length;
+                if (idchars[i] < 53) {
+                    _2d.fillRect((padding + x * width), (padding + y * width), width, width);
+                    if (x < Math.floor(grid / 2)) {
+                        _2d.fillRect(
+                                (padding + ((grid - 1) - x) * width),
+                                (padding + y * width),
+                                width,
+                                width);
+                    }
+                }
+            }
+        }
+        _2d.dispose();
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        ImageIO.write(img, "png", byteArrayOutputStream);
+        return byteArrayOutputStream.toByteArray();
+    }
+
+    private static Color randomColor(int fc, int bc) {
+        if (fc > 255) {
+            fc = 255;
+        }
+        if (bc > 255) {
+            bc = 255;
+        }
+        int r = fc + random.nextInt(Math.abs(bc - fc));
+        int g = fc + random.nextInt(Math.abs(bc - fc));
+        int b = fc + random.nextInt(Math.abs(bc - fc));
+        return new Color(r, g, b);
+    }
+
+    private static char[] createIdent(int id) {
+        BigInteger bi_content = new BigInteger((id + "").getBytes());
+        BigInteger bi = new BigInteger(id + "identicon" + id, 36);
+        bi = bi.xor(bi_content);
+        return bi.toString(10).toCharArray();
+    }
+}
diff --git a/src/main/entry/org/bdware/sc/packer/JarPacker.java b/src/main/entry/org/bdware/sc/packer/JarPacker.java
new file mode 100644
index 0000000..8c92703
--- /dev/null
+++ b/src/main/entry/org/bdware/sc/packer/JarPacker.java
@@ -0,0 +1,181 @@
+package org.bdware.sc.packer;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.bdware.sc.util.FileUtil;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipInputStream;
+import java.util.zip.ZipOutputStream;
+
+public class JarPacker {
+    public static final String zipFileName = "generatedlib/yjs.jar";
+    private static final Logger LOGGER = LogManager.getLogger(JarPacker.class);
+    //    public static boolean ignoreGson = false;
+//    static ClassLoader cl = ClassLoader.getSystemClassLoader();
+    ZipOutputStream outputZip;
+    //    Set<String> already = new HashSet<>();
+    private String base = "";
+
+    public static void zipTest() {
+        try {
+            String zipPath = "./input/office/wps.jar";
+            ZipFile zf = new ZipFile(zipPath);
+            FileInputStream fin = new FileInputStream(zipPath);
+            ZipInputStream zin = new ZipInputStream(fin);
+            ZipEntry zine = zin.getNextEntry();
+            byte[] cc = new byte[1000];
+
+            assert zine != null;
+            LOGGER.info("zin.read=" + zin.read(cc));
+            ZipEntry ze = zf.getEntry(zine.getName());
+            InputStream in = zf.getInputStream(ze);
+            byte[] bb = new byte[1000];
+            int count = in.read(bb);
+            LOGGER.info("count=" + count);
+            zin.close();
+            zf.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static void mergeZin(ZipInputStream zin, ZipOutputStream tempOut) throws IOException {
+        ZipEntry ze;
+        while (null != (ze = zin.getNextEntry())) {
+            String entryName = ze.getName();
+            byte[] b = new byte[1024 * 40];
+            int count;
+            if (entryName.contains("MANIFEST.MF")) {
+                LOGGER.info("Ignore: " + entryName);
+                continue;
+            }
+
+            try {
+                tempOut.putNextEntry(new ZipEntry(ze.getName()));
+                while ((count = zin.read(b)) > 0) {
+                    tempOut.write(b, 0, count);
+                }
+                tempOut.closeEntry();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    public static byte[] input2byte(InputStream inStream) throws IOException {
+        ByteArrayOutputStream swapStream = new ByteArrayOutputStream();
+        byte[] buff = new byte[100];
+        int rc;
+        while ((rc = inStream.read(buff, 0, 100)) > 0) {
+            swapStream.write(buff, 0, rc);
+        }
+        return swapStream.toByteArray();
+    }
+
+    public static void pack(List<String> jarPaths) {
+        new JarPacker().generateZip(jarPaths, zipFileName);
+        LOGGER.info("finished!");
+    }
+
+    public static void main(String[] args) {
+        List<String> paths = new ArrayList<>();
+        paths.add("./bin");
+        new JarPacker() {
+            boolean inject = false;
+
+            public byte[] transform(String inputFileName, byte[] arr) {
+                if (!inject) {
+                    inject = true;
+                    addFile("META-INF/MANIFEST.MF", getMF());
+                }
+                return arr;
+            }
+
+            private byte[] getMF() {
+                String sb = "Manifest-Version: 1.0\n" +
+                        "Main-Class: com.yancloud.sc.SCAPI\n";
+                return sb.getBytes();
+            }
+        }.generateZip(paths, "./generatedlib/yjs.jar");
+        LOGGER.info("pack yjs.jar done!");
+    }
+
+    public void generateZip(List<String> dirs, String zipFileName) {
+        int fileCount = 0;
+        try {
+            File dir = new File(FileUtil.getDir(zipFileName));
+            if (!dir.exists()) {
+                LOGGER.info("create directory " + dir.getAbsolutePath() + ": " + dir.mkdirs());
+            }
+            File zip = new File(zipFileName);
+            if (!zip.exists()) {
+                LOGGER.info("create file " + zip.getAbsolutePath() + ": " + zip.createNewFile());
+            }
+            FileOutputStream out = new FileOutputStream(zip);
+            outputZip = new ZipOutputStream(out);
+            for (String dirName : dirs) {
+                File f = new File(dirName);
+                File absolutef = f.getAbsoluteFile();
+                base = absolutef.getAbsolutePath();
+                fileCount += addToZip(absolutef);
+            }
+            LOGGER.info("fileCount=" + fileCount);
+            outputZip.close();
+            out.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private int addToZip(File f) throws IOException {
+        String className;
+        if (!f.isDirectory()) {
+            String path = f.getAbsolutePath();
+            if (accept(path)) {
+                if (File.separatorChar == '/') { // MACOS
+                    className = path.replaceAll(base, "").replaceAll("^/", "");
+                } else { // Windows
+                    className = path.substring(base.length() + 1);
+                    className = className.replace("\\", "/");
+                }
+                addFile(className, input2byte(new FileInputStream(f)));
+                return 1;
+            }
+            return 0;
+        } else {
+            int ret = 0;
+            File[] files = f.listFiles();
+            if (null != files) {
+                for (File subFile : files) {
+                    ret += addToZip(subFile);
+                }
+            }
+            return ret;
+        }
+    }
+
+    public boolean accept(String path) {
+        return path.matches(".*class$");
+    }
+
+    public void addFile(String inputFileName, byte[] arr) {
+        try {
+            arr = transform(inputFileName, arr);
+            outputZip.putNextEntry(new ZipEntry(inputFileName));
+            outputZip.write(arr, 0, arr.length);
+            // Close zip entry and file streams
+            outputZip.closeEntry();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public byte[] transform(String inputFileName, byte[] arr) {
+        return arr;
+    }
+}
diff --git a/src/main/gen/org/bdware/sc/parser/JavaScriptBaseLexer.java b/src/main/gen/org/bdware/sc/parser/JavaScriptBaseLexer.java
new file mode 100644
index 0000000..805cc6b
--- /dev/null
+++ b/src/main/gen/org/bdware/sc/parser/JavaScriptBaseLexer.java
@@ -0,0 +1,118 @@
+package org.bdware.sc.parser;
+
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.Lexer;
+import org.antlr.v4.runtime.Token;
+
+import java.util.Stack;
+
+public abstract class JavaScriptBaseLexer extends Lexer {
+    /**
+     * Stores values of nested modes. By default mode is strict or
+     * defined externally (useStrictDefault)
+     */
+    private final Stack<Boolean> scopeStrictModes = new Stack<>();
+
+    private Token lastToken = null;
+    /**
+     * Default value of strict mode
+     * Can be defined externally by setUseStrictDefault
+     */
+    private boolean useStrictDefault = false;
+    /**
+     * Current value of strict mode
+     * Can be defined during parsing, see StringFunctions.js and StringGlobal.js samples
+     */
+    private boolean useStrictCurrent = false;
+
+    public JavaScriptBaseLexer(CharStream input) {
+        super(input);
+    }
+
+    public boolean getStrictDefault() {
+        return useStrictDefault;
+    }
+
+    public void setUseStrictDefault(boolean value) {
+        useStrictDefault = value;
+        useStrictCurrent = value;
+    }
+
+    public boolean IsStrictMode() {
+        return useStrictCurrent;
+    }
+
+    /**
+     * Return the next token from the character stream and records this last
+     * token in case it resides on the default channel. This recorded token
+     * is used to determine when the lexer could possibly match a regex
+     * literal. Also changes scopeStrictModes stack if tokenize special
+     * string 'use strict';
+     *
+     * @return the next token from the character stream.
+     */
+    @Override
+    public Token nextToken() {
+        Token next = super.nextToken();
+
+        if (next.getChannel() == Token.DEFAULT_CHANNEL) {
+            // Keep track of the last token on the default channel.
+            this.lastToken = next;
+        }
+
+        return next;
+    }
+
+    protected void ProcessOpenBrace() {
+        useStrictCurrent = scopeStrictModes.size() > 0 && scopeStrictModes.peek() || useStrictDefault;
+        scopeStrictModes.push(useStrictCurrent);
+    }
+
+    protected void ProcessCloseBrace() {
+        useStrictCurrent = scopeStrictModes.size() > 0 ? scopeStrictModes.pop() : useStrictDefault;
+    }
+
+    protected void ProcessStringLiteral() {
+        if (lastToken == null || lastToken.getType() == JavaScriptLexer.OpenBrace) {
+            String text = getText();
+            if (text.equals("\"use strict\"") || text.equals("'use strict'")) {
+                if (scopeStrictModes.size() > 0)
+                    scopeStrictModes.pop();
+                useStrictCurrent = true;
+                scopeStrictModes.push(useStrictCurrent);
+            }
+        }
+    }
+
+    /**
+     * Returns {@code true} if the lexer can match a regex literal.
+     */
+    protected boolean IsRegexPossible() {
+
+        if (this.lastToken == null) {
+            // No token has been produced yet: at the start of the input,
+            // no division is possible, so a regex literal _is_ possible.
+            return true;
+        }
+
+        switch (this.lastToken.getType()) {
+            case JavaScriptLexer.Identifier:
+            case JavaScriptLexer.NullLiteral:
+            case JavaScriptLexer.BooleanLiteral:
+            case JavaScriptLexer.This:
+            case JavaScriptLexer.CloseBracket:
+            case JavaScriptLexer.CloseParen:
+            case JavaScriptLexer.OctalIntegerLiteral:
+            case JavaScriptLexer.DecimalLiteral:
+            case JavaScriptLexer.HexIntegerLiteral:
+            case JavaScriptLexer.StringLiteral:
+            case JavaScriptLexer.PlusPlus:
+            case JavaScriptLexer.MinusMinus:
+                // After any of the tokens above, no regex literal can follow.
+                return false;
+            default:
+                // In all other cases, a regex literal _is_ possible.
+                return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/gen/org/bdware/sc/parser/JavaScriptBaseParser.java b/src/main/gen/org/bdware/sc/parser/JavaScriptBaseParser.java
new file mode 100644
index 0000000..f1638cb
--- /dev/null
+++ b/src/main/gen/org/bdware/sc/parser/JavaScriptBaseParser.java
@@ -0,0 +1,117 @@
+package org.bdware.sc.parser;
+
+import org.antlr.v4.runtime.Lexer;
+import org.antlr.v4.runtime.Parser;
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.TokenStream;
+
+/**
+ * All parser methods that used in grammar (p, prev, notLineTerminator, etc.)
+ * should start with lower case char similar to parser rules.
+ */
+public abstract class JavaScriptBaseParser extends Parser {
+    public JavaScriptBaseParser(TokenStream input) {
+        super(input);
+    }
+
+    /**
+     * Short form for prev(String str)
+     */
+    protected boolean p(String str) {
+        return prev(str);
+    }
+
+    /**
+     * Whether the previous token value equals to @param str
+     */
+    protected boolean prev(String str) {
+        return _input.LT(-1).getText().equals(str);
+    }
+
+    /**
+     * Short form for next(String str)
+     */
+    protected boolean n(String str) {
+        return next(str);
+    }
+
+    /**
+     * Whether the next token value equals to @param str
+     */
+    protected boolean next(String str) {
+        return _input.LT(1).getText().equals(str);
+    }
+
+    protected boolean notLineTerminator() {
+        return !here(YJSParser.LineTerminator);
+    }
+
+    protected boolean notOpenBraceAndNotFunction() {
+        int nextTokenType = _input.LT(1).getType();
+        return nextTokenType != YJSParser.OpenBrace && nextTokenType != YJSParser.Function;
+    }
+
+    protected boolean closeBrace() {
+        return _input.LT(1).getType() == YJSParser.CloseBrace;
+    }
+
+    /**
+     * Returns {@code true} iff on the current index of the parser's token stream a
+     * token of the given {@code type} exists on the {@code HIDDEN} channel.
+     *
+     * @param type the type of the token on the {@code HIDDEN} channel to check.
+     * @return {@code true} iff on the current index of the parser's token stream a
+     * token of the given {@code type} exists on the {@code HIDDEN} channel.
+     */
+    private boolean here(final int type) {
+
+        // Get the token ahead of the current index.
+        int possibleIndexEosToken = this.getCurrentToken().getTokenIndex() - 1;
+        Token ahead = _input.get(possibleIndexEosToken);
+
+        // Check if the token resides on the HIDDEN channel and if it's of the
+        // provided type.
+        return (ahead.getChannel() == Lexer.HIDDEN) && (ahead.getType() == type);
+    }
+
+    /**
+     * Returns {@code true} iff on the current index of the parser's token stream a
+     * token exists on the {@code HIDDEN} channel which either is a line terminator,
+     * or is a multi line comment that contains a line terminator.
+     *
+     * @return {@code true} iff on the current index of the parser's token stream a
+     * token exists on the {@code HIDDEN} channel which either is a line
+     * terminator, or is a multi line comment that contains a line
+     * terminator.
+     */
+    protected boolean lineTerminatorAhead() {
+
+        // Get the token ahead of the current index.
+        int possibleIndexEosToken = this.getCurrentToken().getTokenIndex() - 1;
+        Token ahead = _input.get(possibleIndexEosToken);
+
+        if (ahead.getChannel() != Lexer.HIDDEN) {
+            // We're only interested in tokens on the HIDDEN channel.
+            return false;
+        }
+
+        if (ahead.getType() == YJSParser.LineTerminator) {
+            // There is definitely a line terminator ahead.
+            return true;
+        }
+
+        if (ahead.getType() == YJSParser.WhiteSpaces) {
+            // Get the token ahead of the current whitespaces.
+            possibleIndexEosToken = this.getCurrentToken().getTokenIndex() - 2;
+            ahead = _input.get(possibleIndexEosToken);
+        }
+
+        // Get the token's text and type.
+        String text = ahead.getText();
+        int type = ahead.getType();
+
+        // Check if the token is, or contains a line terminator.
+        return (type == YJSParser.MultiLineComment && (text.contains("\r") || text.contains("\n")))
+                || (type == YJSParser.LineTerminator);
+    }
+}
\ No newline at end of file
diff --git a/src/main/gen/org/bdware/sc/parser/JavaScriptLexer.interp b/src/main/gen/org/bdware/sc/parser/JavaScriptLexer.interp
new file mode 100644
index 0000000..6ab64a4
--- /dev/null
+++ b/src/main/gen/org/bdware/sc/parser/JavaScriptLexer.interp
@@ -0,0 +1,397 @@
+token literal names:
+null
+null
+null
+null
+'['
+']'
+'('
+')'
+'{'
+'}'
+';'
+','
+'='
+'?'
+':'
+'...'
+'.'
+'++'
+'--'
+'+'
+'-'
+'~'
+'!'
+'*'
+'/'
+'%'
+'>>'
+'<<'
+'>>>'
+'<'
+'>'
+'<='
+'>='
+'=='
+'!='
+'==='
+'!=='
+'&'
+'^'
+'|'
+'&&'
+'||'
+'*='
+'/='
+'%='
+'+='
+'-='
+'<<='
+'>>='
+'>>>='
+'&='
+'^='
+'|='
+'=>'
+'null'
+null
+null
+null
+null
+null
+null
+'break'
+'do'
+'instanceof'
+'typeof'
+'case'
+'else'
+'new'
+'var'
+'catch'
+'finally'
+'return'
+'void'
+'continue'
+'for'
+'switch'
+'while'
+'debugger'
+'function'
+'this'
+'with'
+'default'
+'if'
+'throw'
+'delete'
+'in'
+'try'
+'event'
+'@'
+'AT_LEAST_ONCE'
+'AT_MOST_ONCE'
+'ONLY_ONCE'
+'class'
+'enum'
+'extends'
+'super'
+'const'
+'export'
+'import'
+'contract'
+'module'
+'oracle'
+'implements'
+'let'
+'private'
+'public'
+'interface'
+'package'
+'protected'
+'static'
+'yield'
+null
+null
+null
+null
+null
+null
+null
+null
+
+token symbolic names:
+null
+MultiLineComment
+SingleLineComment
+RegularExpressionLiteral
+OpenBracket
+CloseBracket
+OpenParen
+CloseParen
+OpenBrace
+CloseBrace
+SemiColon
+Comma
+Assign
+QuestionMark
+Colon
+Ellipsis
+Dot
+PlusPlus
+MinusMinus
+Plus
+Minus
+BitNot
+Not
+Multiply
+Divide
+Modulus
+RightShiftArithmetic
+LeftShiftArithmetic
+RightShiftLogical
+LessThan
+MoreThan
+LessThanEquals
+GreaterThanEquals
+Equals_
+NotEquals
+IdentityEquals
+IdentityNotEquals
+BitAnd
+BitXOr
+BitOr
+And
+Or
+MultiplyAssign
+DivideAssign
+ModulusAssign
+PlusAssign
+MinusAssign
+LeftShiftArithmeticAssign
+RightShiftArithmeticAssign
+RightShiftLogicalAssign
+BitAndAssign
+BitXorAssign
+BitOrAssign
+ARROW
+NullLiteral
+BooleanLiteral
+DecimalLiteral
+HexIntegerLiteral
+OctalIntegerLiteral
+OctalIntegerLiteral2
+BinaryIntegerLiteral
+Break
+Do
+Instanceof
+Typeof
+Case
+Else
+New
+Var
+Catch
+Finally
+Return
+Void
+Continue
+For
+Switch
+While
+Debugger
+Function
+This
+With
+Default
+If
+Throw
+Delete
+In
+Try
+Event
+AtToken
+AtLeastOnce
+AtMostOnce
+OnlyOnce
+Class
+Enum
+Extends
+Super
+Const
+Export
+Import
+Contract
+Module
+Oracle
+Implements
+Let
+Private
+Public
+Interface
+Package
+Protected
+Static
+Yield
+Identifier
+StringLiteral
+TemplateStringLiteral
+WhiteSpaces
+LineTerminator
+HtmlComment
+CDataComment
+UnexpectedCharacter
+
+rule names:
+MultiLineComment
+SingleLineComment
+RegularExpressionLiteral
+OpenBracket
+CloseBracket
+OpenParen
+CloseParen
+OpenBrace
+CloseBrace
+SemiColon
+Comma
+Assign
+QuestionMark
+Colon
+Ellipsis
+Dot
+PlusPlus
+MinusMinus
+Plus
+Minus
+BitNot
+Not
+Multiply
+Divide
+Modulus
+RightShiftArithmetic
+LeftShiftArithmetic
+RightShiftLogical
+LessThan
+MoreThan
+LessThanEquals
+GreaterThanEquals
+Equals_
+NotEquals
+IdentityEquals
+IdentityNotEquals
+BitAnd
+BitXOr
+BitOr
+And
+Or
+MultiplyAssign
+DivideAssign
+ModulusAssign
+PlusAssign
+MinusAssign
+LeftShiftArithmeticAssign
+RightShiftArithmeticAssign
+RightShiftLogicalAssign
+BitAndAssign
+BitXorAssign
+BitOrAssign
+ARROW
+NullLiteral
+BooleanLiteral
+DecimalLiteral
+HexIntegerLiteral
+OctalIntegerLiteral
+OctalIntegerLiteral2
+BinaryIntegerLiteral
+Break
+Do
+Instanceof
+Typeof
+Case
+Else
+New
+Var
+Catch
+Finally
+Return
+Void
+Continue
+For
+Switch
+While
+Debugger
+Function
+This
+With
+Default
+If
+Throw
+Delete
+In
+Try
+Event
+AtToken
+AtLeastOnce
+AtMostOnce
+OnlyOnce
+Class
+Enum
+Extends
+Super
+Const
+Export
+Import
+Contract
+Module
+Oracle
+Implements
+Let
+Private
+Public
+Interface
+Package
+Protected
+Static
+Yield
+Identifier
+StringLiteral
+TemplateStringLiteral
+WhiteSpaces
+LineTerminator
+HtmlComment
+CDataComment
+UnexpectedCharacter
+DoubleStringCharacter
+SingleStringCharacter
+EscapeSequence
+CharacterEscapeSequence
+HexEscapeSequence
+UnicodeEscapeSequence
+ExtendedUnicodeEscapeSequence
+SingleEscapeCharacter
+NonEscapeCharacter
+EscapeCharacter
+LineContinuation
+HexDigit
+DecimalIntegerLiteral
+ExponentPart
+IdentifierPart
+IdentifierStart
+UnicodeLetter
+UnicodeCombiningMark
+UnicodeDigit
+UnicodeConnectorPunctuation
+RegularExpressionChar
+RegularExpressionClassChar
+RegularExpressionBackslashSequence
+
+channel names:
+DEFAULT_TOKEN_CHANNEL
+HIDDEN
+null
+null
+ERROR
+
+mode names:
+DEFAULT_MODE
+
+atn:
+[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 120, 1099, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 4, 43, 9, 43, 4, 44, 9, 44, 4, 45, 9, 45, 4, 46, 9, 46, 4, 47, 9, 47, 4, 48, 9, 48, 4, 49, 9, 49, 4, 50, 9, 50, 4, 51, 9, 51, 4, 52, 9, 52, 4, 53, 9, 53, 4, 54, 9, 54, 4, 55, 9, 55, 4, 56, 9, 56, 4, 57, 9, 57, 4, 58, 9, 58, 4, 59, 9, 59, 4, 60, 9, 60, 4, 61, 9, 61, 4, 62, 9, 62, 4, 63, 9, 63, 4, 64, 9, 64, 4, 65, 9, 65, 4, 66, 9, 66, 4, 67, 9, 67, 4, 68, 9, 68, 4, 69, 9, 69, 4, 70, 9, 70, 4, 71, 9, 71, 4, 72, 9, 72, 4, 73, 9, 73, 4, 74, 9, 74, 4, 75, 9, 75, 4, 76, 9, 76, 4, 77, 9, 77, 4, 78, 9, 78, 4, 79, 9, 79, 4, 80, 9, 80, 4, 81, 9, 81, 4, 82, 9, 82, 4, 83, 9, 83, 4, 84, 9, 84, 4, 85, 9, 85, 4, 86, 9, 86, 4, 87, 9, 87, 4, 88, 9, 88, 4, 89, 9, 89, 4, 90, 9, 90, 4, 91, 9, 91, 4, 92, 9, 92, 4, 93, 9, 93, 4, 94, 9, 94, 4, 95, 9, 95, 4, 96, 9, 96, 4, 97, 9, 97, 4, 98, 9, 98, 4, 99, 9, 99, 4, 100, 9, 100, 4, 101, 9, 101, 4, 102, 9, 102, 4, 103, 9, 103, 4, 104, 9, 104, 4, 105, 9, 105, 4, 106, 9, 106, 4, 107, 9, 107, 4, 108, 9, 108, 4, 109, 9, 109, 4, 110, 9, 110, 4, 111, 9, 111, 4, 112, 9, 112, 4, 113, 9, 113, 4, 114, 9, 114, 4, 115, 9, 115, 4, 116, 9, 116, 4, 117, 9, 117, 4, 118, 9, 118, 4, 119, 9, 119, 4, 120, 9, 120, 4, 121, 9, 121, 4, 122, 9, 122, 4, 123, 9, 123, 4, 124, 9, 124, 4, 125, 9, 125, 4, 126, 9, 126, 4, 127, 9, 127, 4, 128, 9, 128, 4, 129, 9, 129, 4, 130, 9, 130, 4, 131, 9, 131, 4, 132, 9, 132, 4, 133, 9, 133, 4, 134, 9, 134, 4, 135, 9, 135, 4, 136, 9, 136, 4, 137, 9, 137, 4, 138, 9, 138, 4, 139, 9, 139, 4, 140, 9, 140, 4, 141, 9, 141, 4, 142, 9, 142, 3, 2, 3, 2, 3, 2, 3, 2, 7, 2, 290, 10, 2, 12, 2, 14, 2, 293, 11, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 7, 3, 304, 10, 3, 12, 3, 14, 3, 307, 11, 3, 3, 3, 3, 3, 3, 4, 3, 4, 6, 4, 313, 10, 4, 13, 4, 14, 4, 314, 3, 4, 3, 4, 3, 4, 7, 4, 320, 10, 4, 12, 4, 14, 4, 323, 11, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 3, 7, 3, 8, 3, 8, 3, 9, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 12, 3, 12, 3, 13, 3, 13, 3, 14, 3, 14, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 3, 16, 3, 17, 3, 17, 3, 18, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 3, 21, 3, 21, 3, 22, 3, 22, 3, 23, 3, 23, 3, 24, 3, 24, 3, 25, 3, 25, 3, 26, 3, 26, 3, 27, 3, 27, 3, 27, 3, 28, 3, 28, 3, 28, 3, 29, 3, 29, 3, 29, 3, 29, 3, 30, 3, 30, 3, 31, 3, 31, 3, 32, 3, 32, 3, 32, 3, 33, 3, 33, 3, 33, 3, 34, 3, 34, 3, 34, 3, 35, 3, 35, 3, 35, 3, 36, 3, 36, 3, 36, 3, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 38, 3, 38, 3, 39, 3, 39, 3, 40, 3, 40, 3, 41, 3, 41, 3, 41, 3, 42, 3, 42, 3, 42, 3, 43, 3, 43, 3, 43, 3, 44, 3, 44, 3, 44, 3, 45, 3, 45, 3, 45, 3, 46, 3, 46, 3, 46, 3, 47, 3, 47, 3, 47, 3, 48, 3, 48, 3, 48, 3, 48, 3, 49, 3, 49, 3, 49, 3, 49, 3, 50, 3, 50, 3, 50, 3, 50, 3, 50, 3, 51, 3, 51, 3, 51, 3, 52, 3, 52, 3, 52, 3, 53, 3, 53, 3, 53, 3, 54, 3, 54, 3, 54, 3, 55, 3, 55, 3, 55, 3, 55, 3, 55, 3, 56, 3, 56, 3, 56, 3, 56, 3, 56, 3, 56, 3, 56, 3, 56, 3, 56, 5, 56, 475, 10, 56, 3, 57, 3, 57, 3, 57, 7, 57, 480, 10, 57, 12, 57, 14, 57, 483, 11, 57, 3, 57, 5, 57, 486, 10, 57, 3, 57, 3, 57, 6, 57, 490, 10, 57, 13, 57, 14, 57, 491, 3, 57, 5, 57, 495, 10, 57, 3, 57, 3, 57, 5, 57, 499, 10, 57, 5, 57, 501, 10, 57, 3, 58, 3, 58, 3, 58, 6, 58, 506, 10, 58, 13, 58, 14, 58, 507, 3, 59, 3, 59, 6, 59, 512, 10, 59, 13, 59, 14, 59, 513, 3, 59, 3, 59, 3, 60, 3, 60, 3, 60, 6, 60, 521, 10, 60, 13, 60, 14, 60, 522, 3, 61, 3, 61, 3, 61, 6, 61, 528, 10, 61, 13, 61, 14, 61, 529, 3, 62, 3, 62, 3, 62, 3, 62, 3, 62, 3, 62, 3, 63, 3, 63, 3, 63, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 67, 3, 67, 3, 67, 3, 67, 3, 67, 3, 68, 3, 68, 3, 68, 3, 68, 3, 69, 3, 69, 3, 69, 3, 69, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 72, 3, 72, 3, 72, 3, 72, 3, 72, 3, 72, 3, 72, 3, 73, 3, 73, 3, 73, 3, 73, 3, 73, 3, 74, 3, 74, 3, 74, 3, 74, 3, 74, 3, 74, 3, 74, 3, 74, 3, 74, 3, 75, 3, 75, 3, 75, 3, 75, 3, 76, 3, 76, 3, 76, 3, 76, 3, 76, 3, 76, 3, 76, 3, 77, 3, 77, 3, 77, 3, 77, 3, 77, 3, 77, 3, 78, 3, 78, 3, 78, 3, 78, 3, 78, 3, 78, 3, 78, 3, 78, 3, 78, 3, 79, 3, 79, 3, 79, 3, 79, 3, 79, 3, 79, 3, 79, 3, 79, 3, 79, 3, 80, 3, 80, 3, 80, 3, 80, 3, 80, 3, 81, 3, 81, 3, 81, 3, 81, 3, 81, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 83, 3, 83, 3, 83, 3, 84, 3, 84, 3, 84, 3, 84, 3, 84, 3, 84, 3, 85, 3, 85, 3, 85, 3, 85, 3, 85, 3, 85, 3, 85, 3, 86, 3, 86, 3, 86, 3, 87, 3, 87, 3, 87, 3, 87, 3, 88, 3, 88, 3, 88, 3, 88, 3, 88, 3, 88, 3, 89, 3, 89, 3, 90, 3, 90, 3, 90, 3, 90, 3, 90, 3, 90, 3, 90, 3, 90, 3, 90, 3, 90, 3, 90, 3, 90, 3, 90, 3, 90, 3, 91, 3, 91, 3, 91, 3, 91, 3, 91, 3, 91, 3, 91, 3, 91, 3, 91, 3, 91, 3, 91, 3, 91, 3, 91, 3, 92, 3, 92, 3, 92, 3, 92, 3, 92, 3, 92, 3, 92, 3, 92, 3, 92, 3, 92, 3, 93, 3, 93, 3, 93, 3, 93, 3, 93, 3, 93, 3, 94, 3, 94, 3, 94, 3, 94, 3, 94, 3, 95, 3, 95, 3, 95, 3, 95, 3, 95, 3, 95, 3, 95, 3, 95, 3, 96, 3, 96, 3, 96, 3, 96, 3, 96, 3, 96, 3, 97, 3, 97, 3, 97, 3, 97, 3, 97, 3, 97, 3, 98, 3, 98, 3, 98, 3, 98, 3, 98, 3, 98, 3, 98, 3, 99, 3, 99, 3, 99, 3, 99, 3, 99, 3, 99, 3, 99, 3, 100, 3, 100, 3, 100, 3, 100, 3, 100, 3, 100, 3, 100, 3, 100, 3, 100, 3, 101, 3, 101, 3, 101, 3, 101, 3, 101, 3, 101, 3, 101, 3, 102, 3, 102, 3, 102, 3, 102, 3, 102, 3, 102, 3, 102, 3, 103, 3, 103, 3, 103, 3, 103, 3, 103, 3, 103, 3, 103, 3, 103, 3, 103, 3, 103, 3, 103, 3, 103, 3, 103, 3, 104, 3, 104, 3, 104, 3, 104, 3, 104, 3, 104, 3, 105, 3, 105, 3, 105, 3, 105, 3, 105, 3, 105, 3, 105, 3, 105, 3, 105, 3, 105, 3, 106, 3, 106, 3, 106, 3, 106, 3, 106, 3, 106, 3, 106, 3, 106, 3, 106, 3, 107, 3, 107, 3, 107, 3, 107, 3, 107, 3, 107, 3, 107, 3, 107, 3, 107, 3, 107, 3, 107, 3, 107, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 3, 109, 3, 109, 3, 109, 3, 109, 3, 109, 3, 109, 3, 109, 3, 109, 3, 109, 3, 109, 3, 109, 3, 109, 3, 110, 3, 110, 3, 110, 3, 110, 3, 110, 3, 110, 3, 110, 3, 110, 3, 110, 3, 111, 3, 111, 3, 111, 3, 111, 3, 111, 3, 111, 3, 111, 3, 111, 3, 112, 3, 112, 7, 112, 892, 10, 112, 12, 112, 14, 112, 895, 11, 112, 3, 113, 3, 113, 7, 113, 899, 10, 113, 12, 113, 14, 113, 902, 11, 113, 3, 113, 3, 113, 3, 113, 7, 113, 907, 10, 113, 12, 113, 14, 113, 910, 11, 113, 3, 113, 5, 113, 913, 10, 113, 3, 113, 3, 113, 3, 114, 3, 114, 3, 114, 3, 114, 7, 114, 921, 10, 114, 12, 114, 14, 114, 924, 11, 114, 3, 114, 3, 114, 3, 115, 6, 115, 929, 10, 115, 13, 115, 14, 115, 930, 3, 115, 3, 115, 3, 116, 3, 116, 3, 116, 3, 116, 3, 117, 3, 117, 3, 117, 3, 117, 3, 117, 3, 117, 7, 117, 945, 10, 117, 12, 117, 14, 117, 948, 11, 117, 3, 117, 3, 117, 3, 117, 3, 117, 3, 117, 3, 117, 3, 118, 3, 118, 3, 118, 3, 118, 3, 118, 3, 118, 3, 118, 3, 118, 3, 118, 3, 118, 3, 118, 7, 118, 967, 10, 118, 12, 118, 14, 118, 970, 11, 118, 3, 118, 3, 118, 3, 118, 3, 118, 3, 118, 3, 118, 3, 119, 3, 119, 3, 119, 3, 119, 3, 120, 3, 120, 3, 120, 3, 120, 5, 120, 986, 10, 120, 3, 121, 3, 121, 3, 121, 3, 121, 5, 121, 992, 10, 121, 3, 122, 3, 122, 3, 122, 3, 122, 3, 122, 5, 122, 999, 10, 122, 3, 123, 3, 123, 5, 123, 1003, 10, 123, 3, 124, 3, 124, 3, 124, 3, 124, 3, 125, 3, 125, 3, 125, 3, 125, 3, 125, 3, 125, 3, 126, 3, 126, 3, 126, 6, 126, 1018, 10, 126, 13, 126, 14, 126, 1019, 3, 126, 3, 126, 3, 127, 3, 127, 3, 128, 3, 128, 3, 129, 3, 129, 5, 129, 1030, 10, 129, 3, 130, 3, 130, 3, 130, 3, 131, 3, 131, 3, 132, 3, 132, 3, 132, 7, 132, 1040, 10, 132, 12, 132, 14, 132, 1043, 11, 132, 5, 132, 1045, 10, 132, 3, 133, 3, 133, 5, 133, 1049, 10, 133, 3, 133, 6, 133, 1052, 10, 133, 13, 133, 14, 133, 1053, 3, 134, 3, 134, 3, 134, 3, 134, 3, 134, 5, 134, 1061, 10, 134, 3, 135, 3, 135, 3, 135, 3, 135, 5, 135, 1067, 10, 135, 3, 136, 5, 136, 1070, 10, 136, 3, 137, 5, 137, 1073, 10, 137, 3, 138, 5, 138, 1076, 10, 138, 3, 139, 5, 139, 1079, 10, 139, 3, 140, 3, 140, 3, 140, 3, 140, 7, 140, 1085, 10, 140, 12, 140, 14, 140, 1088, 11, 140, 3, 140, 5, 140, 1091, 10, 140, 3, 141, 3, 141, 5, 141, 1095, 10, 141, 3, 142, 3, 142, 3, 142, 5, 291, 946, 968, 2, 143, 3, 3, 5, 4, 7, 5, 9, 6, 11, 7, 13, 8, 15, 9, 17, 10, 19, 11, 21, 12, 23, 13, 25, 14, 27, 15, 29, 16, 31, 17, 33, 18, 35, 19, 37, 20, 39, 21, 41, 22, 43, 23, 45, 24, 47, 25, 49, 26, 51, 27, 53, 28, 55, 29, 57, 30, 59, 31, 61, 32, 63, 33, 65, 34, 67, 35, 69, 36, 71, 37, 73, 38, 75, 39, 77, 40, 79, 41, 81, 42, 83, 43, 85, 44, 87, 45, 89, 46, 91, 47, 93, 48, 95, 49, 97, 50, 99, 51, 101, 52, 103, 53, 105, 54, 107, 55, 109, 56, 111, 57, 113, 58, 115, 59, 117, 60, 119, 61, 121, 62, 123, 63, 125, 64, 127, 65, 129, 66, 131, 67, 133, 68, 135, 69, 137, 70, 139, 71, 141, 72, 143, 73, 145, 74, 147, 75, 149, 76, 151, 77, 153, 78, 155, 79, 157, 80, 159, 81, 161, 82, 163, 83, 165, 84, 167, 85, 169, 86, 171, 87, 173, 88, 175, 89, 177, 90, 179, 91, 181, 92, 183, 93, 185, 94, 187, 95, 189, 96, 191, 97, 193, 98, 195, 99, 197, 100, 199, 101, 201, 102, 203, 103, 205, 104, 207, 105, 209, 106, 211, 107, 213, 108, 215, 109, 217, 110, 219, 111, 221, 112, 223, 113, 225, 114, 227, 115, 229, 116, 231, 117, 233, 118, 235, 119, 237, 120, 239, 2, 241, 2, 243, 2, 245, 2, 247, 2, 249, 2, 251, 2, 253, 2, 255, 2, 257, 2, 259, 2, 261, 2, 263, 2, 265, 2, 267, 2, 269, 2, 271, 2, 273, 2, 275, 2, 277, 2, 279, 2, 281, 2, 283, 2, 3, 2, 27, 5, 2, 12, 12, 15, 15, 8234, 8235, 3, 2, 50, 59, 4, 2, 90, 90, 122, 122, 3, 2, 50, 57, 4, 2, 81, 81, 113, 113, 4, 2, 68, 68, 100, 100, 3, 2, 50, 51, 3, 2, 98, 98, 6, 2, 11, 11, 13, 14, 34, 34, 162, 162, 6, 2, 12, 12, 15, 15, 36, 36, 94, 94, 6, 2, 12, 12, 15, 15, 41, 41, 94, 94, 11, 2, 36, 36, 41, 41, 94, 94, 100, 100, 104, 104, 112, 112, 116, 116, 118, 118, 120, 120, 14, 2, 12, 12, 15, 15, 36, 36, 41, 41, 50, 59, 94, 94, 100, 100, 104, 104, 112, 112, 116, 116, 118, 120, 122, 122, 5, 2, 50, 59, 119, 119, 122, 122, 5, 2, 50, 59, 67, 72, 99, 104, 3, 2, 51, 59, 4, 2, 71, 71, 103, 103, 4, 2, 45, 45, 47, 47, 4, 2, 38, 38, 97, 97, 260, 2, 67, 92, 99, 124, 172, 172, 183, 183, 188, 188, 194, 216, 218, 248, 250, 545, 548, 565, 594, 687, 690, 698, 701, 707, 722, 723, 738, 742, 752, 752, 892, 892, 904, 904, 906, 908, 910, 910, 912, 931, 933, 976, 978, 985, 988, 1013, 1026, 1155, 1166, 1222, 1225, 1226, 1229, 1230, 1234, 1271, 1274, 1275, 1331, 1368, 1371, 1371, 1379, 1417, 1490, 1516, 1522, 1524, 1571, 1596, 1602, 1612, 1651, 1749, 1751, 1751, 1767, 1768, 1788, 1790, 1810, 1810, 1812, 1838, 1922, 1959, 2311, 2363, 2367, 2367, 2386, 2386, 2394, 2403, 2439, 2446, 2449, 2450, 2453, 2474, 2476, 2482, 2484, 2484, 2488, 2491, 2526, 2527, 2529, 2531, 2546, 2547, 2567, 2572, 2577, 2578, 2581, 2602, 2604, 2610, 2612, 2613, 2615, 2616, 2618, 2619, 2651, 2654, 2656, 2656, 2676, 2678, 2695, 2701, 2703, 2703, 2705, 2707, 2709, 2730, 2732, 2738, 2740, 2741, 2743, 2747, 2751, 2751, 2770, 2770, 2786, 2786, 2823, 2830, 2833, 2834, 2837, 2858, 2860, 2866, 2868, 2869, 2872, 2875, 2879, 2879, 2910, 2911, 2913, 2915, 2951, 2956, 2960, 2962, 2964, 2967, 2971, 2972, 2974, 2974, 2976, 2977, 2981, 2982, 2986, 2988, 2992, 2999, 3001, 3003, 3079, 3086, 3088, 3090, 3092, 3114, 3116, 3125, 3127, 3131, 3170, 3171, 3207, 3214, 3216, 3218, 3220, 3242, 3244, 3253, 3255, 3259, 3296, 3296, 3298, 3299, 3335, 3342, 3344, 3346, 3348, 3370, 3372, 3387, 3426, 3427, 3463, 3480, 3484, 3507, 3509, 3517, 3519, 3519, 3522, 3528, 3587, 3634, 3636, 3637, 3650, 3656, 3715, 3716, 3718, 3718, 3721, 3722, 3724, 3724, 3727, 3727, 3734, 3737, 3739, 3745, 3747, 3749, 3751, 3751, 3753, 3753, 3756, 3757, 3759, 3762, 3764, 3765, 3775, 3782, 3784, 3784, 3806, 3807, 3842, 3842, 3906, 3948, 3978, 3981, 4098, 4131, 4133, 4137, 4139, 4140, 4178, 4183, 4258, 4295, 4306, 4344, 4354, 4443, 4449, 4516, 4522, 4603, 4610, 4616, 4618, 4680, 4682, 4682, 4684, 4687, 4690, 4696, 4698, 4698, 4700, 4703, 4706, 4744, 4746, 4746, 4748, 4751, 4754, 4784, 4786, 4786, 4788, 4791, 4794, 4800, 4802, 4802, 4804, 4807, 4810, 4816, 4818, 4824, 4826, 4848, 4850, 4880, 4882, 4882, 4884, 4887, 4890, 4896, 4898, 4936, 4938, 4956, 5026, 5110, 5123, 5752, 5763, 5788, 5794, 5868, 6018, 6069, 6178, 6265, 6274, 6314, 7682, 7837, 7842, 7931, 7938, 7959, 7962, 7967, 7970, 8007, 8010, 8015, 8018, 8025, 8027, 8027, 8029, 8029, 8031, 8031, 8033, 8063, 8066, 8118, 8120, 8126, 8128, 8128, 8132, 8134, 8136, 8142, 8146, 8149, 8152, 8157, 8162, 8174, 8180, 8182, 8184, 8190, 8321, 8321, 8452, 8452, 8457, 8457, 8460, 8469, 8471, 8471, 8475, 8479, 8486, 8486, 8488, 8488, 8490, 8490, 8492, 8495, 8497, 8499, 8501, 8507, 8546, 8581, 12295, 12297, 12323, 12331, 12339, 12343, 12346, 12348, 12355, 12438, 12447, 12448, 12451, 12540, 12542, 12544, 12551, 12590, 12595, 12688, 12706, 12729, 13314, 13314, 19895, 19895, 19970, 19970, 40871, 40871, 40962, 42126, 44034, 44034, 55205, 55205, 63746, 64047, 64258, 64264, 64277, 64281, 64287, 64287, 64289, 64298, 64300, 64312, 64314, 64318, 64320, 64320, 64322, 64323, 64325, 64326, 64328, 64435, 64469, 64831, 64850, 64913, 64916, 64969, 65010, 65021, 65138, 65140, 65142, 65142, 65144, 65278, 65315, 65340, 65347, 65372, 65384, 65472, 65476, 65481, 65484, 65489, 65492, 65497, 65500, 65502, 102, 2, 770, 848, 866, 868, 1157, 1160, 1427, 1443, 1445, 1467, 1469, 1471, 1473, 1473, 1475, 1476, 1478, 1478, 1613, 1623, 1650, 1650, 1752, 1758, 1761, 1766, 1769, 1770, 1772, 1775, 1811, 1811, 1842, 1868, 1960, 1970, 2307, 2309, 2366, 2366, 2368, 2383, 2387, 2390, 2404, 2405, 2435, 2437, 2494, 2502, 2505, 2506, 2509, 2511, 2521, 2521, 2532, 2533, 2564, 2564, 2622, 2622, 2624, 2628, 2633, 2634, 2637, 2639, 2674, 2675, 2691, 2693, 2750, 2750, 2752, 2759, 2761, 2763, 2765, 2767, 2819, 2821, 2878, 2878, 2880, 2885, 2889, 2890, 2893, 2895, 2904, 2905, 2948, 2949, 3008, 3012, 3016, 3018, 3020, 3023, 3033, 3033, 3075, 3077, 3136, 3142, 3144, 3146, 3148, 3151, 3159, 3160, 3204, 3205, 3264, 3270, 3272, 3274, 3276, 3279, 3287, 3288, 3332, 3333, 3392, 3397, 3400, 3402, 3404, 3407, 3417, 3417, 3460, 3461, 3532, 3532, 3537, 3542, 3544, 3544, 3546, 3553, 3572, 3573, 3635, 3635, 3638, 3644, 3657, 3664, 3763, 3763, 3766, 3771, 3773, 3774, 3786, 3791, 3866, 3867, 3895, 3895, 3897, 3897, 3899, 3899, 3904, 3905, 3955, 3974, 3976, 3977, 3986, 3993, 3995, 4030, 4040, 4040, 4142, 4148, 4152, 4155, 4184, 4187, 6070, 6101, 6315, 6315, 8402, 8414, 8419, 8419, 12332, 12337, 12443, 12444, 64288, 64288, 65058, 65061, 22, 2, 50, 59, 1634, 1643, 1778, 1787, 2408, 2417, 2536, 2545, 2664, 2673, 2792, 2801, 2920, 2929, 3049, 3057, 3176, 3185, 3304, 3313, 3432, 3441, 3666, 3675, 3794, 3803, 3874, 3883, 4162, 4171, 4971, 4979, 6114, 6123, 6162, 6171, 65298, 65307, 9, 2, 97, 97, 8257, 8258, 12541, 12541, 65077, 65078, 65103, 65105, 65345, 65345, 65383, 65383, 7, 2, 12, 12, 15, 15, 49, 49, 93, 94, 8234, 8235, 6, 2, 12, 12, 15, 15, 94, 95, 8234, 8235, 2, 1125, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2, 31, 3, 2, 2, 2, 2, 33, 3, 2, 2, 2, 2, 35, 3, 2, 2, 2, 2, 37, 3, 2, 2, 2, 2, 39, 3, 2, 2, 2, 2, 41, 3, 2, 2, 2, 2, 43, 3, 2, 2, 2, 2, 45, 3, 2, 2, 2, 2, 47, 3, 2, 2, 2, 2, 49, 3, 2, 2, 2, 2, 51, 3, 2, 2, 2, 2, 53, 3, 2, 2, 2, 2, 55, 3, 2, 2, 2, 2, 57, 3, 2, 2, 2, 2, 59, 3, 2, 2, 2, 2, 61, 3, 2, 2, 2, 2, 63, 3, 2, 2, 2, 2, 65, 3, 2, 2, 2, 2, 67, 3, 2, 2, 2, 2, 69, 3, 2, 2, 2, 2, 71, 3, 2, 2, 2, 2, 73, 3, 2, 2, 2, 2, 75, 3, 2, 2, 2, 2, 77, 3, 2, 2, 2, 2, 79, 3, 2, 2, 2, 2, 81, 3, 2, 2, 2, 2, 83, 3, 2, 2, 2, 2, 85, 3, 2, 2, 2, 2, 87, 3, 2, 2, 2, 2, 89, 3, 2, 2, 2, 2, 91, 3, 2, 2, 2, 2, 93, 3, 2, 2, 2, 2, 95, 3, 2, 2, 2, 2, 97, 3, 2, 2, 2, 2, 99, 3, 2, 2, 2, 2, 101, 3, 2, 2, 2, 2, 103, 3, 2, 2, 2, 2, 105, 3, 2, 2, 2, 2, 107, 3, 2, 2, 2, 2, 109, 3, 2, 2, 2, 2, 111, 3, 2, 2, 2, 2, 113, 3, 2, 2, 2, 2, 115, 3, 2, 2, 2, 2, 117, 3, 2, 2, 2, 2, 119, 3, 2, 2, 2, 2, 121, 3, 2, 2, 2, 2, 123, 3, 2, 2, 2, 2, 125, 3, 2, 2, 2, 2, 127, 3, 2, 2, 2, 2, 129, 3, 2, 2, 2, 2, 131, 3, 2, 2, 2, 2, 133, 3, 2, 2, 2, 2, 135, 3, 2, 2, 2, 2, 137, 3, 2, 2, 2, 2, 139, 3, 2, 2, 2, 2, 141, 3, 2, 2, 2, 2, 143, 3, 2, 2, 2, 2, 145, 3, 2, 2, 2, 2, 147, 3, 2, 2, 2, 2, 149, 3, 2, 2, 2, 2, 151, 3, 2, 2, 2, 2, 153, 3, 2, 2, 2, 2, 155, 3, 2, 2, 2, 2, 157, 3, 2, 2, 2, 2, 159, 3, 2, 2, 2, 2, 161, 3, 2, 2, 2, 2, 163, 3, 2, 2, 2, 2, 165, 3, 2, 2, 2, 2, 167, 3, 2, 2, 2, 2, 169, 3, 2, 2, 2, 2, 171, 3, 2, 2, 2, 2, 173, 3, 2, 2, 2, 2, 175, 3, 2, 2, 2, 2, 177, 3, 2, 2, 2, 2, 179, 3, 2, 2, 2, 2, 181, 3, 2, 2, 2, 2, 183, 3, 2, 2, 2, 2, 185, 3, 2, 2, 2, 2, 187, 3, 2, 2, 2, 2, 189, 3, 2, 2, 2, 2, 191, 3, 2, 2, 2, 2, 193, 3, 2, 2, 2, 2, 195, 3, 2, 2, 2, 2, 197, 3, 2, 2, 2, 2, 199, 3, 2, 2, 2, 2, 201, 3, 2, 2, 2, 2, 203, 3, 2, 2, 2, 2, 205, 3, 2, 2, 2, 2, 207, 3, 2, 2, 2, 2, 209, 3, 2, 2, 2, 2, 211, 3, 2, 2, 2, 2, 213, 3, 2, 2, 2, 2, 215, 3, 2, 2, 2, 2, 217, 3, 2, 2, 2, 2, 219, 3, 2, 2, 2, 2, 221, 3, 2, 2, 2, 2, 223, 3, 2, 2, 2, 2, 225, 3, 2, 2, 2, 2, 227, 3, 2, 2, 2, 2, 229, 3, 2, 2, 2, 2, 231, 3, 2, 2, 2, 2, 233, 3, 2, 2, 2, 2, 235, 3, 2, 2, 2, 2, 237, 3, 2, 2, 2, 3, 285, 3, 2, 2, 2, 5, 299, 3, 2, 2, 2, 7, 310, 3, 2, 2, 2, 9, 324, 3, 2, 2, 2, 11, 326, 3, 2, 2, 2, 13, 328, 3, 2, 2, 2, 15, 330, 3, 2, 2, 2, 17, 332, 3, 2, 2, 2, 19, 335, 3, 2, 2, 2, 21, 338, 3, 2, 2, 2, 23, 340, 3, 2, 2, 2, 25, 342, 3, 2, 2, 2, 27, 344, 3, 2, 2, 2, 29, 346, 3, 2, 2, 2, 31, 348, 3, 2, 2, 2, 33, 352, 3, 2, 2, 2, 35, 354, 3, 2, 2, 2, 37, 357, 3, 2, 2, 2, 39, 360, 3, 2, 2, 2, 41, 362, 3, 2, 2, 2, 43, 364, 3, 2, 2, 2, 45, 366, 3, 2, 2, 2, 47, 368, 3, 2, 2, 2, 49, 370, 3, 2, 2, 2, 51, 372, 3, 2, 2, 2, 53, 374, 3, 2, 2, 2, 55, 377, 3, 2, 2, 2, 57, 380, 3, 2, 2, 2, 59, 384, 3, 2, 2, 2, 61, 386, 3, 2, 2, 2, 63, 388, 3, 2, 2, 2, 65, 391, 3, 2, 2, 2, 67, 394, 3, 2, 2, 2, 69, 397, 3, 2, 2, 2, 71, 400, 3, 2, 2, 2, 73, 404, 3, 2, 2, 2, 75, 408, 3, 2, 2, 2, 77, 410, 3, 2, 2, 2, 79, 412, 3, 2, 2, 2, 81, 414, 3, 2, 2, 2, 83, 417, 3, 2, 2, 2, 85, 420, 3, 2, 2, 2, 87, 423, 3, 2, 2, 2, 89, 426, 3, 2, 2, 2, 91, 429, 3, 2, 2, 2, 93, 432, 3, 2, 2, 2, 95, 435, 3, 2, 2, 2, 97, 439, 3, 2, 2, 2, 99, 443, 3, 2, 2, 2, 101, 448, 3, 2, 2, 2, 103, 451, 3, 2, 2, 2, 105, 454, 3, 2, 2, 2, 107, 457, 3, 2, 2, 2, 109, 460, 3, 2, 2, 2, 111, 474, 3, 2, 2, 2, 113, 500, 3, 2, 2, 2, 115, 502, 3, 2, 2, 2, 117, 509, 3, 2, 2, 2, 119, 517, 3, 2, 2, 2, 121, 524, 3, 2, 2, 2, 123, 531, 3, 2, 2, 2, 125, 537, 3, 2, 2, 2, 127, 540, 3, 2, 2, 2, 129, 551, 3, 2, 2, 2, 131, 558, 3, 2, 2, 2, 133, 563, 3, 2, 2, 2, 135, 568, 3, 2, 2, 2, 137, 572, 3, 2, 2, 2, 139, 576, 3, 2, 2, 2, 141, 582, 3, 2, 2, 2, 143, 590, 3, 2, 2, 2, 145, 597, 3, 2, 2, 2, 147, 602, 3, 2, 2, 2, 149, 611, 3, 2, 2, 2, 151, 615, 3, 2, 2, 2, 153, 622, 3, 2, 2, 2, 155, 628, 3, 2, 2, 2, 157, 637, 3, 2, 2, 2, 159, 646, 3, 2, 2, 2, 161, 651, 3, 2, 2, 2, 163, 656, 3, 2, 2, 2, 165, 664, 3, 2, 2, 2, 167, 667, 3, 2, 2, 2, 169, 673, 3, 2, 2, 2, 171, 680, 3, 2, 2, 2, 173, 683, 3, 2, 2, 2, 175, 687, 3, 2, 2, 2, 177, 693, 3, 2, 2, 2, 179, 695, 3, 2, 2, 2, 181, 709, 3, 2, 2, 2, 183, 722, 3, 2, 2, 2, 185, 732, 3, 2, 2, 2, 187, 738, 3, 2, 2, 2, 189, 743, 3, 2, 2, 2, 191, 751, 3, 2, 2, 2, 193, 757, 3, 2, 2, 2, 195, 763, 3, 2, 2, 2, 197, 770, 3, 2, 2, 2, 199, 777, 3, 2, 2, 2, 201, 786, 3, 2, 2, 2, 203, 793, 3, 2, 2, 2, 205, 800, 3, 2, 2, 2, 207, 813, 3, 2, 2, 2, 209, 819, 3, 2, 2, 2, 211, 829, 3, 2, 2, 2, 213, 838, 3, 2, 2, 2, 215, 850, 3, 2, 2, 2, 217, 860, 3, 2, 2, 2, 219, 872, 3, 2, 2, 2, 221, 881, 3, 2, 2, 2, 223, 889, 3, 2, 2, 2, 225, 912, 3, 2, 2, 2, 227, 916, 3, 2, 2, 2, 229, 928, 3, 2, 2, 2, 231, 934, 3, 2, 2, 2, 233, 938, 3, 2, 2, 2, 235, 955, 3, 2, 2, 2, 237, 977, 3, 2, 2, 2, 239, 985, 3, 2, 2, 2, 241, 991, 3, 2, 2, 2, 243, 998, 3, 2, 2, 2, 245, 1002, 3, 2, 2, 2, 247, 1004, 3, 2, 2, 2, 249, 1008, 3, 2, 2, 2, 251, 1014, 3, 2, 2, 2, 253, 1023, 3, 2, 2, 2, 255, 1025, 3, 2, 2, 2, 257, 1029, 3, 2, 2, 2, 259, 1031, 3, 2, 2, 2, 261, 1034, 3, 2, 2, 2, 263, 1044, 3, 2, 2, 2, 265, 1046, 3, 2, 2, 2, 267, 1060, 3, 2, 2, 2, 269, 1066, 3, 2, 2, 2, 271, 1069, 3, 2, 2, 2, 273, 1072, 3, 2, 2, 2, 275, 1075, 3, 2, 2, 2, 277, 1078, 3, 2, 2, 2, 279, 1090, 3, 2, 2, 2, 281, 1094, 3, 2, 2, 2, 283, 1096, 3, 2, 2, 2, 285, 286, 7, 49, 2, 2, 286, 287, 7, 44, 2, 2, 287, 291, 3, 2, 2, 2, 288, 290, 11, 2, 2, 2, 289, 288, 3, 2, 2, 2, 290, 293, 3, 2, 2, 2, 291, 292, 3, 2, 2, 2, 291, 289, 3, 2, 2, 2, 292, 294, 3, 2, 2, 2, 293, 291, 3, 2, 2, 2, 294, 295, 7, 44, 2, 2, 295, 296, 7, 49, 2, 2, 296, 297, 3, 2, 2, 2, 297, 298, 8, 2, 2, 2, 298, 4, 3, 2, 2, 2, 299, 300, 7, 49, 2, 2, 300, 301, 7, 49, 2, 2, 301, 305, 3, 2, 2, 2, 302, 304, 10, 2, 2, 2, 303, 302, 3, 2, 2, 2, 304, 307, 3, 2, 2, 2, 305, 303, 3, 2, 2, 2, 305, 306, 3, 2, 2, 2, 306, 308, 3, 2, 2, 2, 307, 305, 3, 2, 2, 2, 308, 309, 8, 3, 2, 2, 309, 6, 3, 2, 2, 2, 310, 312, 7, 49, 2, 2, 311, 313, 5, 279, 140, 2, 312, 311, 3, 2, 2, 2, 313, 314, 3, 2, 2, 2, 314, 312, 3, 2, 2, 2, 314, 315, 3, 2, 2, 2, 315, 316, 3, 2, 2, 2, 316, 317, 6, 4, 2, 2, 317, 321, 7, 49, 2, 2, 318, 320, 5, 267, 134, 2, 319, 318, 3, 2, 2, 2, 320, 323, 3, 2, 2, 2, 321, 319, 3, 2, 2, 2, 321, 322, 3, 2, 2, 2, 322, 8, 3, 2, 2, 2, 323, 321, 3, 2, 2, 2, 324, 325, 7, 93, 2, 2, 325, 10, 3, 2, 2, 2, 326, 327, 7, 95, 2, 2, 327, 12, 3, 2, 2, 2, 328, 329, 7, 42, 2, 2, 329, 14, 3, 2, 2, 2, 330, 331, 7, 43, 2, 2, 331, 16, 3, 2, 2, 2, 332, 333, 7, 125, 2, 2, 333, 334, 8, 9, 3, 2, 334, 18, 3, 2, 2, 2, 335, 336, 7, 127, 2, 2, 336, 337, 8, 10, 4, 2, 337, 20, 3, 2, 2, 2, 338, 339, 7, 61, 2, 2, 339, 22, 3, 2, 2, 2, 340, 341, 7, 46, 2, 2, 341, 24, 3, 2, 2, 2, 342, 343, 7, 63, 2, 2, 343, 26, 3, 2, 2, 2, 344, 345, 7, 65, 2, 2, 345, 28, 3, 2, 2, 2, 346, 347, 7, 60, 2, 2, 347, 30, 3, 2, 2, 2, 348, 349, 7, 48, 2, 2, 349, 350, 7, 48, 2, 2, 350, 351, 7, 48, 2, 2, 351, 32, 3, 2, 2, 2, 352, 353, 7, 48, 2, 2, 353, 34, 3, 2, 2, 2, 354, 355, 7, 45, 2, 2, 355, 356, 7, 45, 2, 2, 356, 36, 3, 2, 2, 2, 357, 358, 7, 47, 2, 2, 358, 359, 7, 47, 2, 2, 359, 38, 3, 2, 2, 2, 360, 361, 7, 45, 2, 2, 361, 40, 3, 2, 2, 2, 362, 363, 7, 47, 2, 2, 363, 42, 3, 2, 2, 2, 364, 365, 7, 128, 2, 2, 365, 44, 3, 2, 2, 2, 366, 367, 7, 35, 2, 2, 367, 46, 3, 2, 2, 2, 368, 369, 7, 44, 2, 2, 369, 48, 3, 2, 2, 2, 370, 371, 7, 49, 2, 2, 371, 50, 3, 2, 2, 2, 372, 373, 7, 39, 2, 2, 373, 52, 3, 2, 2, 2, 374, 375, 7, 64, 2, 2, 375, 376, 7, 64, 2, 2, 376, 54, 3, 2, 2, 2, 377, 378, 7, 62, 2, 2, 378, 379, 7, 62, 2, 2, 379, 56, 3, 2, 2, 2, 380, 381, 7, 64, 2, 2, 381, 382, 7, 64, 2, 2, 382, 383, 7, 64, 2, 2, 383, 58, 3, 2, 2, 2, 384, 385, 7, 62, 2, 2, 385, 60, 3, 2, 2, 2, 386, 387, 7, 64, 2, 2, 387, 62, 3, 2, 2, 2, 388, 389, 7, 62, 2, 2, 389, 390, 7, 63, 2, 2, 390, 64, 3, 2, 2, 2, 391, 392, 7, 64, 2, 2, 392, 393, 7, 63, 2, 2, 393, 66, 3, 2, 2, 2, 394, 395, 7, 63, 2, 2, 395, 396, 7, 63, 2, 2, 396, 68, 3, 2, 2, 2, 397, 398, 7, 35, 2, 2, 398, 399, 7, 63, 2, 2, 399, 70, 3, 2, 2, 2, 400, 401, 7, 63, 2, 2, 401, 402, 7, 63, 2, 2, 402, 403, 7, 63, 2, 2, 403, 72, 3, 2, 2, 2, 404, 405, 7, 35, 2, 2, 405, 406, 7, 63, 2, 2, 406, 407, 7, 63, 2, 2, 407, 74, 3, 2, 2, 2, 408, 409, 7, 40, 2, 2, 409, 76, 3, 2, 2, 2, 410, 411, 7, 96, 2, 2, 411, 78, 3, 2, 2, 2, 412, 413, 7, 126, 2, 2, 413, 80, 3, 2, 2, 2, 414, 415, 7, 40, 2, 2, 415, 416, 7, 40, 2, 2, 416, 82, 3, 2, 2, 2, 417, 418, 7, 126, 2, 2, 418, 419, 7, 126, 2, 2, 419, 84, 3, 2, 2, 2, 420, 421, 7, 44, 2, 2, 421, 422, 7, 63, 2, 2, 422, 86, 3, 2, 2, 2, 423, 424, 7, 49, 2, 2, 424, 425, 7, 63, 2, 2, 425, 88, 3, 2, 2, 2, 426, 427, 7, 39, 2, 2, 427, 428, 7, 63, 2, 2, 428, 90, 3, 2, 2, 2, 429, 430, 7, 45, 2, 2, 430, 431, 7, 63, 2, 2, 431, 92, 3, 2, 2, 2, 432, 433, 7, 47, 2, 2, 433, 434, 7, 63, 2, 2, 434, 94, 3, 2, 2, 2, 435, 436, 7, 62, 2, 2, 436, 437, 7, 62, 2, 2, 437, 438, 7, 63, 2, 2, 438, 96, 3, 2, 2, 2, 439, 440, 7, 64, 2, 2, 440, 441, 7, 64, 2, 2, 441, 442, 7, 63, 2, 2, 442, 98, 3, 2, 2, 2, 443, 444, 7, 64, 2, 2, 444, 445, 7, 64, 2, 2, 445, 446, 7, 64, 2, 2, 446, 447, 7, 63, 2, 2, 447, 100, 3, 2, 2, 2, 448, 449, 7, 40, 2, 2, 449, 450, 7, 63, 2, 2, 450, 102, 3, 2, 2, 2, 451, 452, 7, 96, 2, 2, 452, 453, 7, 63, 2, 2, 453, 104, 3, 2, 2, 2, 454, 455, 7, 126, 2, 2, 455, 456, 7, 63, 2, 2, 456, 106, 3, 2, 2, 2, 457, 458, 7, 63, 2, 2, 458, 459, 7, 64, 2, 2, 459, 108, 3, 2, 2, 2, 460, 461, 7, 112, 2, 2, 461, 462, 7, 119, 2, 2, 462, 463, 7, 110, 2, 2, 463, 464, 7, 110, 2, 2, 464, 110, 3, 2, 2, 2, 465, 466, 7, 118, 2, 2, 466, 467, 7, 116, 2, 2, 467, 468, 7, 119, 2, 2, 468, 475, 7, 103, 2, 2, 469, 470, 7, 104, 2, 2, 470, 471, 7, 99, 2, 2, 471, 472, 7, 110, 2, 2, 472, 473, 7, 117, 2, 2, 473, 475, 7, 103, 2, 2, 474, 465, 3, 2, 2, 2, 474, 469, 3, 2, 2, 2, 475, 112, 3, 2, 2, 2, 476, 477, 5, 263, 132, 2, 477, 481, 7, 48, 2, 2, 478, 480, 9, 3, 2, 2, 479, 478, 3, 2, 2, 2, 480, 483, 3, 2, 2, 2, 481, 479, 3, 2, 2, 2, 481, 482, 3, 2, 2, 2, 482, 485, 3, 2, 2, 2, 483, 481, 3, 2, 2, 2, 484, 486, 5, 265, 133, 2, 485, 484, 3, 2, 2, 2, 485, 486, 3, 2, 2, 2, 486, 501, 3, 2, 2, 2, 487, 489, 7, 48, 2, 2, 488, 490, 9, 3, 2, 2, 489, 488, 3, 2, 2, 2, 490, 491, 3, 2, 2, 2, 491, 489, 3, 2, 2, 2, 491, 492, 3, 2, 2, 2, 492, 494, 3, 2, 2, 2, 493, 495, 5, 265, 133, 2, 494, 493, 3, 2, 2, 2, 494, 495, 3, 2, 2, 2, 495, 501, 3, 2, 2, 2, 496, 498, 5, 263, 132, 2, 497, 499, 5, 265, 133, 2, 498, 497, 3, 2, 2, 2, 498, 499, 3, 2, 2, 2, 499, 501, 3, 2, 2, 2, 500, 476, 3, 2, 2, 2, 500, 487, 3, 2, 2, 2, 500, 496, 3, 2, 2, 2, 501, 114, 3, 2, 2, 2, 502, 503, 7, 50, 2, 2, 503, 505, 9, 4, 2, 2, 504, 506, 5, 261, 131, 2, 505, 504, 3, 2, 2, 2, 506, 507, 3, 2, 2, 2, 507, 505, 3, 2, 2, 2, 507, 508, 3, 2, 2, 2, 508, 116, 3, 2, 2, 2, 509, 511, 7, 50, 2, 2, 510, 512, 9, 5, 2, 2, 511, 510, 3, 2, 2, 2, 512, 513, 3, 2, 2, 2, 513, 511, 3, 2, 2, 2, 513, 514, 3, 2, 2, 2, 514, 515, 3, 2, 2, 2, 515, 516, 6, 59, 3, 2, 516, 118, 3, 2, 2, 2, 517, 518, 7, 50, 2, 2, 518, 520, 9, 6, 2, 2, 519, 521, 9, 5, 2, 2, 520, 519, 3, 2, 2, 2, 521, 522, 3, 2, 2, 2, 522, 520, 3, 2, 2, 2, 522, 523, 3, 2, 2, 2, 523, 120, 3, 2, 2, 2, 524, 525, 7, 50, 2, 2, 525, 527, 9, 7, 2, 2, 526, 528, 9, 8, 2, 2, 527, 526, 3, 2, 2, 2, 528, 529, 3, 2, 2, 2, 529, 527, 3, 2, 2, 2, 529, 530, 3, 2, 2, 2, 530, 122, 3, 2, 2, 2, 531, 532, 7, 100, 2, 2, 532, 533, 7, 116, 2, 2, 533, 534, 7, 103, 2, 2, 534, 535, 7, 99, 2, 2, 535, 536, 7, 109, 2, 2, 536, 124, 3, 2, 2, 2, 537, 538, 7, 102, 2, 2, 538, 539, 7, 113, 2, 2, 539, 126, 3, 2, 2, 2, 540, 541, 7, 107, 2, 2, 541, 542, 7, 112, 2, 2, 542, 543, 7, 117, 2, 2, 543, 544, 7, 118, 2, 2, 544, 545, 7, 99, 2, 2, 545, 546, 7, 112, 2, 2, 546, 547, 7, 101, 2, 2, 547, 548, 7, 103, 2, 2, 548, 549, 7, 113, 2, 2, 549, 550, 7, 104, 2, 2, 550, 128, 3, 2, 2, 2, 551, 552, 7, 118, 2, 2, 552, 553, 7, 123, 2, 2, 553, 554, 7, 114, 2, 2, 554, 555, 7, 103, 2, 2, 555, 556, 7, 113, 2, 2, 556, 557, 7, 104, 2, 2, 557, 130, 3, 2, 2, 2, 558, 559, 7, 101, 2, 2, 559, 560, 7, 99, 2, 2, 560, 561, 7, 117, 2, 2, 561, 562, 7, 103, 2, 2, 562, 132, 3, 2, 2, 2, 563, 564, 7, 103, 2, 2, 564, 565, 7, 110, 2, 2, 565, 566, 7, 117, 2, 2, 566, 567, 7, 103, 2, 2, 567, 134, 3, 2, 2, 2, 568, 569, 7, 112, 2, 2, 569, 570, 7, 103, 2, 2, 570, 571, 7, 121, 2, 2, 571, 136, 3, 2, 2, 2, 572, 573, 7, 120, 2, 2, 573, 574, 7, 99, 2, 2, 574, 575, 7, 116, 2, 2, 575, 138, 3, 2, 2, 2, 576, 577, 7, 101, 2, 2, 577, 578, 7, 99, 2, 2, 578, 579, 7, 118, 2, 2, 579, 580, 7, 101, 2, 2, 580, 581, 7, 106, 2, 2, 581, 140, 3, 2, 2, 2, 582, 583, 7, 104, 2, 2, 583, 584, 7, 107, 2, 2, 584, 585, 7, 112, 2, 2, 585, 586, 7, 99, 2, 2, 586, 587, 7, 110, 2, 2, 587, 588, 7, 110, 2, 2, 588, 589, 7, 123, 2, 2, 589, 142, 3, 2, 2, 2, 590, 591, 7, 116, 2, 2, 591, 592, 7, 103, 2, 2, 592, 593, 7, 118, 2, 2, 593, 594, 7, 119, 2, 2, 594, 595, 7, 116, 2, 2, 595, 596, 7, 112, 2, 2, 596, 144, 3, 2, 2, 2, 597, 598, 7, 120, 2, 2, 598, 599, 7, 113, 2, 2, 599, 600, 7, 107, 2, 2, 600, 601, 7, 102, 2, 2, 601, 146, 3, 2, 2, 2, 602, 603, 7, 101, 2, 2, 603, 604, 7, 113, 2, 2, 604, 605, 7, 112, 2, 2, 605, 606, 7, 118, 2, 2, 606, 607, 7, 107, 2, 2, 607, 608, 7, 112, 2, 2, 608, 609, 7, 119, 2, 2, 609, 610, 7, 103, 2, 2, 610, 148, 3, 2, 2, 2, 611, 612, 7, 104, 2, 2, 612, 613, 7, 113, 2, 2, 613, 614, 7, 116, 2, 2, 614, 150, 3, 2, 2, 2, 615, 616, 7, 117, 2, 2, 616, 617, 7, 121, 2, 2, 617, 618, 7, 107, 2, 2, 618, 619, 7, 118, 2, 2, 619, 620, 7, 101, 2, 2, 620, 621, 7, 106, 2, 2, 621, 152, 3, 2, 2, 2, 622, 623, 7, 121, 2, 2, 623, 624, 7, 106, 2, 2, 624, 625, 7, 107, 2, 2, 625, 626, 7, 110, 2, 2, 626, 627, 7, 103, 2, 2, 627, 154, 3, 2, 2, 2, 628, 629, 7, 102, 2, 2, 629, 630, 7, 103, 2, 2, 630, 631, 7, 100, 2, 2, 631, 632, 7, 119, 2, 2, 632, 633, 7, 105, 2, 2, 633, 634, 7, 105, 2, 2, 634, 635, 7, 103, 2, 2, 635, 636, 7, 116, 2, 2, 636, 156, 3, 2, 2, 2, 637, 638, 7, 104, 2, 2, 638, 639, 7, 119, 2, 2, 639, 640, 7, 112, 2, 2, 640, 641, 7, 101, 2, 2, 641, 642, 7, 118, 2, 2, 642, 643, 7, 107, 2, 2, 643, 644, 7, 113, 2, 2, 644, 645, 7, 112, 2, 2, 645, 158, 3, 2, 2, 2, 646, 647, 7, 118, 2, 2, 647, 648, 7, 106, 2, 2, 648, 649, 7, 107, 2, 2, 649, 650, 7, 117, 2, 2, 650, 160, 3, 2, 2, 2, 651, 652, 7, 121, 2, 2, 652, 653, 7, 107, 2, 2, 653, 654, 7, 118, 2, 2, 654, 655, 7, 106, 2, 2, 655, 162, 3, 2, 2, 2, 656, 657, 7, 102, 2, 2, 657, 658, 7, 103, 2, 2, 658, 659, 7, 104, 2, 2, 659, 660, 7, 99, 2, 2, 660, 661, 7, 119, 2, 2, 661, 662, 7, 110, 2, 2, 662, 663, 7, 118, 2, 2, 663, 164, 3, 2, 2, 2, 664, 665, 7, 107, 2, 2, 665, 666, 7, 104, 2, 2, 666, 166, 3, 2, 2, 2, 667, 668, 7, 118, 2, 2, 668, 669, 7, 106, 2, 2, 669, 670, 7, 116, 2, 2, 670, 671, 7, 113, 2, 2, 671, 672, 7, 121, 2, 2, 672, 168, 3, 2, 2, 2, 673, 674, 7, 102, 2, 2, 674, 675, 7, 103, 2, 2, 675, 676, 7, 110, 2, 2, 676, 677, 7, 103, 2, 2, 677, 678, 7, 118, 2, 2, 678, 679, 7, 103, 2, 2, 679, 170, 3, 2, 2, 2, 680, 681, 7, 107, 2, 2, 681, 682, 7, 112, 2, 2, 682, 172, 3, 2, 2, 2, 683, 684, 7, 118, 2, 2, 684, 685, 7, 116, 2, 2, 685, 686, 7, 123, 2, 2, 686, 174, 3, 2, 2, 2, 687, 688, 7, 103, 2, 2, 688, 689, 7, 120, 2, 2, 689, 690, 7, 103, 2, 2, 690, 691, 7, 112, 2, 2, 691, 692, 7, 118, 2, 2, 692, 176, 3, 2, 2, 2, 693, 694, 7, 66, 2, 2, 694, 178, 3, 2, 2, 2, 695, 696, 7, 67, 2, 2, 696, 697, 7, 86, 2, 2, 697, 698, 7, 97, 2, 2, 698, 699, 7, 78, 2, 2, 699, 700, 7, 71, 2, 2, 700, 701, 7, 67, 2, 2, 701, 702, 7, 85, 2, 2, 702, 703, 7, 86, 2, 2, 703, 704, 7, 97, 2, 2, 704, 705, 7, 81, 2, 2, 705, 706, 7, 80, 2, 2, 706, 707, 7, 69, 2, 2, 707, 708, 7, 71, 2, 2, 708, 180, 3, 2, 2, 2, 709, 710, 7, 67, 2, 2, 710, 711, 7, 86, 2, 2, 711, 712, 7, 97, 2, 2, 712, 713, 7, 79, 2, 2, 713, 714, 7, 81, 2, 2, 714, 715, 7, 85, 2, 2, 715, 716, 7, 86, 2, 2, 716, 717, 7, 97, 2, 2, 717, 718, 7, 81, 2, 2, 718, 719, 7, 80, 2, 2, 719, 720, 7, 69, 2, 2, 720, 721, 7, 71, 2, 2, 721, 182, 3, 2, 2, 2, 722, 723, 7, 81, 2, 2, 723, 724, 7, 80, 2, 2, 724, 725, 7, 78, 2, 2, 725, 726, 7, 91, 2, 2, 726, 727, 7, 97, 2, 2, 727, 728, 7, 81, 2, 2, 728, 729, 7, 80, 2, 2, 729, 730, 7, 69, 2, 2, 730, 731, 7, 71, 2, 2, 731, 184, 3, 2, 2, 2, 732, 733, 7, 101, 2, 2, 733, 734, 7, 110, 2, 2, 734, 735, 7, 99, 2, 2, 735, 736, 7, 117, 2, 2, 736, 737, 7, 117, 2, 2, 737, 186, 3, 2, 2, 2, 738, 739, 7, 103, 2, 2, 739, 740, 7, 112, 2, 2, 740, 741, 7, 119, 2, 2, 741, 742, 7, 111, 2, 2, 742, 188, 3, 2, 2, 2, 743, 744, 7, 103, 2, 2, 744, 745, 7, 122, 2, 2, 745, 746, 7, 118, 2, 2, 746, 747, 7, 103, 2, 2, 747, 748, 7, 112, 2, 2, 748, 749, 7, 102, 2, 2, 749, 750, 7, 117, 2, 2, 750, 190, 3, 2, 2, 2, 751, 752, 7, 117, 2, 2, 752, 753, 7, 119, 2, 2, 753, 754, 7, 114, 2, 2, 754, 755, 7, 103, 2, 2, 755, 756, 7, 116, 2, 2, 756, 192, 3, 2, 2, 2, 757, 758, 7, 101, 2, 2, 758, 759, 7, 113, 2, 2, 759, 760, 7, 112, 2, 2, 760, 761, 7, 117, 2, 2, 761, 762, 7, 118, 2, 2, 762, 194, 3, 2, 2, 2, 763, 764, 7, 103, 2, 2, 764, 765, 7, 122, 2, 2, 765, 766, 7, 114, 2, 2, 766, 767, 7, 113, 2, 2, 767, 768, 7, 116, 2, 2, 768, 769, 7, 118, 2, 2, 769, 196, 3, 2, 2, 2, 770, 771, 7, 107, 2, 2, 771, 772, 7, 111, 2, 2, 772, 773, 7, 114, 2, 2, 773, 774, 7, 113, 2, 2, 774, 775, 7, 116, 2, 2, 775, 776, 7, 118, 2, 2, 776, 198, 3, 2, 2, 2, 777, 778, 7, 101, 2, 2, 778, 779, 7, 113, 2, 2, 779, 780, 7, 112, 2, 2, 780, 781, 7, 118, 2, 2, 781, 782, 7, 116, 2, 2, 782, 783, 7, 99, 2, 2, 783, 784, 7, 101, 2, 2, 784, 785, 7, 118, 2, 2, 785, 200, 3, 2, 2, 2, 786, 787, 7, 111, 2, 2, 787, 788, 7, 113, 2, 2, 788, 789, 7, 102, 2, 2, 789, 790, 7, 119, 2, 2, 790, 791, 7, 110, 2, 2, 791, 792, 7, 103, 2, 2, 792, 202, 3, 2, 2, 2, 793, 794, 7, 113, 2, 2, 794, 795, 7, 116, 2, 2, 795, 796, 7, 99, 2, 2, 796, 797, 7, 101, 2, 2, 797, 798, 7, 110, 2, 2, 798, 799, 7, 103, 2, 2, 799, 204, 3, 2, 2, 2, 800, 801, 7, 107, 2, 2, 801, 802, 7, 111, 2, 2, 802, 803, 7, 114, 2, 2, 803, 804, 7, 110, 2, 2, 804, 805, 7, 103, 2, 2, 805, 806, 7, 111, 2, 2, 806, 807, 7, 103, 2, 2, 807, 808, 7, 112, 2, 2, 808, 809, 7, 118, 2, 2, 809, 810, 7, 117, 2, 2, 810, 811, 3, 2, 2, 2, 811, 812, 6, 103, 4, 2, 812, 206, 3, 2, 2, 2, 813, 814, 7, 110, 2, 2, 814, 815, 7, 103, 2, 2, 815, 816, 7, 118, 2, 2, 816, 817, 3, 2, 2, 2, 817, 818, 6, 104, 5, 2, 818, 208, 3, 2, 2, 2, 819, 820, 7, 114, 2, 2, 820, 821, 7, 116, 2, 2, 821, 822, 7, 107, 2, 2, 822, 823, 7, 120, 2, 2, 823, 824, 7, 99, 2, 2, 824, 825, 7, 118, 2, 2, 825, 826, 7, 103, 2, 2, 826, 827, 3, 2, 2, 2, 827, 828, 6, 105, 6, 2, 828, 210, 3, 2, 2, 2, 829, 830, 7, 114, 2, 2, 830, 831, 7, 119, 2, 2, 831, 832, 7, 100, 2, 2, 832, 833, 7, 110, 2, 2, 833, 834, 7, 107, 2, 2, 834, 835, 7, 101, 2, 2, 835, 836, 3, 2, 2, 2, 836, 837, 6, 106, 7, 2, 837, 212, 3, 2, 2, 2, 838, 839, 7, 107, 2, 2, 839, 840, 7, 112, 2, 2, 840, 841, 7, 118, 2, 2, 841, 842, 7, 103, 2, 2, 842, 843, 7, 116, 2, 2, 843, 844, 7, 104, 2, 2, 844, 845, 7, 99, 2, 2, 845, 846, 7, 101, 2, 2, 846, 847, 7, 103, 2, 2, 847, 848, 3, 2, 2, 2, 848, 849, 6, 107, 8, 2, 849, 214, 3, 2, 2, 2, 850, 851, 7, 114, 2, 2, 851, 852, 7, 99, 2, 2, 852, 853, 7, 101, 2, 2, 853, 854, 7, 109, 2, 2, 854, 855, 7, 99, 2, 2, 855, 856, 7, 105, 2, 2, 856, 857, 7, 103, 2, 2, 857, 858, 3, 2, 2, 2, 858, 859, 6, 108, 9, 2, 859, 216, 3, 2, 2, 2, 860, 861, 7, 114, 2, 2, 861, 862, 7, 116, 2, 2, 862, 863, 7, 113, 2, 2, 863, 864, 7, 118, 2, 2, 864, 865, 7, 103, 2, 2, 865, 866, 7, 101, 2, 2, 866, 867, 7, 118, 2, 2, 867, 868, 7, 103, 2, 2, 868, 869, 7, 102, 2, 2, 869, 870, 3, 2, 2, 2, 870, 871, 6, 109, 10, 2, 871, 218, 3, 2, 2, 2, 872, 873, 7, 117, 2, 2, 873, 874, 7, 118, 2, 2, 874, 875, 7, 99, 2, 2, 875, 876, 7, 118, 2, 2, 876, 877, 7, 107, 2, 2, 877, 878, 7, 101, 2, 2, 878, 879, 3, 2, 2, 2, 879, 880, 6, 110, 11, 2, 880, 220, 3, 2, 2, 2, 881, 882, 7, 123, 2, 2, 882, 883, 7, 107, 2, 2, 883, 884, 7, 103, 2, 2, 884, 885, 7, 110, 2, 2, 885, 886, 7, 102, 2, 2, 886, 887, 3, 2, 2, 2, 887, 888, 6, 111, 12, 2, 888, 222, 3, 2, 2, 2, 889, 893, 5, 269, 135, 2, 890, 892, 5, 267, 134, 2, 891, 890, 3, 2, 2, 2, 892, 895, 3, 2, 2, 2, 893, 891, 3, 2, 2, 2, 893, 894, 3, 2, 2, 2, 894, 224, 3, 2, 2, 2, 895, 893, 3, 2, 2, 2, 896, 900, 7, 36, 2, 2, 897, 899, 5, 239, 120, 2, 898, 897, 3, 2, 2, 2, 899, 902, 3, 2, 2, 2, 900, 898, 3, 2, 2, 2, 900, 901, 3, 2, 2, 2, 901, 903, 3, 2, 2, 2, 902, 900, 3, 2, 2, 2, 903, 913, 7, 36, 2, 2, 904, 908, 7, 41, 2, 2, 905, 907, 5, 241, 121, 2, 906, 905, 3, 2, 2, 2, 907, 910, 3, 2, 2, 2, 908, 906, 3, 2, 2, 2, 908, 909, 3, 2, 2, 2, 909, 911, 3, 2, 2, 2, 910, 908, 3, 2, 2, 2, 911, 913, 7, 41, 2, 2, 912, 896, 3, 2, 2, 2, 912, 904, 3, 2, 2, 2, 913, 914, 3, 2, 2, 2, 914, 915, 8, 113, 5, 2, 915, 226, 3, 2, 2, 2, 916, 922, 7, 98, 2, 2, 917, 918, 7, 94, 2, 2, 918, 921, 7, 98, 2, 2, 919, 921, 10, 9, 2, 2, 920, 917, 3, 2, 2, 2, 920, 919, 3, 2, 2, 2, 921, 924, 3, 2, 2, 2, 922, 920, 3, 2, 2, 2, 922, 923, 3, 2, 2, 2, 923, 925, 3, 2, 2, 2, 924, 922, 3, 2, 2, 2, 925, 926, 7, 98, 2, 2, 926, 228, 3, 2, 2, 2, 927, 929, 9, 10, 2, 2, 928, 927, 3, 2, 2, 2, 929, 930, 3, 2, 2, 2, 930, 928, 3, 2, 2, 2, 930, 931, 3, 2, 2, 2, 931, 932, 3, 2, 2, 2, 932, 933, 8, 115, 2, 2, 933, 230, 3, 2, 2, 2, 934, 935, 9, 2, 2, 2, 935, 936, 3, 2, 2, 2, 936, 937, 8, 116, 2, 2, 937, 232, 3, 2, 2, 2, 938, 939, 7, 62, 2, 2, 939, 940, 7, 35, 2, 2, 940, 941, 7, 47, 2, 2, 941, 942, 7, 47, 2, 2, 942, 946, 3, 2, 2, 2, 943, 945, 11, 2, 2, 2, 944, 943, 3, 2, 2, 2, 945, 948, 3, 2, 2, 2, 946, 947, 3, 2, 2, 2, 946, 944, 3, 2, 2, 2, 947, 949, 3, 2, 2, 2, 948, 946, 3, 2, 2, 2, 949, 950, 7, 47, 2, 2, 950, 951, 7, 47, 2, 2, 951, 952, 7, 64, 2, 2, 952, 953, 3, 2, 2, 2, 953, 954, 8, 117, 2, 2, 954, 234, 3, 2, 2, 2, 955, 956, 7, 62, 2, 2, 956, 957, 7, 35, 2, 2, 957, 958, 7, 93, 2, 2, 958, 959, 7, 69, 2, 2, 959, 960, 7, 70, 2, 2, 960, 961, 7, 67, 2, 2, 961, 962, 7, 86, 2, 2, 962, 963, 7, 67, 2, 2, 963, 964, 7, 93, 2, 2, 964, 968, 3, 2, 2, 2, 965, 967, 11, 2, 2, 2, 966, 965, 3, 2, 2, 2, 967, 970, 3, 2, 2, 2, 968, 969, 3, 2, 2, 2, 968, 966, 3, 2, 2, 2, 969, 971, 3, 2, 2, 2, 970, 968, 3, 2, 2, 2, 971, 972, 7, 95, 2, 2, 972, 973, 7, 95, 2, 2, 973, 974, 7, 64, 2, 2, 974, 975, 3, 2, 2, 2, 975, 976, 8, 118, 2, 2, 976, 236, 3, 2, 2, 2, 977, 978, 11, 2, 2, 2, 978, 979, 3, 2, 2, 2, 979, 980, 8, 119, 6, 2, 980, 238, 3, 2, 2, 2, 981, 986, 10, 11, 2, 2, 982, 983, 7, 94, 2, 2, 983, 986, 5, 243, 122, 2, 984, 986, 5, 259, 130, 2, 985, 981, 3, 2, 2, 2, 985, 982, 3, 2, 2, 2, 985, 984, 3, 2, 2, 2, 986, 240, 3, 2, 2, 2, 987, 992, 10, 12, 2, 2, 988, 989, 7, 94, 2, 2, 989, 992, 5, 243, 122, 2, 990, 992, 5, 259, 130, 2, 991, 987, 3, 2, 2, 2, 991, 988, 3, 2, 2, 2, 991, 990, 3, 2, 2, 2, 992, 242, 3, 2, 2, 2, 993, 999, 5, 245, 123, 2, 994, 999, 7, 50, 2, 2, 995, 999, 5, 247, 124, 2, 996, 999, 5, 249, 125, 2, 997, 999, 5, 251, 126, 2, 998, 993, 3, 2, 2, 2, 998, 994, 3, 2, 2, 2, 998, 995, 3, 2, 2, 2, 998, 996, 3, 2, 2, 2, 998, 997, 3, 2, 2, 2, 999, 244, 3, 2, 2, 2, 1000, 1003, 5, 253, 127, 2, 1001, 1003, 5, 255, 128, 2, 1002, 1000, 3, 2, 2, 2, 1002, 1001, 3, 2, 2, 2, 1003, 246, 3, 2, 2, 2, 1004, 1005, 7, 122, 2, 2, 1005, 1006, 5, 261, 131, 2, 1006, 1007, 5, 261, 131, 2, 1007, 248, 3, 2, 2, 2, 1008, 1009, 7, 119, 2, 2, 1009, 1010, 5, 261, 131, 2, 1010, 1011, 5, 261, 131, 2, 1011, 1012, 5, 261, 131, 2, 1012, 1013, 5, 261, 131, 2, 1013, 250, 3, 2, 2, 2, 1014, 1015, 7, 119, 2, 2, 1015, 1017, 7, 125, 2, 2, 1016, 1018, 5, 261, 131, 2, 1017, 1016, 3, 2, 2, 2, 1018, 1019, 3, 2, 2, 2, 1019, 1017, 3, 2, 2, 2, 1019, 1020, 3, 2, 2, 2, 1020, 1021, 3, 2, 2, 2, 1021, 1022, 7, 127, 2, 2, 1022, 252, 3, 2, 2, 2, 1023, 1024, 9, 13, 2, 2, 1024, 254, 3, 2, 2, 2, 1025, 1026, 10, 14, 2, 2, 1026, 256, 3, 2, 2, 2, 1027, 1030, 5, 253, 127, 2, 1028, 1030, 9, 15, 2, 2, 1029, 1027, 3, 2, 2, 2, 1029, 1028, 3, 2, 2, 2, 1030, 258, 3, 2, 2, 2, 1031, 1032, 7, 94, 2, 2, 1032, 1033, 9, 2, 2, 2, 1033, 260, 3, 2, 2, 2, 1034, 1035, 9, 16, 2, 2, 1035, 262, 3, 2, 2, 2, 1036, 1045, 7, 50, 2, 2, 1037, 1041, 9, 17, 2, 2, 1038, 1040, 9, 3, 2, 2, 1039, 1038, 3, 2, 2, 2, 1040, 1043, 3, 2, 2, 2, 1041, 1039, 3, 2, 2, 2, 1041, 1042, 3, 2, 2, 2, 1042, 1045, 3, 2, 2, 2, 1043, 1041, 3, 2, 2, 2, 1044, 1036, 3, 2, 2, 2, 1044, 1037, 3, 2, 2, 2, 1045, 264, 3, 2, 2, 2, 1046, 1048, 9, 18, 2, 2, 1047, 1049, 9, 19, 2, 2, 1048, 1047, 3, 2, 2, 2, 1048, 1049, 3, 2, 2, 2, 1049, 1051, 3, 2, 2, 2, 1050, 1052, 9, 3, 2, 2, 1051, 1050, 3, 2, 2, 2, 1052, 1053, 3, 2, 2, 2, 1053, 1051, 3, 2, 2, 2, 1053, 1054, 3, 2, 2, 2, 1054, 266, 3, 2, 2, 2, 1055, 1061, 5, 269, 135, 2, 1056, 1061, 5, 273, 137, 2, 1057, 1061, 5, 275, 138, 2, 1058, 1061, 5, 277, 139, 2, 1059, 1061, 4, 8206, 8207, 2, 1060, 1055, 3, 2, 2, 2, 1060, 1056, 3, 2, 2, 2, 1060, 1057, 3, 2, 2, 2, 1060, 1058, 3, 2, 2, 2, 1060, 1059, 3, 2, 2, 2, 1061, 268, 3, 2, 2, 2, 1062, 1067, 5, 271, 136, 2, 1063, 1067, 9, 20, 2, 2, 1064, 1065, 7, 94, 2, 2, 1065, 1067, 5, 249, 125, 2, 1066, 1062, 3, 2, 2, 2, 1066, 1063, 3, 2, 2, 2, 1066, 1064, 3, 2, 2, 2, 1067, 270, 3, 2, 2, 2, 1068, 1070, 9, 21, 2, 2, 1069, 1068, 3, 2, 2, 2, 1070, 272, 3, 2, 2, 2, 1071, 1073, 9, 22, 2, 2, 1072, 1071, 3, 2, 2, 2, 1073, 274, 3, 2, 2, 2, 1074, 1076, 9, 23, 2, 2, 1075, 1074, 3, 2, 2, 2, 1076, 276, 3, 2, 2, 2, 1077, 1079, 9, 24, 2, 2, 1078, 1077, 3, 2, 2, 2, 1079, 278, 3, 2, 2, 2, 1080, 1091, 10, 25, 2, 2, 1081, 1091, 5, 283, 142, 2, 1082, 1086, 7, 93, 2, 2, 1083, 1085, 5, 281, 141, 2, 1084, 1083, 3, 2, 2, 2, 1085, 1088, 3, 2, 2, 2, 1086, 1084, 3, 2, 2, 2, 1086, 1087, 3, 2, 2, 2, 1087, 1089, 3, 2, 2, 2, 1088, 1086, 3, 2, 2, 2, 1089, 1091, 7, 95, 2, 2, 1090, 1080, 3, 2, 2, 2, 1090, 1081, 3, 2, 2, 2, 1090, 1082, 3, 2, 2, 2, 1091, 280, 3, 2, 2, 2, 1092, 1095, 10, 26, 2, 2, 1093, 1095, 5, 283, 142, 2, 1094, 1092, 3, 2, 2, 2, 1094, 1093, 3, 2, 2, 2, 1095, 282, 3, 2, 2, 2, 1096, 1097, 7, 94, 2, 2, 1097, 1098, 10, 2, 2, 2, 1098, 284, 3, 2, 2, 2, 46, 2, 291, 305, 314, 321, 474, 481, 485, 491, 494, 498, 500, 507, 513, 522, 529, 893, 900, 908, 912, 920, 922, 930, 946, 968, 985, 991, 998, 1002, 1019, 1029, 1041, 1044, 1048, 1053, 1060, 1066, 1069, 1072, 1075, 1078, 1086, 1090, 1094, 7, 2, 3, 2, 3, 9, 2, 3, 10, 3, 3, 113, 4, 2, 4, 2]
\ No newline at end of file
diff --git a/src/main/gen/org/bdware/sc/parser/JavaScriptLexer.java b/src/main/gen/org/bdware/sc/parser/JavaScriptLexer.java
new file mode 100644
index 0000000..e709944
--- /dev/null
+++ b/src/main/gen/org/bdware/sc/parser/JavaScriptLexer.java
@@ -0,0 +1,813 @@
+package org.bdware.sc.parser;// Generated from /Users/frankrwu/Workspace/JetBrains/Idea/BDContract/genparser/input/JavaScriptLexer.g4 by ANTLR 4.9.1
+
+import org.antlr.v4.runtime.*;
+import org.antlr.v4.runtime.atn.ATN;
+import org.antlr.v4.runtime.atn.ATNDeserializer;
+import org.antlr.v4.runtime.atn.LexerATNSimulator;
+import org.antlr.v4.runtime.atn.PredictionContextCache;
+import org.antlr.v4.runtime.dfa.DFA;
+
+@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
+public class JavaScriptLexer extends JavaScriptBaseLexer {
+    public static final int
+            MultiLineComment = 1, SingleLineComment = 2, RegularExpressionLiteral = 3, OpenBracket = 4,
+            CloseBracket = 5, OpenParen = 6, CloseParen = 7, OpenBrace = 8, CloseBrace = 9,
+            SemiColon = 10, Comma = 11, Assign = 12, QuestionMark = 13, Colon = 14, Ellipsis = 15,
+            Dot = 16, PlusPlus = 17, MinusMinus = 18, Plus = 19, Minus = 20, BitNot = 21, Not = 22,
+            Multiply = 23, Divide = 24, Modulus = 25, RightShiftArithmetic = 26, LeftShiftArithmetic = 27,
+            RightShiftLogical = 28, LessThan = 29, MoreThan = 30, LessThanEquals = 31, GreaterThanEquals = 32,
+            Equals_ = 33, NotEquals = 34, IdentityEquals = 35, IdentityNotEquals = 36, BitAnd = 37,
+            BitXOr = 38, BitOr = 39, And = 40, Or = 41, MultiplyAssign = 42, DivideAssign = 43,
+            ModulusAssign = 44, PlusAssign = 45, MinusAssign = 46, LeftShiftArithmeticAssign = 47,
+            RightShiftArithmeticAssign = 48, RightShiftLogicalAssign = 49, BitAndAssign = 50,
+            BitXorAssign = 51, BitOrAssign = 52, ARROW = 53, NullLiteral = 54, BooleanLiteral = 55,
+            DecimalLiteral = 56, HexIntegerLiteral = 57, OctalIntegerLiteral = 58, OctalIntegerLiteral2 = 59,
+            BinaryIntegerLiteral = 60, Break = 61, Do = 62, Instanceof = 63, Typeof = 64, Case = 65,
+            Else = 66, New = 67, Var = 68, Catch = 69, Finally = 70, Return = 71, Void = 72, Continue = 73,
+            For = 74, Switch = 75, While = 76, Debugger = 77, Function = 78, This = 79, With = 80,
+            Default = 81, If = 82, Throw = 83, Delete = 84, In = 85, Try = 86, Event = 87, AtToken = 88,
+            AtLeastOnce = 89, AtMostOnce = 90, OnlyOnce = 91, Class = 92, Enum = 93, Extends = 94,
+            Super = 95, Const = 96, Export = 97, Import = 98, Contract = 99, Module = 100, Oracle = 101,
+            Implements = 102, Let = 103, Private = 104, Public = 105, Interface = 106, Package = 107,
+            Protected = 108, Static = 109, Yield = 110, Identifier = 111, StringLiteral = 112,
+            TemplateStringLiteral = 113, WhiteSpaces = 114, LineTerminator = 115, HtmlComment = 116,
+            CDataComment = 117, UnexpectedCharacter = 118;
+    public static final int
+            ERROR = 2;
+    public static final String[] ruleNames = makeRuleNames();
+    /**
+     * @deprecated Use {@link #VOCABULARY} instead.
+     */
+    @Deprecated
+    public static final String[] tokenNames;
+    public static final String _serializedATN =
+            "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2x\u044b\b\1\4\2\t" +
+                    "\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13" +
+                    "\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22" +
+                    "\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31" +
+                    "\4\32\t\32\4\33\t\33\4\34\t\34\4\35\t\35\4\36\t\36\4\37\t\37\4 \t \4!" +
+                    "\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\4*\t*\4+\t+\4" +
+                    ",\t,\4-\t-\4.\t.\4/\t/\4\60\t\60\4\61\t\61\4\62\t\62\4\63\t\63\4\64\t" +
+                    "\64\4\65\t\65\4\66\t\66\4\67\t\67\48\t8\49\t9\4:\t:\4;\t;\4<\t<\4=\t=" +
+                    "\4>\t>\4?\t?\4@\t@\4A\tA\4B\tB\4C\tC\4D\tD\4E\tE\4F\tF\4G\tG\4H\tH\4I" +
+                    "\tI\4J\tJ\4K\tK\4L\tL\4M\tM\4N\tN\4O\tO\4P\tP\4Q\tQ\4R\tR\4S\tS\4T\tT" +
+                    "\4U\tU\4V\tV\4W\tW\4X\tX\4Y\tY\4Z\tZ\4[\t[\4\\\t\\\4]\t]\4^\t^\4_\t_\4" +
+                    "`\t`\4a\ta\4b\tb\4c\tc\4d\td\4e\te\4f\tf\4g\tg\4h\th\4i\ti\4j\tj\4k\t" +
+                    "k\4l\tl\4m\tm\4n\tn\4o\to\4p\tp\4q\tq\4r\tr\4s\ts\4t\tt\4u\tu\4v\tv\4" +
+                    "w\tw\4x\tx\4y\ty\4z\tz\4{\t{\4|\t|\4}\t}\4~\t~\4\177\t\177\4\u0080\t\u0080" +
+                    "\4\u0081\t\u0081\4\u0082\t\u0082\4\u0083\t\u0083\4\u0084\t\u0084\4\u0085" +
+                    "\t\u0085\4\u0086\t\u0086\4\u0087\t\u0087\4\u0088\t\u0088\4\u0089\t\u0089" +
+                    "\4\u008a\t\u008a\4\u008b\t\u008b\4\u008c\t\u008c\4\u008d\t\u008d\4\u008e" +
+                    "\t\u008e\3\2\3\2\3\2\3\2\7\2\u0122\n\2\f\2\16\2\u0125\13\2\3\2\3\2\3\2" +
+                    "\3\2\3\2\3\3\3\3\3\3\3\3\7\3\u0130\n\3\f\3\16\3\u0133\13\3\3\3\3\3\3\4" +
+                    "\3\4\6\4\u0139\n\4\r\4\16\4\u013a\3\4\3\4\3\4\7\4\u0140\n\4\f\4\16\4\u0143" +
+                    "\13\4\3\5\3\5\3\6\3\6\3\7\3\7\3\b\3\b\3\t\3\t\3\t\3\n\3\n\3\n\3\13\3\13" +
+                    "\3\f\3\f\3\r\3\r\3\16\3\16\3\17\3\17\3\20\3\20\3\20\3\20\3\21\3\21\3\22" +
+                    "\3\22\3\22\3\23\3\23\3\23\3\24\3\24\3\25\3\25\3\26\3\26\3\27\3\27\3\30" +
+                    "\3\30\3\31\3\31\3\32\3\32\3\33\3\33\3\33\3\34\3\34\3\34\3\35\3\35\3\35" +
+                    "\3\35\3\36\3\36\3\37\3\37\3 \3 \3 \3!\3!\3!\3\"\3\"\3\"\3#\3#\3#\3$\3" +
+                    "$\3$\3$\3%\3%\3%\3%\3&\3&\3\'\3\'\3(\3(\3)\3)\3)\3*\3*\3*\3+\3+\3+\3," +
+                    "\3,\3,\3-\3-\3-\3.\3.\3.\3/\3/\3/\3\60\3\60\3\60\3\60\3\61\3\61\3\61\3" +
+                    "\61\3\62\3\62\3\62\3\62\3\62\3\63\3\63\3\63\3\64\3\64\3\64\3\65\3\65\3" +
+                    "\65\3\66\3\66\3\66\3\67\3\67\3\67\3\67\3\67\38\38\38\38\38\38\38\38\3" +
+                    "8\58\u01db\n8\39\39\39\79\u01e0\n9\f9\169\u01e3\139\39\59\u01e6\n9\39" +
+                    "\39\69\u01ea\n9\r9\169\u01eb\39\59\u01ef\n9\39\39\59\u01f3\n9\59\u01f5" +
+                    "\n9\3:\3:\3:\6:\u01fa\n:\r:\16:\u01fb\3;\3;\6;\u0200\n;\r;\16;\u0201\3" +
+                    ";\3;\3<\3<\3<\6<\u0209\n<\r<\16<\u020a\3=\3=\3=\6=\u0210\n=\r=\16=\u0211" +
+                    "\3>\3>\3>\3>\3>\3>\3?\3?\3?\3@\3@\3@\3@\3@\3@\3@\3@\3@\3@\3@\3A\3A\3A" +
+                    "\3A\3A\3A\3A\3B\3B\3B\3B\3B\3C\3C\3C\3C\3C\3D\3D\3D\3D\3E\3E\3E\3E\3F" +
+                    "\3F\3F\3F\3F\3F\3G\3G\3G\3G\3G\3G\3G\3G\3H\3H\3H\3H\3H\3H\3H\3I\3I\3I" +
+                    "\3I\3I\3J\3J\3J\3J\3J\3J\3J\3J\3J\3K\3K\3K\3K\3L\3L\3L\3L\3L\3L\3L\3M" +
+                    "\3M\3M\3M\3M\3M\3N\3N\3N\3N\3N\3N\3N\3N\3N\3O\3O\3O\3O\3O\3O\3O\3O\3O" +
+                    "\3P\3P\3P\3P\3P\3Q\3Q\3Q\3Q\3Q\3R\3R\3R\3R\3R\3R\3R\3R\3S\3S\3S\3T\3T" +
+                    "\3T\3T\3T\3T\3U\3U\3U\3U\3U\3U\3U\3V\3V\3V\3W\3W\3W\3W\3X\3X\3X\3X\3X" +
+                    "\3X\3Y\3Y\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3[\3[\3[\3[\3[\3[" +
+                    "\3[\3[\3[\3[\3[\3[\3[\3\\\3\\\3\\\3\\\3\\\3\\\3\\\3\\\3\\\3\\\3]\3]\3" +
+                    "]\3]\3]\3]\3^\3^\3^\3^\3^\3_\3_\3_\3_\3_\3_\3_\3_\3`\3`\3`\3`\3`\3`\3" +
+                    "a\3a\3a\3a\3a\3a\3b\3b\3b\3b\3b\3b\3b\3c\3c\3c\3c\3c\3c\3c\3d\3d\3d\3" +
+                    "d\3d\3d\3d\3d\3d\3e\3e\3e\3e\3e\3e\3e\3f\3f\3f\3f\3f\3f\3f\3g\3g\3g\3" +
+                    "g\3g\3g\3g\3g\3g\3g\3g\3g\3g\3h\3h\3h\3h\3h\3h\3i\3i\3i\3i\3i\3i\3i\3" +
+                    "i\3i\3i\3j\3j\3j\3j\3j\3j\3j\3j\3j\3k\3k\3k\3k\3k\3k\3k\3k\3k\3k\3k\3" +
+                    "k\3l\3l\3l\3l\3l\3l\3l\3l\3l\3l\3m\3m\3m\3m\3m\3m\3m\3m\3m\3m\3m\3m\3" +
+                    "n\3n\3n\3n\3n\3n\3n\3n\3n\3o\3o\3o\3o\3o\3o\3o\3o\3p\3p\7p\u037c\np\f" +
+                    "p\16p\u037f\13p\3q\3q\7q\u0383\nq\fq\16q\u0386\13q\3q\3q\3q\7q\u038b\n" +
+                    "q\fq\16q\u038e\13q\3q\5q\u0391\nq\3q\3q\3r\3r\3r\3r\7r\u0399\nr\fr\16" +
+                    "r\u039c\13r\3r\3r\3s\6s\u03a1\ns\rs\16s\u03a2\3s\3s\3t\3t\3t\3t\3u\3u" +
+                    "\3u\3u\3u\3u\7u\u03b1\nu\fu\16u\u03b4\13u\3u\3u\3u\3u\3u\3u\3v\3v\3v\3" +
+                    "v\3v\3v\3v\3v\3v\3v\3v\7v\u03c7\nv\fv\16v\u03ca\13v\3v\3v\3v\3v\3v\3v" +
+                    "\3w\3w\3w\3w\3x\3x\3x\3x\5x\u03da\nx\3y\3y\3y\3y\5y\u03e0\ny\3z\3z\3z" +
+                    "\3z\3z\5z\u03e7\nz\3{\3{\5{\u03eb\n{\3|\3|\3|\3|\3}\3}\3}\3}\3}\3}\3~" +
+                    "\3~\3~\6~\u03fa\n~\r~\16~\u03fb\3~\3~\3\177\3\177\3\u0080\3\u0080\3\u0081" +
+                    "\3\u0081\5\u0081\u0406\n\u0081\3\u0082\3\u0082\3\u0082\3\u0083\3\u0083" +
+                    "\3\u0084\3\u0084\3\u0084\7\u0084\u0410\n\u0084\f\u0084\16\u0084\u0413" +
+                    "\13\u0084\5\u0084\u0415\n\u0084\3\u0085\3\u0085\5\u0085\u0419\n\u0085" +
+                    "\3\u0085\6\u0085\u041c\n\u0085\r\u0085\16\u0085\u041d\3\u0086\3\u0086" +
+                    "\3\u0086\3\u0086\3\u0086\5\u0086\u0425\n\u0086\3\u0087\3\u0087\3\u0087" +
+                    "\3\u0087\5\u0087\u042b\n\u0087\3\u0088\5\u0088\u042e\n\u0088\3\u0089\5" +
+                    "\u0089\u0431\n\u0089\3\u008a\5\u008a\u0434\n\u008a\3\u008b\5\u008b\u0437" +
+                    "\n\u008b\3\u008c\3\u008c\3\u008c\3\u008c\7\u008c\u043d\n\u008c\f\u008c" +
+                    "\16\u008c\u0440\13\u008c\3\u008c\5\u008c\u0443\n\u008c\3\u008d\3\u008d" +
+                    "\5\u008d\u0447\n\u008d\3\u008e\3\u008e\3\u008e\5\u0123\u03b2\u03c8\2\u008f" +
+                    "\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n\23\13\25\f\27\r\31\16\33\17\35\20" +
+                    "\37\21!\22#\23%\24\'\25)\26+\27-\30/\31\61\32\63\33\65\34\67\359\36;\37" +
+                    "= ?!A\"C#E$G%I&K\'M(O)Q*S+U,W-Y.[/]\60_\61a\62c\63e\64g\65i\66k\67m8o" +
+                    "9q:s;u<w=y>{?}@\177A\u0081B\u0083C\u0085D\u0087E\u0089F\u008bG\u008dH" +
+                    "\u008fI\u0091J\u0093K\u0095L\u0097M\u0099N\u009bO\u009dP\u009fQ\u00a1" +
+                    "R\u00a3S\u00a5T\u00a7U\u00a9V\u00abW\u00adX\u00afY\u00b1Z\u00b3[\u00b5" +
+                    "\\\u00b7]\u00b9^\u00bb_\u00bd`\u00bfa\u00c1b\u00c3c\u00c5d\u00c7e\u00c9" +
+                    "f\u00cbg\u00cdh\u00cfi\u00d1j\u00d3k\u00d5l\u00d7m\u00d9n\u00dbo\u00dd" +
+                    "p\u00dfq\u00e1r\u00e3s\u00e5t\u00e7u\u00e9v\u00ebw\u00edx\u00ef\2\u00f1" +
+                    "\2\u00f3\2\u00f5\2\u00f7\2\u00f9\2\u00fb\2\u00fd\2\u00ff\2\u0101\2\u0103" +
+                    "\2\u0105\2\u0107\2\u0109\2\u010b\2\u010d\2\u010f\2\u0111\2\u0113\2\u0115" +
+                    "\2\u0117\2\u0119\2\u011b\2\3\2\33\5\2\f\f\17\17\u202a\u202b\3\2\62;\4" +
+                    "\2ZZzz\3\2\629\4\2QQqq\4\2DDdd\3\2\62\63\3\2bb\6\2\13\13\r\16\"\"\u00a2" +
+                    "\u00a2\6\2\f\f\17\17$$^^\6\2\f\f\17\17))^^\13\2$$))^^ddhhppttvvxx\16\2" +
+                    "\f\f\17\17$$))\62;^^ddhhppttvxzz\5\2\62;wwzz\5\2\62;CHch\3\2\63;\4\2G" +
+                    "Ggg\4\2--//\4\2&&aa\u0104\2C\\c|\u00ac\u00ac\u00b7\u00b7\u00bc\u00bc\u00c2" +
+                    "\u00d8\u00da\u00f8\u00fa\u0221\u0224\u0235\u0252\u02af\u02b2\u02ba\u02bd" +
+                    "\u02c3\u02d2\u02d3\u02e2\u02e6\u02f0\u02f0\u037c\u037c\u0388\u0388\u038a" +
+                    "\u038c\u038e\u038e\u0390\u03a3\u03a5\u03d0\u03d2\u03d9\u03dc\u03f5\u0402" +
+                    "\u0483\u048e\u04c6\u04c9\u04ca\u04cd\u04ce\u04d2\u04f7\u04fa\u04fb\u0533" +
+                    "\u0558\u055b\u055b\u0563\u0589\u05d2\u05ec\u05f2\u05f4\u0623\u063c\u0642" +
+                    "\u064c\u0673\u06d5\u06d7\u06d7\u06e7\u06e8\u06fc\u06fe\u0712\u0712\u0714" +
+                    "\u072e\u0782\u07a7\u0907\u093b\u093f\u093f\u0952\u0952\u095a\u0963\u0987" +
+                    "\u098e\u0991\u0992\u0995\u09aa\u09ac\u09b2\u09b4\u09b4\u09b8\u09bb\u09de" +
+                    "\u09df\u09e1\u09e3\u09f2\u09f3\u0a07\u0a0c\u0a11\u0a12\u0a15\u0a2a\u0a2c" +
+                    "\u0a32\u0a34\u0a35\u0a37\u0a38\u0a3a\u0a3b\u0a5b\u0a5e\u0a60\u0a60\u0a74" +
+                    "\u0a76\u0a87\u0a8d\u0a8f\u0a8f\u0a91\u0a93\u0a95\u0aaa\u0aac\u0ab2\u0ab4" +
+                    "\u0ab5\u0ab7\u0abb\u0abf\u0abf\u0ad2\u0ad2\u0ae2\u0ae2\u0b07\u0b0e\u0b11" +
+                    "\u0b12\u0b15\u0b2a\u0b2c\u0b32\u0b34\u0b35\u0b38\u0b3b\u0b3f\u0b3f\u0b5e" +
+                    "\u0b5f\u0b61\u0b63\u0b87\u0b8c\u0b90\u0b92\u0b94\u0b97\u0b9b\u0b9c\u0b9e" +
+                    "\u0b9e\u0ba0\u0ba1\u0ba5\u0ba6\u0baa\u0bac\u0bb0\u0bb7\u0bb9\u0bbb\u0c07" +
+                    "\u0c0e\u0c10\u0c12\u0c14\u0c2a\u0c2c\u0c35\u0c37\u0c3b\u0c62\u0c63\u0c87" +
+                    "\u0c8e\u0c90\u0c92\u0c94\u0caa\u0cac\u0cb5\u0cb7\u0cbb\u0ce0\u0ce0\u0ce2" +
+                    "\u0ce3\u0d07\u0d0e\u0d10\u0d12\u0d14\u0d2a\u0d2c\u0d3b\u0d62\u0d63\u0d87" +
+                    "\u0d98\u0d9c\u0db3\u0db5\u0dbd\u0dbf\u0dbf\u0dc2\u0dc8\u0e03\u0e32\u0e34" +
+                    "\u0e35\u0e42\u0e48\u0e83\u0e84\u0e86\u0e86\u0e89\u0e8a\u0e8c\u0e8c\u0e8f" +
+                    "\u0e8f\u0e96\u0e99\u0e9b\u0ea1\u0ea3\u0ea5\u0ea7\u0ea7\u0ea9\u0ea9\u0eac" +
+                    "\u0ead\u0eaf\u0eb2\u0eb4\u0eb5\u0ebf\u0ec6\u0ec8\u0ec8\u0ede\u0edf\u0f02" +
+                    "\u0f02\u0f42\u0f6c\u0f8a\u0f8d\u1002\u1023\u1025\u1029\u102b\u102c\u1052" +
+                    "\u1057\u10a2\u10c7\u10d2\u10f8\u1102\u115b\u1161\u11a4\u11aa\u11fb\u1202" +
+                    "\u1208\u120a\u1248\u124a\u124a\u124c\u124f\u1252\u1258\u125a\u125a\u125c" +
+                    "\u125f\u1262\u1288\u128a\u128a\u128c\u128f\u1292\u12b0\u12b2\u12b2\u12b4" +
+                    "\u12b7\u12ba\u12c0\u12c2\u12c2\u12c4\u12c7\u12ca\u12d0\u12d2\u12d8\u12da" +
+                    "\u12f0\u12f2\u1310\u1312\u1312\u1314\u1317\u131a\u1320\u1322\u1348\u134a" +
+                    "\u135c\u13a2\u13f6\u1403\u1678\u1683\u169c\u16a2\u16ec\u1782\u17b5\u1822" +
+                    "\u1879\u1882\u18aa\u1e02\u1e9d\u1ea2\u1efb\u1f02\u1f17\u1f1a\u1f1f\u1f22" +
+                    "\u1f47\u1f4a\u1f4f\u1f52\u1f59\u1f5b\u1f5b\u1f5d\u1f5d\u1f5f\u1f5f\u1f61" +
+                    "\u1f7f\u1f82\u1fb6\u1fb8\u1fbe\u1fc0\u1fc0\u1fc4\u1fc6\u1fc8\u1fce\u1fd2" +
+                    "\u1fd5\u1fd8\u1fdd\u1fe2\u1fee\u1ff4\u1ff6\u1ff8\u1ffe\u2081\u2081\u2104" +
+                    "\u2104\u2109\u2109\u210c\u2115\u2117\u2117\u211b\u211f\u2126\u2126\u2128" +
+                    "\u2128\u212a\u212a\u212c\u212f\u2131\u2133\u2135\u213b\u2162\u2185\u3007" +
+                    "\u3009\u3023\u302b\u3033\u3037\u303a\u303c\u3043\u3096\u309f\u30a0\u30a3" +
+                    "\u30fc\u30fe\u3100\u3107\u312e\u3133\u3190\u31a2\u31b9\u3402\u3402\u4db7" +
+                    "\u4db7\u4e02\u4e02\u9fa7\u9fa7\ua002\ua48e\uac02\uac02\ud7a5\ud7a5\uf902" +
+                    "\ufa2f\ufb02\ufb08\ufb15\ufb19\ufb1f\ufb1f\ufb21\ufb2a\ufb2c\ufb38\ufb3a" +
+                    "\ufb3e\ufb40\ufb40\ufb42\ufb43\ufb45\ufb46\ufb48\ufbb3\ufbd5\ufd3f\ufd52" +
+                    "\ufd91\ufd94\ufdc9\ufdf2\ufdfd\ufe72\ufe74\ufe76\ufe76\ufe78\ufefe\uff23" +
+                    "\uff3c\uff43\uff5c\uff68\uffc0\uffc4\uffc9\uffcc\uffd1\uffd4\uffd9\uffdc" +
+                    "\uffdef\2\u0302\u0350\u0362\u0364\u0485\u0488\u0593\u05a3\u05a5\u05bb" +
+                    "\u05bd\u05bf\u05c1\u05c1\u05c3\u05c4\u05c6\u05c6\u064d\u0657\u0672\u0672" +
+                    "\u06d8\u06de\u06e1\u06e6\u06e9\u06ea\u06ec\u06ef\u0713\u0713\u0732\u074c" +
+                    "\u07a8\u07b2\u0903\u0905\u093e\u093e\u0940\u094f\u0953\u0956\u0964\u0965" +
+                    "\u0983\u0985\u09be\u09c6\u09c9\u09ca\u09cd\u09cf\u09d9\u09d9\u09e4\u09e5" +
+                    "\u0a04\u0a04\u0a3e\u0a3e\u0a40\u0a44\u0a49\u0a4a\u0a4d\u0a4f\u0a72\u0a73" +
+                    "\u0a83\u0a85\u0abe\u0abe\u0ac0\u0ac7\u0ac9\u0acb\u0acd\u0acf\u0b03\u0b05" +
+                    "\u0b3e\u0b3e\u0b40\u0b45\u0b49\u0b4a\u0b4d\u0b4f\u0b58\u0b59\u0b84\u0b85" +
+                    "\u0bc0\u0bc4\u0bc8\u0bca\u0bcc\u0bcf\u0bd9\u0bd9\u0c03\u0c05\u0c40\u0c46" +
+                    "\u0c48\u0c4a\u0c4c\u0c4f\u0c57\u0c58\u0c84\u0c85\u0cc0\u0cc6\u0cc8\u0cca" +
+                    "\u0ccc\u0ccf\u0cd7\u0cd8\u0d04\u0d05\u0d40\u0d45\u0d48\u0d4a\u0d4c\u0d4f" +
+                    "\u0d59\u0d59\u0d84\u0d85\u0dcc\u0dcc\u0dd1\u0dd6\u0dd8\u0dd8\u0dda\u0de1" +
+                    "\u0df4\u0df5\u0e33\u0e33\u0e36\u0e3c\u0e49\u0e50\u0eb3\u0eb3\u0eb6\u0ebb" +
+                    "\u0ebd\u0ebe\u0eca\u0ecf\u0f1a\u0f1b\u0f37\u0f37\u0f39\u0f39\u0f3b\u0f3b" +
+                    "\u0f40\u0f41\u0f73\u0f86\u0f88\u0f89\u0f92\u0f99\u0f9b\u0fbe\u0fc8\u0fc8" +
+                    "\u102e\u1034\u1038\u103b\u1058\u105b\u17b6\u17d5\u18ab\u18ab\u20d2\u20de" +
+                    "\u20e3\u20e3\u302c\u3031\u309b\u309c\ufb20\ufb20\ufe22\ufe25\26\2\62;" +
+                    "\u0662\u066b\u06f2\u06fb\u0968\u0971\u09e8\u09f1\u0a68\u0a71\u0ae8\u0af1" +
+                    "\u0b68\u0b71\u0be9\u0bf1\u0c68\u0c71\u0ce8\u0cf1\u0d68\u0d71\u0e52\u0e5b" +
+                    "\u0ed2\u0edb\u0f22\u0f2b\u1042\u104b\u136b\u1373\u17e2\u17eb\u1812\u181b" +
+                    "\uff12\uff1b\t\2aa\u2041\u2042\u30fd\u30fd\ufe35\ufe36\ufe4f\ufe51\uff41" +
+                    "\uff41\uff67\uff67\7\2\f\f\17\17\61\61]^\u202a\u202b\6\2\f\f\17\17^_\u202a" +
+                    "\u202b\2\u0465\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3" +
+                    "\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2" +
+                    "\2\27\3\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2!\3" +
+                    "\2\2\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3\2" +
+                    "\2\2\2/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2\2\2\67\3\2\2\2\2" +
+                    "9\3\2\2\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2\2\2\2A\3\2\2\2\2C\3\2\2\2\2E\3" +
+                    "\2\2\2\2G\3\2\2\2\2I\3\2\2\2\2K\3\2\2\2\2M\3\2\2\2\2O\3\2\2\2\2Q\3\2\2" +
+                    "\2\2S\3\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2Y\3\2\2\2\2[\3\2\2\2\2]\3\2\2\2\2" +
+                    "_\3\2\2\2\2a\3\2\2\2\2c\3\2\2\2\2e\3\2\2\2\2g\3\2\2\2\2i\3\2\2\2\2k\3" +
+                    "\2\2\2\2m\3\2\2\2\2o\3\2\2\2\2q\3\2\2\2\2s\3\2\2\2\2u\3\2\2\2\2w\3\2\2" +
+                    "\2\2y\3\2\2\2\2{\3\2\2\2\2}\3\2\2\2\2\177\3\2\2\2\2\u0081\3\2\2\2\2\u0083" +
+                    "\3\2\2\2\2\u0085\3\2\2\2\2\u0087\3\2\2\2\2\u0089\3\2\2\2\2\u008b\3\2\2" +
+                    "\2\2\u008d\3\2\2\2\2\u008f\3\2\2\2\2\u0091\3\2\2\2\2\u0093\3\2\2\2\2\u0095" +
+                    "\3\2\2\2\2\u0097\3\2\2\2\2\u0099\3\2\2\2\2\u009b\3\2\2\2\2\u009d\3\2\2" +
+                    "\2\2\u009f\3\2\2\2\2\u00a1\3\2\2\2\2\u00a3\3\2\2\2\2\u00a5\3\2\2\2\2\u00a7" +
+                    "\3\2\2\2\2\u00a9\3\2\2\2\2\u00ab\3\2\2\2\2\u00ad\3\2\2\2\2\u00af\3\2\2" +
+                    "\2\2\u00b1\3\2\2\2\2\u00b3\3\2\2\2\2\u00b5\3\2\2\2\2\u00b7\3\2\2\2\2\u00b9" +
+                    "\3\2\2\2\2\u00bb\3\2\2\2\2\u00bd\3\2\2\2\2\u00bf\3\2\2\2\2\u00c1\3\2\2" +
+                    "\2\2\u00c3\3\2\2\2\2\u00c5\3\2\2\2\2\u00c7\3\2\2\2\2\u00c9\3\2\2\2\2\u00cb" +
+                    "\3\2\2\2\2\u00cd\3\2\2\2\2\u00cf\3\2\2\2\2\u00d1\3\2\2\2\2\u00d3\3\2\2" +
+                    "\2\2\u00d5\3\2\2\2\2\u00d7\3\2\2\2\2\u00d9\3\2\2\2\2\u00db\3\2\2\2\2\u00dd" +
+                    "\3\2\2\2\2\u00df\3\2\2\2\2\u00e1\3\2\2\2\2\u00e3\3\2\2\2\2\u00e5\3\2\2" +
+                    "\2\2\u00e7\3\2\2\2\2\u00e9\3\2\2\2\2\u00eb\3\2\2\2\2\u00ed\3\2\2\2\3\u011d" +
+                    "\3\2\2\2\5\u012b\3\2\2\2\7\u0136\3\2\2\2\t\u0144\3\2\2\2\13\u0146\3\2" +
+                    "\2\2\r\u0148\3\2\2\2\17\u014a\3\2\2\2\21\u014c\3\2\2\2\23\u014f\3\2\2" +
+                    "\2\25\u0152\3\2\2\2\27\u0154\3\2\2\2\31\u0156\3\2\2\2\33\u0158\3\2\2\2" +
+                    "\35\u015a\3\2\2\2\37\u015c\3\2\2\2!\u0160\3\2\2\2#\u0162\3\2\2\2%\u0165" +
+                    "\3\2\2\2\'\u0168\3\2\2\2)\u016a\3\2\2\2+\u016c\3\2\2\2-\u016e\3\2\2\2" +
+                    "/\u0170\3\2\2\2\61\u0172\3\2\2\2\63\u0174\3\2\2\2\65\u0176\3\2\2\2\67" +
+                    "\u0179\3\2\2\29\u017c\3\2\2\2;\u0180\3\2\2\2=\u0182\3\2\2\2?\u0184\3\2" +
+                    "\2\2A\u0187\3\2\2\2C\u018a\3\2\2\2E\u018d\3\2\2\2G\u0190\3\2\2\2I\u0194" +
+                    "\3\2\2\2K\u0198\3\2\2\2M\u019a\3\2\2\2O\u019c\3\2\2\2Q\u019e\3\2\2\2S" +
+                    "\u01a1\3\2\2\2U\u01a4\3\2\2\2W\u01a7\3\2\2\2Y\u01aa\3\2\2\2[\u01ad\3\2" +
+                    "\2\2]\u01b0\3\2\2\2_\u01b3\3\2\2\2a\u01b7\3\2\2\2c\u01bb\3\2\2\2e\u01c0" +
+                    "\3\2\2\2g\u01c3\3\2\2\2i\u01c6\3\2\2\2k\u01c9\3\2\2\2m\u01cc\3\2\2\2o" +
+                    "\u01da\3\2\2\2q\u01f4\3\2\2\2s\u01f6\3\2\2\2u\u01fd\3\2\2\2w\u0205\3\2" +
+                    "\2\2y\u020c\3\2\2\2{\u0213\3\2\2\2}\u0219\3\2\2\2\177\u021c\3\2\2\2\u0081" +
+                    "\u0227\3\2\2\2\u0083\u022e\3\2\2\2\u0085\u0233\3\2\2\2\u0087\u0238\3\2" +
+                    "\2\2\u0089\u023c\3\2\2\2\u008b\u0240\3\2\2\2\u008d\u0246\3\2\2\2\u008f" +
+                    "\u024e\3\2\2\2\u0091\u0255\3\2\2\2\u0093\u025a\3\2\2\2\u0095\u0263\3\2" +
+                    "\2\2\u0097\u0267\3\2\2\2\u0099\u026e\3\2\2\2\u009b\u0274\3\2\2\2\u009d" +
+                    "\u027d\3\2\2\2\u009f\u0286\3\2\2\2\u00a1\u028b\3\2\2\2\u00a3\u0290\3\2" +
+                    "\2\2\u00a5\u0298\3\2\2\2\u00a7\u029b\3\2\2\2\u00a9\u02a1\3\2\2\2\u00ab" +
+                    "\u02a8\3\2\2\2\u00ad\u02ab\3\2\2\2\u00af\u02af\3\2\2\2\u00b1\u02b5\3\2" +
+                    "\2\2\u00b3\u02b7\3\2\2\2\u00b5\u02c5\3\2\2\2\u00b7\u02d2\3\2\2\2\u00b9" +
+                    "\u02dc\3\2\2\2\u00bb\u02e2\3\2\2\2\u00bd\u02e7\3\2\2\2\u00bf\u02ef\3\2" +
+                    "\2\2\u00c1\u02f5\3\2\2\2\u00c3\u02fb\3\2\2\2\u00c5\u0302\3\2\2\2\u00c7" +
+                    "\u0309\3\2\2\2\u00c9\u0312\3\2\2\2\u00cb\u0319\3\2\2\2\u00cd\u0320\3\2" +
+                    "\2\2\u00cf\u032d\3\2\2\2\u00d1\u0333\3\2\2\2\u00d3\u033d\3\2\2\2\u00d5" +
+                    "\u0346\3\2\2\2\u00d7\u0352\3\2\2\2\u00d9\u035c\3\2\2\2\u00db\u0368\3\2" +
+                    "\2\2\u00dd\u0371\3\2\2\2\u00df\u0379\3\2\2\2\u00e1\u0390\3\2\2\2\u00e3" +
+                    "\u0394\3\2\2\2\u00e5\u03a0\3\2\2\2\u00e7\u03a6\3\2\2\2\u00e9\u03aa\3\2" +
+                    "\2\2\u00eb\u03bb\3\2\2\2\u00ed\u03d1\3\2\2\2\u00ef\u03d9\3\2\2\2\u00f1" +
+                    "\u03df\3\2\2\2\u00f3\u03e6\3\2\2\2\u00f5\u03ea\3\2\2\2\u00f7\u03ec\3\2" +
+                    "\2\2\u00f9\u03f0\3\2\2\2\u00fb\u03f6\3\2\2\2\u00fd\u03ff\3\2\2\2\u00ff" +
+                    "\u0401\3\2\2\2\u0101\u0405\3\2\2\2\u0103\u0407\3\2\2\2\u0105\u040a\3\2" +
+                    "\2\2\u0107\u0414\3\2\2\2\u0109\u0416\3\2\2\2\u010b\u0424\3\2\2\2\u010d" +
+                    "\u042a\3\2\2\2\u010f\u042d\3\2\2\2\u0111\u0430\3\2\2\2\u0113\u0433\3\2" +
+                    "\2\2\u0115\u0436\3\2\2\2\u0117\u0442\3\2\2\2\u0119\u0446\3\2\2\2\u011b" +
+                    "\u0448\3\2\2\2\u011d\u011e\7\61\2\2\u011e\u011f\7,\2\2\u011f\u0123\3\2" +
+                    "\2\2\u0120\u0122\13\2\2\2\u0121\u0120\3\2\2\2\u0122\u0125\3\2\2\2\u0123" +
+                    "\u0124\3\2\2\2\u0123\u0121\3\2\2\2\u0124\u0126\3\2\2\2\u0125\u0123\3\2" +
+                    "\2\2\u0126\u0127\7,\2\2\u0127\u0128\7\61\2\2\u0128\u0129\3\2\2\2\u0129" +
+                    "\u012a\b\2\2\2\u012a\4\3\2\2\2\u012b\u012c\7\61\2\2\u012c\u012d\7\61\2" +
+                    "\2\u012d\u0131\3\2\2\2\u012e\u0130\n\2\2\2\u012f\u012e\3\2\2\2\u0130\u0133" +
+                    "\3\2\2\2\u0131\u012f\3\2\2\2\u0131\u0132\3\2\2\2\u0132\u0134\3\2\2\2\u0133" +
+                    "\u0131\3\2\2\2\u0134\u0135\b\3\2\2\u0135\6\3\2\2\2\u0136\u0138\7\61\2" +
+                    "\2\u0137\u0139\5\u0117\u008c\2\u0138\u0137\3\2\2\2\u0139\u013a\3\2\2\2" +
+                    "\u013a\u0138\3\2\2\2\u013a\u013b\3\2\2\2\u013b\u013c\3\2\2\2\u013c\u013d" +
+                    "\6\4\2\2\u013d\u0141\7\61\2\2\u013e\u0140\5\u010b\u0086\2\u013f\u013e" +
+                    "\3\2\2\2\u0140\u0143\3\2\2\2\u0141\u013f\3\2\2\2\u0141\u0142\3\2\2\2\u0142" +
+                    "\b\3\2\2\2\u0143\u0141\3\2\2\2\u0144\u0145\7]\2\2\u0145\n\3\2\2\2\u0146" +
+                    "\u0147\7_\2\2\u0147\f\3\2\2\2\u0148\u0149\7*\2\2\u0149\16\3\2\2\2\u014a" +
+                    "\u014b\7+\2\2\u014b\20\3\2\2\2\u014c\u014d\7}\2\2\u014d\u014e\b\t\3\2" +
+                    "\u014e\22\3\2\2\2\u014f\u0150\7\177\2\2\u0150\u0151\b\n\4\2\u0151\24\3" +
+                    "\2\2\2\u0152\u0153\7=\2\2\u0153\26\3\2\2\2\u0154\u0155\7.\2\2\u0155\30" +
+                    "\3\2\2\2\u0156\u0157\7?\2\2\u0157\32\3\2\2\2\u0158\u0159\7A\2\2\u0159" +
+                    "\34\3\2\2\2\u015a\u015b\7<\2\2\u015b\36\3\2\2\2\u015c\u015d\7\60\2\2\u015d" +
+                    "\u015e\7\60\2\2\u015e\u015f\7\60\2\2\u015f \3\2\2\2\u0160\u0161\7\60\2" +
+                    "\2\u0161\"\3\2\2\2\u0162\u0163\7-\2\2\u0163\u0164\7-\2\2\u0164$\3\2\2" +
+                    "\2\u0165\u0166\7/\2\2\u0166\u0167\7/\2\2\u0167&\3\2\2\2\u0168\u0169\7" +
+                    "-\2\2\u0169(\3\2\2\2\u016a\u016b\7/\2\2\u016b*\3\2\2\2\u016c\u016d\7\u0080" +
+                    "\2\2\u016d,\3\2\2\2\u016e\u016f\7#\2\2\u016f.\3\2\2\2\u0170\u0171\7,\2" +
+                    "\2\u0171\60\3\2\2\2\u0172\u0173\7\61\2\2\u0173\62\3\2\2\2\u0174\u0175" +
+                    "\7\'\2\2\u0175\64\3\2\2\2\u0176\u0177\7@\2\2\u0177\u0178\7@\2\2\u0178" +
+                    "\66\3\2\2\2\u0179\u017a\7>\2\2\u017a\u017b\7>\2\2\u017b8\3\2\2\2\u017c" +
+                    "\u017d\7@\2\2\u017d\u017e\7@\2\2\u017e\u017f\7@\2\2\u017f:\3\2\2\2\u0180" +
+                    "\u0181\7>\2\2\u0181<\3\2\2\2\u0182\u0183\7@\2\2\u0183>\3\2\2\2\u0184\u0185" +
+                    "\7>\2\2\u0185\u0186\7?\2\2\u0186@\3\2\2\2\u0187\u0188\7@\2\2\u0188\u0189" +
+                    "\7?\2\2\u0189B\3\2\2\2\u018a\u018b\7?\2\2\u018b\u018c\7?\2\2\u018cD\3" +
+                    "\2\2\2\u018d\u018e\7#\2\2\u018e\u018f\7?\2\2\u018fF\3\2\2\2\u0190\u0191" +
+                    "\7?\2\2\u0191\u0192\7?\2\2\u0192\u0193\7?\2\2\u0193H\3\2\2\2\u0194\u0195" +
+                    "\7#\2\2\u0195\u0196\7?\2\2\u0196\u0197\7?\2\2\u0197J\3\2\2\2\u0198\u0199" +
+                    "\7(\2\2\u0199L\3\2\2\2\u019a\u019b\7`\2\2\u019bN\3\2\2\2\u019c\u019d\7" +
+                    "~\2\2\u019dP\3\2\2\2\u019e\u019f\7(\2\2\u019f\u01a0\7(\2\2\u01a0R\3\2" +
+                    "\2\2\u01a1\u01a2\7~\2\2\u01a2\u01a3\7~\2\2\u01a3T\3\2\2\2\u01a4\u01a5" +
+                    "\7,\2\2\u01a5\u01a6\7?\2\2\u01a6V\3\2\2\2\u01a7\u01a8\7\61\2\2\u01a8\u01a9" +
+                    "\7?\2\2\u01a9X\3\2\2\2\u01aa\u01ab\7\'\2\2\u01ab\u01ac\7?\2\2\u01acZ\3" +
+                    "\2\2\2\u01ad\u01ae\7-\2\2\u01ae\u01af\7?\2\2\u01af\\\3\2\2\2\u01b0\u01b1" +
+                    "\7/\2\2\u01b1\u01b2\7?\2\2\u01b2^\3\2\2\2\u01b3\u01b4\7>\2\2\u01b4\u01b5" +
+                    "\7>\2\2\u01b5\u01b6\7?\2\2\u01b6`\3\2\2\2\u01b7\u01b8\7@\2\2\u01b8\u01b9" +
+                    "\7@\2\2\u01b9\u01ba\7?\2\2\u01bab\3\2\2\2\u01bb\u01bc\7@\2\2\u01bc\u01bd" +
+                    "\7@\2\2\u01bd\u01be\7@\2\2\u01be\u01bf\7?\2\2\u01bfd\3\2\2\2\u01c0\u01c1" +
+                    "\7(\2\2\u01c1\u01c2\7?\2\2\u01c2f\3\2\2\2\u01c3\u01c4\7`\2\2\u01c4\u01c5" +
+                    "\7?\2\2\u01c5h\3\2\2\2\u01c6\u01c7\7~\2\2\u01c7\u01c8\7?\2\2\u01c8j\3" +
+                    "\2\2\2\u01c9\u01ca\7?\2\2\u01ca\u01cb\7@\2\2\u01cbl\3\2\2\2\u01cc\u01cd" +
+                    "\7p\2\2\u01cd\u01ce\7w\2\2\u01ce\u01cf\7n\2\2\u01cf\u01d0\7n\2\2\u01d0" +
+                    "n\3\2\2\2\u01d1\u01d2\7v\2\2\u01d2\u01d3\7t\2\2\u01d3\u01d4\7w\2\2\u01d4" +
+                    "\u01db\7g\2\2\u01d5\u01d6\7h\2\2\u01d6\u01d7\7c\2\2\u01d7\u01d8\7n\2\2" +
+                    "\u01d8\u01d9\7u\2\2\u01d9\u01db\7g\2\2\u01da\u01d1\3\2\2\2\u01da\u01d5" +
+                    "\3\2\2\2\u01dbp\3\2\2\2\u01dc\u01dd\5\u0107\u0084\2\u01dd\u01e1\7\60\2" +
+                    "\2\u01de\u01e0\t\3\2\2\u01df\u01de\3\2\2\2\u01e0\u01e3\3\2\2\2\u01e1\u01df" +
+                    "\3\2\2\2\u01e1\u01e2\3\2\2\2\u01e2\u01e5\3\2\2\2\u01e3\u01e1\3\2\2\2\u01e4" +
+                    "\u01e6\5\u0109\u0085\2\u01e5\u01e4\3\2\2\2\u01e5\u01e6\3\2\2\2\u01e6\u01f5" +
+                    "\3\2\2\2\u01e7\u01e9\7\60\2\2\u01e8\u01ea\t\3\2\2\u01e9\u01e8\3\2\2\2" +
+                    "\u01ea\u01eb\3\2\2\2\u01eb\u01e9\3\2\2\2\u01eb\u01ec\3\2\2\2\u01ec\u01ee" +
+                    "\3\2\2\2\u01ed\u01ef\5\u0109\u0085\2\u01ee\u01ed\3\2\2\2\u01ee\u01ef\3" +
+                    "\2\2\2\u01ef\u01f5\3\2\2\2\u01f0\u01f2\5\u0107\u0084\2\u01f1\u01f3\5\u0109" +
+                    "\u0085\2\u01f2\u01f1\3\2\2\2\u01f2\u01f3\3\2\2\2\u01f3\u01f5\3\2\2\2\u01f4" +
+                    "\u01dc\3\2\2\2\u01f4\u01e7\3\2\2\2\u01f4\u01f0\3\2\2\2\u01f5r\3\2\2\2" +
+                    "\u01f6\u01f7\7\62\2\2\u01f7\u01f9\t\4\2\2\u01f8\u01fa\5\u0105\u0083\2" +
+                    "\u01f9\u01f8\3\2\2\2\u01fa\u01fb\3\2\2\2\u01fb\u01f9\3\2\2\2\u01fb\u01fc" +
+                    "\3\2\2\2\u01fct\3\2\2\2\u01fd\u01ff\7\62\2\2\u01fe\u0200\t\5\2\2\u01ff" +
+                    "\u01fe\3\2\2\2\u0200\u0201\3\2\2\2\u0201\u01ff\3\2\2\2\u0201\u0202\3\2" +
+                    "\2\2\u0202\u0203\3\2\2\2\u0203\u0204\6;\3\2\u0204v\3\2\2\2\u0205\u0206" +
+                    "\7\62\2\2\u0206\u0208\t\6\2\2\u0207\u0209\t\5\2\2\u0208\u0207\3\2\2\2" +
+                    "\u0209\u020a\3\2\2\2\u020a\u0208\3\2\2\2\u020a\u020b\3\2\2\2\u020bx\3" +
+                    "\2\2\2\u020c\u020d\7\62\2\2\u020d\u020f\t\7\2\2\u020e\u0210\t\b\2\2\u020f" +
+                    "\u020e\3\2\2\2\u0210\u0211\3\2\2\2\u0211\u020f\3\2\2\2\u0211\u0212\3\2" +
+                    "\2\2\u0212z\3\2\2\2\u0213\u0214\7d\2\2\u0214\u0215\7t\2\2\u0215\u0216" +
+                    "\7g\2\2\u0216\u0217\7c\2\2\u0217\u0218\7m\2\2\u0218|\3\2\2\2\u0219\u021a" +
+                    "\7f\2\2\u021a\u021b\7q\2\2\u021b~\3\2\2\2\u021c\u021d\7k\2\2\u021d\u021e" +
+                    "\7p\2\2\u021e\u021f\7u\2\2\u021f\u0220\7v\2\2\u0220\u0221\7c\2\2\u0221" +
+                    "\u0222\7p\2\2\u0222\u0223\7e\2\2\u0223\u0224\7g\2\2\u0224\u0225\7q\2\2" +
+                    "\u0225\u0226\7h\2\2\u0226\u0080\3\2\2\2\u0227\u0228\7v\2\2\u0228\u0229" +
+                    "\7{\2\2\u0229\u022a\7r\2\2\u022a\u022b\7g\2\2\u022b\u022c\7q\2\2\u022c" +
+                    "\u022d\7h\2\2\u022d\u0082\3\2\2\2\u022e\u022f\7e\2\2\u022f\u0230\7c\2" +
+                    "\2\u0230\u0231\7u\2\2\u0231\u0232\7g\2\2\u0232\u0084\3\2\2\2\u0233\u0234" +
+                    "\7g\2\2\u0234\u0235\7n\2\2\u0235\u0236\7u\2\2\u0236\u0237\7g\2\2\u0237" +
+                    "\u0086\3\2\2\2\u0238\u0239\7p\2\2\u0239\u023a\7g\2\2\u023a\u023b\7y\2" +
+                    "\2\u023b\u0088\3\2\2\2\u023c\u023d\7x\2\2\u023d\u023e\7c\2\2\u023e\u023f" +
+                    "\7t\2\2\u023f\u008a\3\2\2\2\u0240\u0241\7e\2\2\u0241\u0242\7c\2\2\u0242" +
+                    "\u0243\7v\2\2\u0243\u0244\7e\2\2\u0244\u0245\7j\2\2\u0245\u008c\3\2\2" +
+                    "\2\u0246\u0247\7h\2\2\u0247\u0248\7k\2\2\u0248\u0249\7p\2\2\u0249\u024a" +
+                    "\7c\2\2\u024a\u024b\7n\2\2\u024b\u024c\7n\2\2\u024c\u024d\7{\2\2\u024d" +
+                    "\u008e\3\2\2\2\u024e\u024f\7t\2\2\u024f\u0250\7g\2\2\u0250\u0251\7v\2" +
+                    "\2\u0251\u0252\7w\2\2\u0252\u0253\7t\2\2\u0253\u0254\7p\2\2\u0254\u0090" +
+                    "\3\2\2\2\u0255\u0256\7x\2\2\u0256\u0257\7q\2\2\u0257\u0258\7k\2\2\u0258" +
+                    "\u0259\7f\2\2\u0259\u0092\3\2\2\2\u025a\u025b\7e\2\2\u025b\u025c\7q\2" +
+                    "\2\u025c\u025d\7p\2\2\u025d\u025e\7v\2\2\u025e\u025f\7k\2\2\u025f\u0260" +
+                    "\7p\2\2\u0260\u0261\7w\2\2\u0261\u0262\7g\2\2\u0262\u0094\3\2\2\2\u0263" +
+                    "\u0264\7h\2\2\u0264\u0265\7q\2\2\u0265\u0266\7t\2\2\u0266\u0096\3\2\2" +
+                    "\2\u0267\u0268\7u\2\2\u0268\u0269\7y\2\2\u0269\u026a\7k\2\2\u026a\u026b" +
+                    "\7v\2\2\u026b\u026c\7e\2\2\u026c\u026d\7j\2\2\u026d\u0098\3\2\2\2\u026e" +
+                    "\u026f\7y\2\2\u026f\u0270\7j\2\2\u0270\u0271\7k\2\2\u0271\u0272\7n\2\2" +
+                    "\u0272\u0273\7g\2\2\u0273\u009a\3\2\2\2\u0274\u0275\7f\2\2\u0275\u0276" +
+                    "\7g\2\2\u0276\u0277\7d\2\2\u0277\u0278\7w\2\2\u0278\u0279\7i\2\2\u0279" +
+                    "\u027a\7i\2\2\u027a\u027b\7g\2\2\u027b\u027c\7t\2\2\u027c\u009c\3\2\2" +
+                    "\2\u027d\u027e\7h\2\2\u027e\u027f\7w\2\2\u027f\u0280\7p\2\2\u0280\u0281" +
+                    "\7e\2\2\u0281\u0282\7v\2\2\u0282\u0283\7k\2\2\u0283\u0284\7q\2\2\u0284" +
+                    "\u0285\7p\2\2\u0285\u009e\3\2\2\2\u0286\u0287\7v\2\2\u0287\u0288\7j\2" +
+                    "\2\u0288\u0289\7k\2\2\u0289\u028a\7u\2\2\u028a\u00a0\3\2\2\2\u028b\u028c" +
+                    "\7y\2\2\u028c\u028d\7k\2\2\u028d\u028e\7v\2\2\u028e\u028f\7j\2\2\u028f" +
+                    "\u00a2\3\2\2\2\u0290\u0291\7f\2\2\u0291\u0292\7g\2\2\u0292\u0293\7h\2" +
+                    "\2\u0293\u0294\7c\2\2\u0294\u0295\7w\2\2\u0295\u0296\7n\2\2\u0296\u0297" +
+                    "\7v\2\2\u0297\u00a4\3\2\2\2\u0298\u0299\7k\2\2\u0299\u029a\7h\2\2\u029a" +
+                    "\u00a6\3\2\2\2\u029b\u029c\7v\2\2\u029c\u029d\7j\2\2\u029d\u029e\7t\2" +
+                    "\2\u029e\u029f\7q\2\2\u029f\u02a0\7y\2\2\u02a0\u00a8\3\2\2\2\u02a1\u02a2" +
+                    "\7f\2\2\u02a2\u02a3\7g\2\2\u02a3\u02a4\7n\2\2\u02a4\u02a5\7g\2\2\u02a5" +
+                    "\u02a6\7v\2\2\u02a6\u02a7\7g\2\2\u02a7\u00aa\3\2\2\2\u02a8\u02a9\7k\2" +
+                    "\2\u02a9\u02aa\7p\2\2\u02aa\u00ac\3\2\2\2\u02ab\u02ac\7v\2\2\u02ac\u02ad" +
+                    "\7t\2\2\u02ad\u02ae\7{\2\2\u02ae\u00ae\3\2\2\2\u02af\u02b0\7g\2\2\u02b0" +
+                    "\u02b1\7x\2\2\u02b1\u02b2\7g\2\2\u02b2\u02b3\7p\2\2\u02b3\u02b4\7v\2\2" +
+                    "\u02b4\u00b0\3\2\2\2\u02b5\u02b6\7B\2\2\u02b6\u00b2\3\2\2\2\u02b7\u02b8" +
+                    "\7C\2\2\u02b8\u02b9\7V\2\2\u02b9\u02ba\7a\2\2\u02ba\u02bb\7N\2\2\u02bb" +
+                    "\u02bc\7G\2\2\u02bc\u02bd\7C\2\2\u02bd\u02be\7U\2\2\u02be\u02bf\7V\2\2" +
+                    "\u02bf\u02c0\7a\2\2\u02c0\u02c1\7Q\2\2\u02c1\u02c2\7P\2\2\u02c2\u02c3" +
+                    "\7E\2\2\u02c3\u02c4\7G\2\2\u02c4\u00b4\3\2\2\2\u02c5\u02c6\7C\2\2\u02c6" +
+                    "\u02c7\7V\2\2\u02c7\u02c8\7a\2\2\u02c8\u02c9\7O\2\2\u02c9\u02ca\7Q\2\2" +
+                    "\u02ca\u02cb\7U\2\2\u02cb\u02cc\7V\2\2\u02cc\u02cd\7a\2\2\u02cd\u02ce" +
+                    "\7Q\2\2\u02ce\u02cf\7P\2\2\u02cf\u02d0\7E\2\2\u02d0\u02d1\7G\2\2\u02d1" +
+                    "\u00b6\3\2\2\2\u02d2\u02d3\7Q\2\2\u02d3\u02d4\7P\2\2\u02d4\u02d5\7N\2" +
+                    "\2\u02d5\u02d6\7[\2\2\u02d6\u02d7\7a\2\2\u02d7\u02d8\7Q\2\2\u02d8\u02d9" +
+                    "\7P\2\2\u02d9\u02da\7E\2\2\u02da\u02db\7G\2\2\u02db\u00b8\3\2\2\2\u02dc" +
+                    "\u02dd\7e\2\2\u02dd\u02de\7n\2\2\u02de\u02df\7c\2\2\u02df\u02e0\7u\2\2" +
+                    "\u02e0\u02e1\7u\2\2\u02e1\u00ba\3\2\2\2\u02e2\u02e3\7g\2\2\u02e3\u02e4" +
+                    "\7p\2\2\u02e4\u02e5\7w\2\2\u02e5\u02e6\7o\2\2\u02e6\u00bc\3\2\2\2\u02e7" +
+                    "\u02e8\7g\2\2\u02e8\u02e9\7z\2\2\u02e9\u02ea\7v\2\2\u02ea\u02eb\7g\2\2" +
+                    "\u02eb\u02ec\7p\2\2\u02ec\u02ed\7f\2\2\u02ed\u02ee\7u\2\2\u02ee\u00be" +
+                    "\3\2\2\2\u02ef\u02f0\7u\2\2\u02f0\u02f1\7w\2\2\u02f1\u02f2\7r\2\2\u02f2" +
+                    "\u02f3\7g\2\2\u02f3\u02f4\7t\2\2\u02f4\u00c0\3\2\2\2\u02f5\u02f6\7e\2" +
+                    "\2\u02f6\u02f7\7q\2\2\u02f7\u02f8\7p\2\2\u02f8\u02f9\7u\2\2\u02f9\u02fa" +
+                    "\7v\2\2\u02fa\u00c2\3\2\2\2\u02fb\u02fc\7g\2\2\u02fc\u02fd\7z\2\2\u02fd" +
+                    "\u02fe\7r\2\2\u02fe\u02ff\7q\2\2\u02ff\u0300\7t\2\2\u0300\u0301\7v\2\2" +
+                    "\u0301\u00c4\3\2\2\2\u0302\u0303\7k\2\2\u0303\u0304\7o\2\2\u0304\u0305" +
+                    "\7r\2\2\u0305\u0306\7q\2\2\u0306\u0307\7t\2\2\u0307\u0308\7v\2\2\u0308" +
+                    "\u00c6\3\2\2\2\u0309\u030a\7e\2\2\u030a\u030b\7q\2\2\u030b\u030c\7p\2" +
+                    "\2\u030c\u030d\7v\2\2\u030d\u030e\7t\2\2\u030e\u030f\7c\2\2\u030f\u0310" +
+                    "\7e\2\2\u0310\u0311\7v\2\2\u0311\u00c8\3\2\2\2\u0312\u0313\7o\2\2\u0313" +
+                    "\u0314\7q\2\2\u0314\u0315\7f\2\2\u0315\u0316\7w\2\2\u0316\u0317\7n\2\2" +
+                    "\u0317\u0318\7g\2\2\u0318\u00ca\3\2\2\2\u0319\u031a\7q\2\2\u031a\u031b" +
+                    "\7t\2\2\u031b\u031c\7c\2\2\u031c\u031d\7e\2\2\u031d\u031e\7n\2\2\u031e" +
+                    "\u031f\7g\2\2\u031f\u00cc\3\2\2\2\u0320\u0321\7k\2\2\u0321\u0322\7o\2" +
+                    "\2\u0322\u0323\7r\2\2\u0323\u0324\7n\2\2\u0324\u0325\7g\2\2\u0325\u0326" +
+                    "\7o\2\2\u0326\u0327\7g\2\2\u0327\u0328\7p\2\2\u0328\u0329\7v\2\2\u0329" +
+                    "\u032a\7u\2\2\u032a\u032b\3\2\2\2\u032b\u032c\6g\4\2\u032c\u00ce\3\2\2" +
+                    "\2\u032d\u032e\7n\2\2\u032e\u032f\7g\2\2\u032f\u0330\7v\2\2\u0330\u0331" +
+                    "\3\2\2\2\u0331\u0332\6h\5\2\u0332\u00d0\3\2\2\2\u0333\u0334\7r\2\2\u0334" +
+                    "\u0335\7t\2\2\u0335\u0336\7k\2\2\u0336\u0337\7x\2\2\u0337\u0338\7c\2\2" +
+                    "\u0338\u0339\7v\2\2\u0339\u033a\7g\2\2\u033a\u033b\3\2\2\2\u033b\u033c" +
+                    "\6i\6\2\u033c\u00d2\3\2\2\2\u033d\u033e\7r\2\2\u033e\u033f\7w\2\2\u033f" +
+                    "\u0340\7d\2\2\u0340\u0341\7n\2\2\u0341\u0342\7k\2\2\u0342\u0343\7e\2\2" +
+                    "\u0343\u0344\3\2\2\2\u0344\u0345\6j\7\2\u0345\u00d4\3\2\2\2\u0346\u0347" +
+                    "\7k\2\2\u0347\u0348\7p\2\2\u0348\u0349\7v\2\2\u0349\u034a\7g\2\2\u034a" +
+                    "\u034b\7t\2\2\u034b\u034c\7h\2\2\u034c\u034d\7c\2\2\u034d\u034e\7e\2\2" +
+                    "\u034e\u034f\7g\2\2\u034f\u0350\3\2\2\2\u0350\u0351\6k\b\2\u0351\u00d6" +
+                    "\3\2\2\2\u0352\u0353\7r\2\2\u0353\u0354\7c\2\2\u0354\u0355\7e\2\2\u0355" +
+                    "\u0356\7m\2\2\u0356\u0357\7c\2\2\u0357\u0358\7i\2\2\u0358\u0359\7g\2\2" +
+                    "\u0359\u035a\3\2\2\2\u035a\u035b\6l\t\2\u035b\u00d8\3\2\2\2\u035c\u035d" +
+                    "\7r\2\2\u035d\u035e\7t\2\2\u035e\u035f\7q\2\2\u035f\u0360\7v\2\2\u0360" +
+                    "\u0361\7g\2\2\u0361\u0362\7e\2\2\u0362\u0363\7v\2\2\u0363\u0364\7g\2\2" +
+                    "\u0364\u0365\7f\2\2\u0365\u0366\3\2\2\2\u0366\u0367\6m\n\2\u0367\u00da" +
+                    "\3\2\2\2\u0368\u0369\7u\2\2\u0369\u036a\7v\2\2\u036a\u036b\7c\2\2\u036b" +
+                    "\u036c\7v\2\2\u036c\u036d\7k\2\2\u036d\u036e\7e\2\2\u036e\u036f\3\2\2" +
+                    "\2\u036f\u0370\6n\13\2\u0370\u00dc\3\2\2\2\u0371\u0372\7{\2\2\u0372\u0373" +
+                    "\7k\2\2\u0373\u0374\7g\2\2\u0374\u0375\7n\2\2\u0375\u0376\7f\2\2\u0376" +
+                    "\u0377\3\2\2\2\u0377\u0378\6o\f\2\u0378\u00de\3\2\2\2\u0379\u037d\5\u010d" +
+                    "\u0087\2\u037a\u037c\5\u010b\u0086\2\u037b\u037a\3\2\2\2\u037c\u037f\3" +
+                    "\2\2\2\u037d\u037b\3\2\2\2\u037d\u037e\3\2\2\2\u037e\u00e0\3\2\2\2\u037f" +
+                    "\u037d\3\2\2\2\u0380\u0384\7$\2\2\u0381\u0383\5\u00efx\2\u0382\u0381\3" +
+                    "\2\2\2\u0383\u0386\3\2\2\2\u0384\u0382\3\2\2\2\u0384\u0385\3\2\2\2\u0385" +
+                    "\u0387\3\2\2\2\u0386\u0384\3\2\2\2\u0387\u0391\7$\2\2\u0388\u038c\7)\2" +
+                    "\2\u0389\u038b\5\u00f1y\2\u038a\u0389\3\2\2\2\u038b\u038e\3\2\2\2\u038c" +
+                    "\u038a\3\2\2\2\u038c\u038d\3\2\2\2\u038d\u038f\3\2\2\2\u038e\u038c\3\2" +
+                    "\2\2\u038f\u0391\7)\2\2\u0390\u0380\3\2\2\2\u0390\u0388\3\2\2\2\u0391" +
+                    "\u0392\3\2\2\2\u0392\u0393\bq\5\2\u0393\u00e2\3\2\2\2\u0394\u039a\7b\2" +
+                    "\2\u0395\u0396\7^\2\2\u0396\u0399\7b\2\2\u0397\u0399\n\t\2\2\u0398\u0395" +
+                    "\3\2\2\2\u0398\u0397\3\2\2\2\u0399\u039c\3\2\2\2\u039a\u0398\3\2\2\2\u039a" +
+                    "\u039b\3\2\2\2\u039b\u039d\3\2\2\2\u039c\u039a\3\2\2\2\u039d\u039e\7b" +
+                    "\2\2\u039e\u00e4\3\2\2\2\u039f\u03a1\t\n\2\2\u03a0\u039f\3\2\2\2\u03a1" +
+                    "\u03a2\3\2\2\2\u03a2\u03a0\3\2\2\2\u03a2\u03a3\3\2\2\2\u03a3\u03a4\3\2" +
+                    "\2\2\u03a4\u03a5\bs\2\2\u03a5\u00e6\3\2\2\2\u03a6\u03a7\t\2\2\2\u03a7" +
+                    "\u03a8\3\2\2\2\u03a8\u03a9\bt\2\2\u03a9\u00e8\3\2\2\2\u03aa\u03ab\7>\2" +
+                    "\2\u03ab\u03ac\7#\2\2\u03ac\u03ad\7/\2\2\u03ad\u03ae\7/\2\2\u03ae\u03b2" +
+                    "\3\2\2\2\u03af\u03b1\13\2\2\2\u03b0\u03af\3\2\2\2\u03b1\u03b4\3\2\2\2" +
+                    "\u03b2\u03b3\3\2\2\2\u03b2\u03b0\3\2\2\2\u03b3\u03b5\3\2\2\2\u03b4\u03b2" +
+                    "\3\2\2\2\u03b5\u03b6\7/\2\2\u03b6\u03b7\7/\2\2\u03b7\u03b8\7@\2\2\u03b8" +
+                    "\u03b9\3\2\2\2\u03b9\u03ba\bu\2\2\u03ba\u00ea\3\2\2\2\u03bb\u03bc\7>\2" +
+                    "\2\u03bc\u03bd\7#\2\2\u03bd\u03be\7]\2\2\u03be\u03bf\7E\2\2\u03bf\u03c0" +
+                    "\7F\2\2\u03c0\u03c1\7C\2\2\u03c1\u03c2\7V\2\2\u03c2\u03c3\7C\2\2\u03c3" +
+                    "\u03c4\7]\2\2\u03c4\u03c8\3\2\2\2\u03c5\u03c7\13\2\2\2\u03c6\u03c5\3\2" +
+                    "\2\2\u03c7\u03ca\3\2\2\2\u03c8\u03c9\3\2\2\2\u03c8\u03c6\3\2\2\2\u03c9" +
+                    "\u03cb\3\2\2\2\u03ca\u03c8\3\2\2\2\u03cb\u03cc\7_\2\2\u03cc\u03cd\7_\2" +
+                    "\2\u03cd\u03ce\7@\2\2\u03ce\u03cf\3\2\2\2\u03cf\u03d0\bv\2\2\u03d0\u00ec" +
+                    "\3\2\2\2\u03d1\u03d2\13\2\2\2\u03d2\u03d3\3\2\2\2\u03d3\u03d4\bw\6\2\u03d4" +
+                    "\u00ee\3\2\2\2\u03d5\u03da\n\13\2\2\u03d6\u03d7\7^\2\2\u03d7\u03da\5\u00f3" +
+                    "z\2\u03d8\u03da\5\u0103\u0082\2\u03d9\u03d5\3\2\2\2\u03d9\u03d6\3\2\2" +
+                    "\2\u03d9\u03d8\3\2\2\2\u03da\u00f0\3\2\2\2\u03db\u03e0\n\f\2\2\u03dc\u03dd" +
+                    "\7^\2\2\u03dd\u03e0\5\u00f3z\2\u03de\u03e0\5\u0103\u0082\2\u03df\u03db" +
+                    "\3\2\2\2\u03df\u03dc\3\2\2\2\u03df\u03de\3\2\2\2\u03e0\u00f2\3\2\2\2\u03e1" +
+                    "\u03e7\5\u00f5{\2\u03e2\u03e7\7\62\2\2\u03e3\u03e7\5\u00f7|\2\u03e4\u03e7" +
+                    "\5\u00f9}\2\u03e5\u03e7\5\u00fb~\2\u03e6\u03e1\3\2\2\2\u03e6\u03e2\3\2" +
+                    "\2\2\u03e6\u03e3\3\2\2\2\u03e6\u03e4\3\2\2\2\u03e6\u03e5\3\2\2\2\u03e7" +
+                    "\u00f4\3\2\2\2\u03e8\u03eb\5\u00fd\177\2\u03e9\u03eb\5\u00ff\u0080\2\u03ea" +
+                    "\u03e8\3\2\2\2\u03ea\u03e9\3\2\2\2\u03eb\u00f6\3\2\2\2\u03ec\u03ed\7z" +
+                    "\2\2\u03ed\u03ee\5\u0105\u0083\2\u03ee\u03ef\5\u0105\u0083\2\u03ef\u00f8" +
+                    "\3\2\2\2\u03f0\u03f1\7w\2\2\u03f1\u03f2\5\u0105\u0083\2\u03f2\u03f3\5" +
+                    "\u0105\u0083\2\u03f3\u03f4\5\u0105\u0083\2\u03f4\u03f5\5\u0105\u0083\2" +
+                    "\u03f5\u00fa\3\2\2\2\u03f6\u03f7\7w\2\2\u03f7\u03f9\7}\2\2\u03f8\u03fa" +
+                    "\5\u0105\u0083\2\u03f9\u03f8\3\2\2\2\u03fa\u03fb\3\2\2\2\u03fb\u03f9\3" +
+                    "\2\2\2\u03fb\u03fc\3\2\2\2\u03fc\u03fd\3\2\2\2\u03fd\u03fe\7\177\2\2\u03fe" +
+                    "\u00fc\3\2\2\2\u03ff\u0400\t\r\2\2\u0400\u00fe\3\2\2\2\u0401\u0402\n\16" +
+                    "\2\2\u0402\u0100\3\2\2\2\u0403\u0406\5\u00fd\177\2\u0404\u0406\t\17\2" +
+                    "\2\u0405\u0403\3\2\2\2\u0405\u0404\3\2\2\2\u0406\u0102\3\2\2\2\u0407\u0408" +
+                    "\7^\2\2\u0408\u0409\t\2\2\2\u0409\u0104\3\2\2\2\u040a\u040b\t\20\2\2\u040b" +
+                    "\u0106\3\2\2\2\u040c\u0415\7\62\2\2\u040d\u0411\t\21\2\2\u040e\u0410\t" +
+                    "\3\2\2\u040f\u040e\3\2\2\2\u0410\u0413\3\2\2\2\u0411\u040f\3\2\2\2\u0411" +
+                    "\u0412\3\2\2\2\u0412\u0415\3\2\2\2\u0413\u0411\3\2\2\2\u0414\u040c\3\2" +
+                    "\2\2\u0414\u040d\3\2\2\2\u0415\u0108\3\2\2\2\u0416\u0418\t\22\2\2\u0417" +
+                    "\u0419\t\23\2\2\u0418\u0417\3\2\2\2\u0418\u0419\3\2\2\2\u0419\u041b\3" +
+                    "\2\2\2\u041a\u041c\t\3\2\2\u041b\u041a\3\2\2\2\u041c\u041d\3\2\2\2\u041d" +
+                    "\u041b\3\2\2\2\u041d\u041e\3\2\2\2\u041e\u010a\3\2\2\2\u041f\u0425\5\u010d" +
+                    "\u0087\2\u0420\u0425\5\u0111\u0089\2\u0421\u0425\5\u0113\u008a\2\u0422" +
+                    "\u0425\5\u0115\u008b\2\u0423\u0425\4\u200e\u200f\2\u0424\u041f\3\2\2\2" +
+                    "\u0424\u0420\3\2\2\2\u0424\u0421\3\2\2\2\u0424\u0422\3\2\2\2\u0424\u0423" +
+                    "\3\2\2\2\u0425\u010c\3\2\2\2\u0426\u042b\5\u010f\u0088\2\u0427\u042b\t" +
+                    "\24\2\2\u0428\u0429\7^\2\2\u0429\u042b\5\u00f9}\2\u042a\u0426\3\2\2\2" +
+                    "\u042a\u0427\3\2\2\2\u042a\u0428\3\2\2\2\u042b\u010e\3\2\2\2\u042c\u042e" +
+                    "\t\25\2\2\u042d\u042c\3\2\2\2\u042e\u0110\3\2\2\2\u042f\u0431\t\26\2\2" +
+                    "\u0430\u042f\3\2\2\2\u0431\u0112\3\2\2\2\u0432\u0434\t\27\2\2\u0433\u0432" +
+                    "\3\2\2\2\u0434\u0114\3\2\2\2\u0435\u0437\t\30\2\2\u0436\u0435\3\2\2\2" +
+                    "\u0437\u0116\3\2\2\2\u0438\u0443\n\31\2\2\u0439\u0443\5\u011b\u008e\2" +
+                    "\u043a\u043e\7]\2\2\u043b\u043d\5\u0119\u008d\2\u043c\u043b\3\2\2\2\u043d" +
+                    "\u0440\3\2\2\2\u043e\u043c\3\2\2\2\u043e\u043f\3\2\2\2\u043f\u0441\3\2" +
+                    "\2\2\u0440\u043e\3\2\2\2\u0441\u0443\7_\2\2\u0442\u0438\3\2\2\2\u0442" +
+                    "\u0439\3\2\2\2\u0442\u043a\3\2\2\2\u0443\u0118\3\2\2\2\u0444\u0447\n\32" +
+                    "\2\2\u0445\u0447\5\u011b\u008e\2\u0446\u0444\3\2\2\2\u0446\u0445\3\2\2" +
+                    "\2\u0447\u011a\3\2\2\2\u0448\u0449\7^\2\2\u0449\u044a\n\2\2\2\u044a\u011c" +
+                    "\3\2\2\2.\2\u0123\u0131\u013a\u0141\u01da\u01e1\u01e5\u01eb\u01ee\u01f2" +
+                    "\u01f4\u01fb\u0201\u020a\u0211\u037d\u0384\u038c\u0390\u0398\u039a\u03a2" +
+                    "\u03b2\u03c8\u03d9\u03df\u03e6\u03ea\u03fb\u0405\u0411\u0414\u0418\u041d" +
+                    "\u0424\u042a\u042d\u0430\u0433\u0436\u043e\u0442\u0446\7\2\3\2\3\t\2\3" +
+                    "\n\3\3q\4\2\4\2";
+    public static final ATN _ATN =
+            new ATNDeserializer().deserialize(_serializedATN.toCharArray());
+    protected static final DFA[] _decisionToDFA;
+    protected static final PredictionContextCache _sharedContextCache =
+            new PredictionContextCache();
+    private static final String[] _LITERAL_NAMES = makeLiteralNames();
+    private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
+    public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
+    public static String[] channelNames = {
+            "DEFAULT_TOKEN_CHANNEL", "HIDDEN", "ERROR"
+    };
+    public static String[] modeNames = {
+            "DEFAULT_MODE"
+    };
+
+    static {
+        RuntimeMetaData.checkVersion("4.9.1", RuntimeMetaData.VERSION);
+    }
+
+    static {
+        tokenNames = new String[_SYMBOLIC_NAMES.length];
+        for (int i = 0; i < tokenNames.length; i++) {
+            tokenNames[i] = VOCABULARY.getLiteralName(i);
+            if (tokenNames[i] == null) {
+                tokenNames[i] = VOCABULARY.getSymbolicName(i);
+            }
+
+            if (tokenNames[i] == null) {
+                tokenNames[i] = "<INVALID>";
+            }
+        }
+    }
+
+    static {
+        _decisionToDFA = new DFA[_ATN.getNumberOfDecisions()];
+        for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) {
+            _decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
+        }
+    }
+
+    public JavaScriptLexer(CharStream input) {
+        super(input);
+        _interp = new LexerATNSimulator(this, _ATN, _decisionToDFA, _sharedContextCache);
+    }
+
+    private static String[] makeRuleNames() {
+        return new String[]{
+                "MultiLineComment", "SingleLineComment", "RegularExpressionLiteral",
+                "OpenBracket", "CloseBracket", "OpenParen", "CloseParen", "OpenBrace",
+                "CloseBrace", "SemiColon", "Comma", "Assign", "QuestionMark", "Colon",
+                "Ellipsis", "Dot", "PlusPlus", "MinusMinus", "Plus", "Minus", "BitNot",
+                "Not", "Multiply", "Divide", "Modulus", "RightShiftArithmetic", "LeftShiftArithmetic",
+                "RightShiftLogical", "LessThan", "MoreThan", "LessThanEquals", "GreaterThanEquals",
+                "Equals_", "NotEquals", "IdentityEquals", "IdentityNotEquals", "BitAnd",
+                "BitXOr", "BitOr", "And", "Or", "MultiplyAssign", "DivideAssign", "ModulusAssign",
+                "PlusAssign", "MinusAssign", "LeftShiftArithmeticAssign", "RightShiftArithmeticAssign",
+                "RightShiftLogicalAssign", "BitAndAssign", "BitXorAssign", "BitOrAssign",
+                "ARROW", "NullLiteral", "BooleanLiteral", "DecimalLiteral", "HexIntegerLiteral",
+                "OctalIntegerLiteral", "OctalIntegerLiteral2", "BinaryIntegerLiteral",
+                "Break", "Do", "Instanceof", "Typeof", "Case", "Else", "New", "Var",
+                "Catch", "Finally", "Return", "Void", "Continue", "For", "Switch", "While",
+                "Debugger", "Function", "This", "With", "Default", "If", "Throw", "Delete",
+                "In", "Try", "Event", "AtToken", "AtLeastOnce", "AtMostOnce", "OnlyOnce",
+                "Class", "Enum", "Extends", "Super", "Const", "Export", "Import", "Contract",
+                "Module", "Oracle", "Implements", "Let", "Private", "Public", "Interface",
+                "Package", "Protected", "Static", "Yield", "Identifier", "StringLiteral",
+                "TemplateStringLiteral", "WhiteSpaces", "LineTerminator", "HtmlComment",
+                "CDataComment", "UnexpectedCharacter", "DoubleStringCharacter", "SingleStringCharacter",
+                "EscapeSequence", "CharacterEscapeSequence", "HexEscapeSequence", "UnicodeEscapeSequence",
+                "ExtendedUnicodeEscapeSequence", "SingleEscapeCharacter", "NonEscapeCharacter",
+                "EscapeCharacter", "LineContinuation", "HexDigit", "DecimalIntegerLiteral",
+                "ExponentPart", "IdentifierPart", "IdentifierStart", "UnicodeLetter",
+                "UnicodeCombiningMark", "UnicodeDigit", "UnicodeConnectorPunctuation",
+                "RegularExpressionChar", "RegularExpressionClassChar", "RegularExpressionBackslashSequence"
+        };
+    }
+
+    private static String[] makeLiteralNames() {
+        return new String[]{
+                null, null, null, null, "'['", "']'", "'('", "')'", "'{'", "'}'", "';'",
+                "','", "'='", "'?'", "':'", "'...'", "'.'", "'++'", "'--'", "'+'", "'-'",
+                "'~'", "'!'", "'*'", "'/'", "'%'", "'>>'", "'<<'", "'>>>'", "'<'", "'>'",
+                "'<='", "'>='", "'=='", "'!='", "'==='", "'!=='", "'&'", "'^'", "'|'",
+                "'&&'", "'||'", "'*='", "'/='", "'%='", "'+='", "'-='", "'<<='", "'>>='",
+                "'>>>='", "'&='", "'^='", "'|='", "'=>'", "'null'", null, null, null,
+                null, null, null, "'break'", "'do'", "'instanceof'", "'typeof'", "'case'",
+                "'else'", "'new'", "'var'", "'catch'", "'finally'", "'return'", "'void'",
+                "'continue'", "'for'", "'switch'", "'while'", "'debugger'", "'function'",
+                "'this'", "'with'", "'default'", "'if'", "'throw'", "'delete'", "'in'",
+                "'try'", "'event'", "'@'", "'AT_LEAST_ONCE'", "'AT_MOST_ONCE'", "'ONLY_ONCE'",
+                "'class'", "'enum'", "'extends'", "'super'", "'const'", "'export'", "'import'",
+                "'contract'", "'module'", "'oracle'", "'implements'", "'let'", "'private'",
+                "'public'", "'interface'", "'package'", "'protected'", "'static'", "'yield'"
+        };
+    }
+
+    private static String[] makeSymbolicNames() {
+        return new String[]{
+                null, "MultiLineComment", "SingleLineComment", "RegularExpressionLiteral",
+                "OpenBracket", "CloseBracket", "OpenParen", "CloseParen", "OpenBrace",
+                "CloseBrace", "SemiColon", "Comma", "Assign", "QuestionMark", "Colon",
+                "Ellipsis", "Dot", "PlusPlus", "MinusMinus", "Plus", "Minus", "BitNot",
+                "Not", "Multiply", "Divide", "Modulus", "RightShiftArithmetic", "LeftShiftArithmetic",
+                "RightShiftLogical", "LessThan", "MoreThan", "LessThanEquals", "GreaterThanEquals",
+                "Equals_", "NotEquals", "IdentityEquals", "IdentityNotEquals", "BitAnd",
+                "BitXOr", "BitOr", "And", "Or", "MultiplyAssign", "DivideAssign", "ModulusAssign",
+                "PlusAssign", "MinusAssign", "LeftShiftArithmeticAssign", "RightShiftArithmeticAssign",
+                "RightShiftLogicalAssign", "BitAndAssign", "BitXorAssign", "BitOrAssign",
+                "ARROW", "NullLiteral", "BooleanLiteral", "DecimalLiteral", "HexIntegerLiteral",
+                "OctalIntegerLiteral", "OctalIntegerLiteral2", "BinaryIntegerLiteral",
+                "Break", "Do", "Instanceof", "Typeof", "Case", "Else", "New", "Var",
+                "Catch", "Finally", "Return", "Void", "Continue", "For", "Switch", "While",
+                "Debugger", "Function", "This", "With", "Default", "If", "Throw", "Delete",
+                "In", "Try", "Event", "AtToken", "AtLeastOnce", "AtMostOnce", "OnlyOnce",
+                "Class", "Enum", "Extends", "Super", "Const", "Export", "Import", "Contract",
+                "Module", "Oracle", "Implements", "Let", "Private", "Public", "Interface",
+                "Package", "Protected", "Static", "Yield", "Identifier", "StringLiteral",
+                "TemplateStringLiteral", "WhiteSpaces", "LineTerminator", "HtmlComment",
+                "CDataComment", "UnexpectedCharacter"
+        };
+    }
+
+    @Override
+    @Deprecated
+    public String[] getTokenNames() {
+        return tokenNames;
+    }
+
+    @Override
+
+    public Vocabulary getVocabulary() {
+        return VOCABULARY;
+    }
+
+    @Override
+    public String getGrammarFileName() {
+        return "JavaScriptLexer.g4";
+    }
+
+    @Override
+    public String[] getRuleNames() {
+        return ruleNames;
+    }
+
+    @Override
+    public String getSerializedATN() {
+        return _serializedATN;
+    }
+
+    @Override
+    public String[] getChannelNames() {
+        return channelNames;
+    }
+
+    @Override
+    public String[] getModeNames() {
+        return modeNames;
+    }
+
+    @Override
+    public ATN getATN() {
+        return _ATN;
+    }
+
+    @Override
+    public void action(RuleContext _localctx, int ruleIndex, int actionIndex) {
+        switch (ruleIndex) {
+            case 7:
+                OpenBrace_action((RuleContext) _localctx, actionIndex);
+                break;
+            case 8:
+                CloseBrace_action((RuleContext) _localctx, actionIndex);
+                break;
+            case 111:
+                StringLiteral_action((RuleContext) _localctx, actionIndex);
+                break;
+        }
+    }
+
+    private void OpenBrace_action(RuleContext _localctx, int actionIndex) {
+        switch (actionIndex) {
+            case 0:
+                ProcessOpenBrace();
+                break;
+        }
+    }
+
+    private void CloseBrace_action(RuleContext _localctx, int actionIndex) {
+        switch (actionIndex) {
+            case 1:
+                ProcessCloseBrace();
+                break;
+        }
+    }
+
+    private void StringLiteral_action(RuleContext _localctx, int actionIndex) {
+        switch (actionIndex) {
+            case 2:
+                ProcessStringLiteral();
+                break;
+        }
+    }
+
+    @Override
+    public boolean sempred(RuleContext _localctx, int ruleIndex, int predIndex) {
+        switch (ruleIndex) {
+            case 2:
+                return RegularExpressionLiteral_sempred((RuleContext) _localctx, predIndex);
+            case 57:
+                return OctalIntegerLiteral_sempred((RuleContext) _localctx, predIndex);
+            case 101:
+                return Implements_sempred((RuleContext) _localctx, predIndex);
+            case 102:
+                return Let_sempred((RuleContext) _localctx, predIndex);
+            case 103:
+                return Private_sempred((RuleContext) _localctx, predIndex);
+            case 104:
+                return Public_sempred((RuleContext) _localctx, predIndex);
+            case 105:
+                return Interface_sempred((RuleContext) _localctx, predIndex);
+            case 106:
+                return Package_sempred((RuleContext) _localctx, predIndex);
+            case 107:
+                return Protected_sempred((RuleContext) _localctx, predIndex);
+            case 108:
+                return Static_sempred((RuleContext) _localctx, predIndex);
+            case 109:
+                return Yield_sempred((RuleContext) _localctx, predIndex);
+        }
+        return true;
+    }
+
+    private boolean RegularExpressionLiteral_sempred(RuleContext _localctx, int predIndex) {
+        switch (predIndex) {
+            case 0:
+                return IsRegexPossible();
+        }
+        return true;
+    }
+
+    private boolean OctalIntegerLiteral_sempred(RuleContext _localctx, int predIndex) {
+        switch (predIndex) {
+            case 1:
+                return !IsStrictMode();
+        }
+        return true;
+    }
+
+    private boolean Implements_sempred(RuleContext _localctx, int predIndex) {
+        switch (predIndex) {
+            case 2:
+                return IsStrictMode();
+        }
+        return true;
+    }
+
+    private boolean Let_sempred(RuleContext _localctx, int predIndex) {
+        switch (predIndex) {
+            case 3:
+                return IsStrictMode();
+        }
+        return true;
+    }
+
+    private boolean Private_sempred(RuleContext _localctx, int predIndex) {
+        switch (predIndex) {
+            case 4:
+                return IsStrictMode();
+        }
+        return true;
+    }
+
+    private boolean Public_sempred(RuleContext _localctx, int predIndex) {
+        switch (predIndex) {
+            case 5:
+                return IsStrictMode();
+        }
+        return true;
+    }
+
+    private boolean Interface_sempred(RuleContext _localctx, int predIndex) {
+        switch (predIndex) {
+            case 6:
+                return IsStrictMode();
+        }
+        return true;
+    }
+
+    private boolean Package_sempred(RuleContext _localctx, int predIndex) {
+        switch (predIndex) {
+            case 7:
+                return IsStrictMode();
+        }
+        return true;
+    }
+
+    private boolean Protected_sempred(RuleContext _localctx, int predIndex) {
+        switch (predIndex) {
+            case 8:
+                return IsStrictMode();
+        }
+        return true;
+    }
+
+    private boolean Static_sempred(RuleContext _localctx, int predIndex) {
+        switch (predIndex) {
+            case 9:
+                return IsStrictMode();
+        }
+        return true;
+    }
+
+    private boolean Yield_sempred(RuleContext _localctx, int predIndex) {
+        switch (predIndex) {
+            case 10:
+                return IsStrictMode();
+        }
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/src/main/gen/org/bdware/sc/parser/JavaScriptLexer.tokens b/src/main/gen/org/bdware/sc/parser/JavaScriptLexer.tokens
new file mode 100644
index 0000000..1161986
--- /dev/null
+++ b/src/main/gen/org/bdware/sc/parser/JavaScriptLexer.tokens
@@ -0,0 +1,219 @@
+MultiLineComment=1
+SingleLineComment=2
+RegularExpressionLiteral=3
+OpenBracket=4
+CloseBracket=5
+OpenParen=6
+CloseParen=7
+OpenBrace=8
+CloseBrace=9
+SemiColon=10
+Comma=11
+Assign=12
+QuestionMark=13
+Colon=14
+Ellipsis=15
+Dot=16
+PlusPlus=17
+MinusMinus=18
+Plus=19
+Minus=20
+BitNot=21
+Not=22
+Multiply=23
+Divide=24
+Modulus=25
+RightShiftArithmetic=26
+LeftShiftArithmetic=27
+RightShiftLogical=28
+LessThan=29
+MoreThan=30
+LessThanEquals=31
+GreaterThanEquals=32
+Equals_=33
+NotEquals=34
+IdentityEquals=35
+IdentityNotEquals=36
+BitAnd=37
+BitXOr=38
+BitOr=39
+And=40
+Or=41
+MultiplyAssign=42
+DivideAssign=43
+ModulusAssign=44
+PlusAssign=45
+MinusAssign=46
+LeftShiftArithmeticAssign=47
+RightShiftArithmeticAssign=48
+RightShiftLogicalAssign=49
+BitAndAssign=50
+BitXorAssign=51
+BitOrAssign=52
+ARROW=53
+NullLiteral=54
+BooleanLiteral=55
+DecimalLiteral=56
+HexIntegerLiteral=57
+OctalIntegerLiteral=58
+OctalIntegerLiteral2=59
+BinaryIntegerLiteral=60
+Break=61
+Do=62
+Instanceof=63
+Typeof=64
+Case=65
+Else=66
+New=67
+Var=68
+Catch=69
+Finally=70
+Return=71
+Void=72
+Continue=73
+For=74
+Switch=75
+While=76
+Debugger=77
+Function=78
+This=79
+With=80
+Default=81
+If=82
+Throw=83
+Delete=84
+In=85
+Try=86
+Event=87
+AtToken=88
+AtLeastOnce=89
+AtMostOnce=90
+OnlyOnce=91
+Class=92
+Enum=93
+Extends=94
+Super=95
+Const=96
+Export=97
+Import=98
+Contract=99
+Module=100
+Oracle=101
+Implements=102
+Let=103
+Private=104
+Public=105
+Interface=106
+Package=107
+Protected=108
+Static=109
+Yield=110
+Identifier=111
+StringLiteral=112
+TemplateStringLiteral=113
+WhiteSpaces=114
+LineTerminator=115
+HtmlComment=116
+CDataComment=117
+UnexpectedCharacter=118
+'['=4
+']'=5
+'('=6
+')'=7
+'{'=8
+'}'=9
+';'=10
+','=11
+'='=12
+'?'=13
+':'=14
+'...'=15
+'.'=16
+'++'=17
+'--'=18
+'+'=19
+'-'=20
+'~'=21
+'!'=22
+'*'=23
+'/'=24
+'%'=25
+'>>'=26
+'<<'=27
+'>>>'=28
+'<'=29
+'>'=30
+'<='=31
+'>='=32
+'=='=33
+'!='=34
+'==='=35
+'!=='=36
+'&'=37
+'^'=38
+'|'=39
+'&&'=40
+'||'=41
+'*='=42
+'/='=43
+'%='=44
+'+='=45
+'-='=46
+'<<='=47
+'>>='=48
+'>>>='=49
+'&='=50
+'^='=51
+'|='=52
+'=>'=53
+'null'=54
+'break'=61
+'do'=62
+'instanceof'=63
+'typeof'=64
+'case'=65
+'else'=66
+'new'=67
+'var'=68
+'catch'=69
+'finally'=70
+'return'=71
+'void'=72
+'continue'=73
+'for'=74
+'switch'=75
+'while'=76
+'debugger'=77
+'function'=78
+'this'=79
+'with'=80
+'default'=81
+'if'=82
+'throw'=83
+'delete'=84
+'in'=85
+'try'=86
+'event'=87
+'@'=88
+'AT_LEAST_ONCE'=89
+'AT_MOST_ONCE'=90
+'ONLY_ONCE'=91
+'class'=92
+'enum'=93
+'extends'=94
+'super'=95
+'const'=96
+'export'=97
+'import'=98
+'contract'=99
+'module'=100
+'oracle'=101
+'implements'=102
+'let'=103
+'private'=104
+'public'=105
+'interface'=106
+'package'=107
+'protected'=108
+'static'=109
+'yield'=110
diff --git a/src/main/gen/org/bdware/sc/parser/YJSParser.interp b/src/main/gen/org/bdware/sc/parser/YJSParser.interp
new file mode 100644
index 0000000..c49b2de
--- /dev/null
+++ b/src/main/gen/org/bdware/sc/parser/YJSParser.interp
@@ -0,0 +1,315 @@
+token literal names:
+null
+null
+null
+null
+'['
+']'
+'('
+')'
+'{'
+'}'
+';'
+','
+'='
+'?'
+':'
+'...'
+'.'
+'++'
+'--'
+'+'
+'-'
+'~'
+'!'
+'*'
+'/'
+'%'
+'>>'
+'<<'
+'>>>'
+'<'
+'>'
+'<='
+'>='
+'=='
+'!='
+'==='
+'!=='
+'&'
+'^'
+'|'
+'&&'
+'||'
+'*='
+'/='
+'%='
+'+='
+'-='
+'<<='
+'>>='
+'>>>='
+'&='
+'^='
+'|='
+'=>'
+'null'
+null
+null
+null
+null
+null
+null
+'break'
+'do'
+'instanceof'
+'typeof'
+'case'
+'else'
+'new'
+'var'
+'catch'
+'finally'
+'return'
+'void'
+'continue'
+'for'
+'switch'
+'while'
+'debugger'
+'function'
+'this'
+'with'
+'default'
+'if'
+'throw'
+'delete'
+'in'
+'try'
+'event'
+'@'
+'AT_LEAST_ONCE'
+'AT_MOST_ONCE'
+'ONLY_ONCE'
+'class'
+'enum'
+'extends'
+'super'
+'const'
+'export'
+'import'
+'contract'
+'module'
+'oracle'
+'implements'
+'let'
+'private'
+'public'
+'interface'
+'package'
+'protected'
+'static'
+'yield'
+null
+null
+null
+null
+null
+null
+null
+null
+
+token symbolic names:
+null
+MultiLineComment
+SingleLineComment
+RegularExpressionLiteral
+OpenBracket
+CloseBracket
+OpenParen
+CloseParen
+OpenBrace
+CloseBrace
+SemiColon
+Comma
+Assign
+QuestionMark
+Colon
+Ellipsis
+Dot
+PlusPlus
+MinusMinus
+Plus
+Minus
+BitNot
+Not
+Multiply
+Divide
+Modulus
+RightShiftArithmetic
+LeftShiftArithmetic
+RightShiftLogical
+LessThan
+MoreThan
+LessThanEquals
+GreaterThanEquals
+Equals_
+NotEquals
+IdentityEquals
+IdentityNotEquals
+BitAnd
+BitXOr
+BitOr
+And
+Or
+MultiplyAssign
+DivideAssign
+ModulusAssign
+PlusAssign
+MinusAssign
+LeftShiftArithmeticAssign
+RightShiftArithmeticAssign
+RightShiftLogicalAssign
+BitAndAssign
+BitXorAssign
+BitOrAssign
+ARROW
+NullLiteral
+BooleanLiteral
+DecimalLiteral
+HexIntegerLiteral
+OctalIntegerLiteral
+OctalIntegerLiteral2
+BinaryIntegerLiteral
+Break
+Do
+Instanceof
+Typeof
+Case
+Else
+New
+Var
+Catch
+Finally
+Return
+Void
+Continue
+For
+Switch
+While
+Debugger
+Function
+This
+With
+Default
+If
+Throw
+Delete
+In
+Try
+Event
+AtToken
+AtLeastOnce
+AtMostOnce
+OnlyOnce
+Class
+Enum
+Extends
+Super
+Const
+Export
+Import
+Contract
+Module
+Oracle
+Implements
+Let
+Private
+Public
+Interface
+Package
+Protected
+Static
+Yield
+Identifier
+StringLiteral
+TemplateStringLiteral
+WhiteSpaces
+LineTerminator
+HtmlComment
+CDataComment
+UnexpectedCharacter
+
+rule names:
+program
+contractDeclar
+annotations
+annotation
+annotationArgs
+annotationLiteral
+clzOrFunctionDeclaration
+eventSemantics
+eventDeclaration
+sourceElement
+importStmts
+importStmt
+exportStmt
+versionName
+statement
+block
+statementList
+variableStatement
+variableDeclarationList
+variableDeclaration
+emptyStatement
+expressionStatement
+ifStatement
+iterationStatement
+varModifier
+continueStatement
+breakStatement
+returnStatement
+withStatement
+switchStatement
+caseBlock
+caseClauses
+caseClause
+defaultClause
+throwStatement
+tryStatement
+catchProduction
+finallyProduction
+debuggerStatement
+functionDeclaration
+classDeclaration
+classTail
+classElement
+methodDefinition
+formalParameterList
+formalParameterArg
+lastFormalParameterArg
+functionBody
+sourceElements
+arrayLiteral
+elementList
+lastElement
+objectLiteral
+propertyAssignment
+propertyName
+arguments
+lastArgument
+expressionSequence
+singleExpression
+arrowFunctionParameters
+arrowFunctionBody
+assignmentOperator
+literal
+numericLiteral
+identifierName
+reservedWord
+keyword
+eos
+
+
+atn:
+[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 3, 120, 777, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 4, 43, 9, 43, 4, 44, 9, 44, 4, 45, 9, 45, 4, 46, 9, 46, 4, 47, 9, 47, 4, 48, 9, 48, 4, 49, 9, 49, 4, 50, 9, 50, 4, 51, 9, 51, 4, 52, 9, 52, 4, 53, 9, 53, 4, 54, 9, 54, 4, 55, 9, 55, 4, 56, 9, 56, 4, 57, 9, 57, 4, 58, 9, 58, 4, 59, 9, 59, 4, 60, 9, 60, 4, 61, 9, 61, 4, 62, 9, 62, 4, 63, 9, 63, 4, 64, 9, 64, 4, 65, 9, 65, 4, 66, 9, 66, 4, 67, 9, 67, 4, 68, 9, 68, 4, 69, 9, 69, 3, 2, 5, 2, 140, 10, 2, 3, 2, 3, 2, 3, 3, 5, 3, 145, 10, 3, 3, 3, 3, 3, 3, 3, 3, 3, 6, 3, 151, 10, 3, 13, 3, 14, 3, 152, 3, 3, 3, 3, 3, 4, 6, 4, 158, 10, 4, 13, 4, 14, 4, 159, 3, 5, 3, 5, 3, 5, 3, 5, 5, 5, 166, 10, 5, 3, 5, 3, 5, 3, 6, 3, 6, 3, 6, 7, 6, 173, 10, 6, 12, 6, 14, 6, 176, 11, 6, 3, 7, 3, 7, 3, 7, 5, 7, 181, 10, 7, 3, 8, 3, 8, 3, 8, 5, 8, 186, 10, 8, 3, 9, 3, 9, 3, 10, 3, 10, 5, 10, 192, 10, 10, 3, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 12, 6, 12, 200, 10, 12, 13, 12, 14, 12, 201, 3, 13, 3, 13, 3, 13, 3, 13, 3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 7, 15, 216, 10, 15, 12, 15, 14, 15, 219, 11, 15, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 5, 16, 231, 10, 16, 3, 17, 3, 17, 5, 17, 235, 10, 17, 3, 17, 3, 17, 3, 18, 6, 18, 240, 10, 18, 13, 18, 14, 18, 241, 3, 19, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 3, 20, 7, 20, 251, 10, 20, 12, 20, 14, 20, 254, 11, 20, 3, 21, 3, 21, 3, 21, 5, 21, 259, 10, 21, 3, 22, 3, 22, 3, 23, 3, 23, 3, 23, 3, 23, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 5, 24, 274, 10, 24, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 5, 25, 293, 10, 25, 3, 25, 3, 25, 5, 25, 297, 10, 25, 3, 25, 3, 25, 5, 25, 301, 10, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 5, 25, 311, 10, 25, 3, 25, 3, 25, 5, 25, 315, 10, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 5, 25, 326, 10, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 5, 25, 339, 10, 25, 3, 25, 3, 25, 3, 25, 3, 25, 5, 25, 345, 10, 25, 3, 26, 3, 26, 3, 27, 3, 27, 3, 27, 5, 27, 352, 10, 27, 3, 27, 3, 27, 3, 28, 3, 28, 3, 28, 5, 28, 359, 10, 28, 3, 28, 3, 28, 3, 29, 3, 29, 3, 29, 5, 29, 366, 10, 29, 3, 29, 3, 29, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 32, 3, 32, 5, 32, 384, 10, 32, 3, 32, 3, 32, 5, 32, 388, 10, 32, 5, 32, 390, 10, 32, 3, 32, 3, 32, 3, 33, 6, 33, 395, 10, 33, 13, 33, 14, 33, 396, 3, 34, 3, 34, 3, 34, 3, 34, 5, 34, 403, 10, 34, 3, 35, 3, 35, 3, 35, 5, 35, 408, 10, 35, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 37, 3, 37, 3, 37, 3, 37, 5, 37, 419, 10, 37, 3, 37, 5, 37, 422, 10, 37, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 39, 3, 39, 3, 39, 3, 40, 3, 40, 3, 40, 3, 41, 5, 41, 437, 10, 41, 3, 41, 5, 41, 440, 10, 41, 3, 41, 3, 41, 3, 41, 3, 41, 5, 41, 446, 10, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 42, 3, 42, 3, 42, 3, 42, 3, 43, 3, 43, 5, 43, 459, 10, 43, 3, 43, 3, 43, 7, 43, 463, 10, 43, 12, 43, 14, 43, 466, 11, 43, 3, 43, 3, 43, 3, 44, 5, 44, 471, 10, 44, 3, 44, 3, 44, 3, 45, 3, 45, 3, 45, 5, 45, 478, 10, 45, 3, 45, 3, 45, 3, 45, 3, 45, 3, 45, 3, 46, 3, 46, 3, 46, 7, 46, 488, 10, 46, 12, 46, 14, 46, 491, 11, 46, 3, 46, 3, 46, 5, 46, 495, 10, 46, 3, 46, 3, 46, 3, 46, 5, 46, 500, 10, 46, 3, 47, 3, 47, 3, 47, 5, 47, 505, 10, 47, 3, 48, 3, 48, 3, 48, 3, 49, 5, 49, 511, 10, 49, 3, 50, 6, 50, 514, 10, 50, 13, 50, 14, 50, 515, 3, 51, 3, 51, 7, 51, 520, 10, 51, 12, 51, 14, 51, 523, 11, 51, 3, 51, 5, 51, 526, 10, 51, 3, 51, 7, 51, 529, 10, 51, 12, 51, 14, 51, 532, 11, 51, 3, 51, 3, 51, 3, 52, 3, 52, 6, 52, 538, 10, 52, 13, 52, 14, 52, 539, 3, 52, 7, 52, 543, 10, 52, 12, 52, 14, 52, 546, 11, 52, 3, 52, 6, 52, 549, 10, 52, 13, 52, 14, 52, 550, 3, 52, 5, 52, 554, 10, 52, 3, 52, 5, 52, 557, 10, 52, 3, 53, 3, 53, 3, 53, 3, 54, 3, 54, 3, 54, 3, 54, 7, 54, 566, 10, 54, 12, 54, 14, 54, 569, 11, 54, 5, 54, 571, 10, 54, 3, 54, 5, 54, 574, 10, 54, 3, 54, 3, 54, 3, 55, 3, 55, 3, 55, 3, 55, 3, 55, 3, 55, 3, 55, 3, 55, 3, 55, 3, 55, 3, 55, 5, 55, 589, 10, 55, 3, 56, 3, 56, 3, 56, 5, 56, 594, 10, 56, 3, 57, 3, 57, 3, 57, 3, 57, 7, 57, 600, 10, 57, 12, 57, 14, 57, 603, 11, 57, 3, 57, 3, 57, 5, 57, 607, 10, 57, 3, 57, 5, 57, 610, 10, 57, 3, 57, 3, 57, 3, 58, 3, 58, 3, 58, 3, 59, 3, 59, 3, 59, 7, 59, 620, 10, 59, 12, 59, 14, 59, 623, 11, 59, 3, 60, 3, 60, 3, 60, 3, 60, 5, 60, 629, 10, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 5, 60, 659, 10, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 7, 60, 728, 10, 60, 12, 60, 14, 60, 731, 11, 60, 3, 61, 3, 61, 3, 61, 5, 61, 736, 10, 61, 3, 61, 5, 61, 739, 10, 61, 3, 62, 3, 62, 3, 62, 3, 62, 3, 62, 5, 62, 746, 10, 62, 3, 63, 3, 63, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 5, 64, 756, 10, 64, 3, 65, 3, 65, 3, 66, 3, 66, 5, 66, 762, 10, 66, 3, 67, 3, 67, 3, 67, 5, 67, 767, 10, 67, 3, 68, 3, 68, 3, 69, 3, 69, 3, 69, 3, 69, 5, 69, 775, 10, 69, 3, 69, 2, 3, 118, 70, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, 96, 98, 100, 102, 104, 106, 108, 110, 112, 114, 116, 118, 120, 122, 124, 126, 128, 130, 132, 134, 136, 2, 13, 3, 2, 101, 103, 3, 2, 91, 93, 4, 2, 14, 14, 16, 16, 3, 2, 25, 27, 3, 2, 21, 22, 3, 2, 28, 30, 3, 2, 31, 34, 3, 2, 35, 38, 3, 2, 44, 54, 3, 2, 58, 62, 5, 2, 63, 88, 94, 100, 104, 112, 2, 844, 2, 139, 3, 2, 2, 2, 4, 144, 3, 2, 2, 2, 6, 157, 3, 2, 2, 2, 8, 161, 3, 2, 2, 2, 10, 169, 3, 2, 2, 2, 12, 180, 3, 2, 2, 2, 14, 185, 3, 2, 2, 2, 16, 187, 3, 2, 2, 2, 18, 189, 3, 2, 2, 2, 20, 196, 3, 2, 2, 2, 22, 199, 3, 2, 2, 2, 24, 203, 3, 2, 2, 2, 26, 207, 3, 2, 2, 2, 28, 212, 3, 2, 2, 2, 30, 230, 3, 2, 2, 2, 32, 232, 3, 2, 2, 2, 34, 239, 3, 2, 2, 2, 36, 243, 3, 2, 2, 2, 38, 247, 3, 2, 2, 2, 40, 255, 3, 2, 2, 2, 42, 260, 3, 2, 2, 2, 44, 262, 3, 2, 2, 2, 46, 266, 3, 2, 2, 2, 48, 344, 3, 2, 2, 2, 50, 346, 3, 2, 2, 2, 52, 348, 3, 2, 2, 2, 54, 355, 3, 2, 2, 2, 56, 362, 3, 2, 2, 2, 58, 369, 3, 2, 2, 2, 60, 375, 3, 2, 2, 2, 62, 381, 3, 2, 2, 2, 64, 394, 3, 2, 2, 2, 66, 398, 3, 2, 2, 2, 68, 404, 3, 2, 2, 2, 70, 409, 3, 2, 2, 2, 72, 414, 3, 2, 2, 2, 74, 423, 3, 2, 2, 2, 76, 429, 3, 2, 2, 2, 78, 432, 3, 2, 2, 2, 80, 436, 3, 2, 2, 2, 82, 452, 3, 2, 2, 2, 84, 458, 3, 2, 2, 2, 86, 470, 3, 2, 2, 2, 88, 474, 3, 2, 2, 2, 90, 499, 3, 2, 2, 2, 92, 501, 3, 2, 2, 2, 94, 506, 3, 2, 2, 2, 96, 510, 3, 2, 2, 2, 98, 513, 3, 2, 2, 2, 100, 517, 3, 2, 2, 2, 102, 556, 3, 2, 2, 2, 104, 558, 3, 2, 2, 2, 106, 561, 3, 2, 2, 2, 108, 588, 3, 2, 2, 2, 110, 593, 3, 2, 2, 2, 112, 595, 3, 2, 2, 2, 114, 613, 3, 2, 2, 2, 116, 616, 3, 2, 2, 2, 118, 658, 3, 2, 2, 2, 120, 738, 3, 2, 2, 2, 122, 745, 3, 2, 2, 2, 124, 747, 3, 2, 2, 2, 126, 755, 3, 2, 2, 2, 128, 757, 3, 2, 2, 2, 130, 761, 3, 2, 2, 2, 132, 766, 3, 2, 2, 2, 134, 768, 3, 2, 2, 2, 136, 774, 3, 2, 2, 2, 138, 140, 5, 22, 12, 2, 139, 138, 3, 2, 2, 2, 139, 140, 3, 2, 2, 2, 140, 141, 3, 2, 2, 2, 141, 142, 5, 4, 3, 2, 142, 3, 3, 2, 2, 2, 143, 145, 5, 6, 4, 2, 144, 143, 3, 2, 2, 2, 144, 145, 3, 2, 2, 2, 145, 146, 3, 2, 2, 2, 146, 147, 9, 2, 2, 2, 147, 148, 7, 113, 2, 2, 148, 150, 7, 10, 2, 2, 149, 151, 5, 14, 8, 2, 150, 149, 3, 2, 2, 2, 151, 152, 3, 2, 2, 2, 152, 150, 3, 2, 2, 2, 152, 153, 3, 2, 2, 2, 153, 154, 3, 2, 2, 2, 154, 155, 7, 11, 2, 2, 155, 5, 3, 2, 2, 2, 156, 158, 5, 8, 5, 2, 157, 156, 3, 2, 2, 2, 158, 159, 3, 2, 2, 2, 159, 157, 3, 2, 2, 2, 159, 160, 3, 2, 2, 2, 160, 7, 3, 2, 2, 2, 161, 162, 7, 90, 2, 2, 162, 163, 7, 113, 2, 2, 163, 165, 7, 8, 2, 2, 164, 166, 5, 10, 6, 2, 165, 164, 3, 2, 2, 2, 165, 166, 3, 2, 2, 2, 166, 167, 3, 2, 2, 2, 167, 168, 7, 9, 2, 2, 168, 9, 3, 2, 2, 2, 169, 174, 5, 12, 7, 2, 170, 171, 7, 13, 2, 2, 171, 173, 5, 12, 7, 2, 172, 170, 3, 2, 2, 2, 173, 176, 3, 2, 2, 2, 174, 172, 3, 2, 2, 2, 174, 175, 3, 2, 2, 2, 175, 11, 3, 2, 2, 2, 176, 174, 3, 2, 2, 2, 177, 181, 5, 128, 65, 2, 178, 181, 7, 114, 2, 2, 179, 181, 5, 106, 54, 2, 180, 177, 3, 2, 2, 2, 180, 178, 3, 2, 2, 2, 180, 179, 3, 2, 2, 2, 181, 13, 3, 2, 2, 2, 182, 186, 5, 82, 42, 2, 183, 186, 5, 80, 41, 2, 184, 186, 5, 18, 10, 2, 185, 182, 3, 2, 2, 2, 185, 183, 3, 2, 2, 2, 185, 184, 3, 2, 2, 2, 186, 15, 3, 2, 2, 2, 187, 188, 9, 3, 2, 2, 188, 17, 3, 2, 2, 2, 189, 191, 7, 89, 2, 2, 190, 192, 5, 16, 9, 2, 191, 190, 3, 2, 2, 2, 191, 192, 3, 2, 2, 2, 192, 193, 3, 2, 2, 2, 193, 194, 7, 113, 2, 2, 194, 195, 7, 12, 2, 2, 195, 19, 3, 2, 2, 2, 196, 197, 5, 30, 16, 2, 197, 21, 3, 2, 2, 2, 198, 200, 5, 24, 13, 2, 199, 198, 3, 2, 2, 2, 200, 201, 3, 2, 2, 2, 201, 199, 3, 2, 2, 2, 201, 202, 3, 2, 2, 2, 202, 23, 3, 2, 2, 2, 203, 204, 7, 100, 2, 2, 204, 205, 7, 114, 2, 2, 205, 206, 7, 12, 2, 2, 206, 25, 3, 2, 2, 2, 207, 208, 7, 99, 2, 2, 208, 209, 7, 113, 2, 2, 209, 210, 5, 28, 15, 2, 210, 211, 7, 12, 2, 2, 211, 27, 3, 2, 2, 2, 212, 217, 7, 58, 2, 2, 213, 214, 7, 18, 2, 2, 214, 216, 7, 58, 2, 2, 215, 213, 3, 2, 2, 2, 216, 219, 3, 2, 2, 2, 217, 215, 3, 2, 2, 2, 217, 218, 3, 2, 2, 2, 218, 29, 3, 2, 2, 2, 219, 217, 3, 2, 2, 2, 220, 231, 5, 32, 17, 2, 221, 231, 5, 36, 19, 2, 222, 231, 5, 42, 22, 2, 223, 231, 5, 44, 23, 2, 224, 231, 5, 46, 24, 2, 225, 231, 5, 48, 25, 2, 226, 231, 5, 52, 27, 2, 227, 231, 5, 54, 28, 2, 228, 231, 5, 56, 29, 2, 229, 231, 5, 60, 31, 2, 230, 220, 3, 2, 2, 2, 230, 221, 3, 2, 2, 2, 230, 222, 3, 2, 2, 2, 230, 223, 3, 2, 2, 2, 230, 224, 3, 2, 2, 2, 230, 225, 3, 2, 2, 2, 230, 226, 3, 2, 2, 2, 230, 227, 3, 2, 2, 2, 230, 228, 3, 2, 2, 2, 230, 229, 3, 2, 2, 2, 231, 31, 3, 2, 2, 2, 232, 234, 7, 10, 2, 2, 233, 235, 5, 34, 18, 2, 234, 233, 3, 2, 2, 2, 234, 235, 3, 2, 2, 2, 235, 236, 3, 2, 2, 2, 236, 237, 7, 11, 2, 2, 237, 33, 3, 2, 2, 2, 238, 240, 5, 30, 16, 2, 239, 238, 3, 2, 2, 2, 240, 241, 3, 2, 2, 2, 241, 239, 3, 2, 2, 2, 241, 242, 3, 2, 2, 2, 242, 35, 3, 2, 2, 2, 243, 244, 5, 50, 26, 2, 244, 245, 5, 38, 20, 2, 245, 246, 5, 136, 69, 2, 246, 37, 3, 2, 2, 2, 247, 252, 5, 40, 21, 2, 248, 249, 7, 13, 2, 2, 249, 251, 5, 40, 21, 2, 250, 248, 3, 2, 2, 2, 251, 254, 3, 2, 2, 2, 252, 250, 3, 2, 2, 2, 252, 253, 3, 2, 2, 2, 253, 39, 3, 2, 2, 2, 254, 252, 3, 2, 2, 2, 255, 258, 7, 113, 2, 2, 256, 257, 7, 14, 2, 2, 257, 259, 5, 118, 60, 2, 258, 256, 3, 2, 2, 2, 258, 259, 3, 2, 2, 2, 259, 41, 3, 2, 2, 2, 260, 261, 7, 12, 2, 2, 261, 43, 3, 2, 2, 2, 262, 263, 6, 23, 2, 2, 263, 264, 5, 116, 59, 2, 264, 265, 5, 136, 69, 2, 265, 45, 3, 2, 2, 2, 266, 267, 7, 84, 2, 2, 267, 268, 7, 8, 2, 2, 268, 269, 5, 116, 59, 2, 269, 270, 7, 9, 2, 2, 270, 273, 5, 30, 16, 2, 271, 272, 7, 68, 2, 2, 272, 274, 5, 30, 16, 2, 273, 271, 3, 2, 2, 2, 273, 274, 3, 2, 2, 2, 274, 47, 3, 2, 2, 2, 275, 276, 7, 64, 2, 2, 276, 277, 5, 30, 16, 2, 277, 278, 7, 78, 2, 2, 278, 279, 7, 8, 2, 2, 279, 280, 5, 116, 59, 2, 280, 281, 7, 9, 2, 2, 281, 282, 5, 136, 69, 2, 282, 345, 3, 2, 2, 2, 283, 284, 7, 78, 2, 2, 284, 285, 7, 8, 2, 2, 285, 286, 5, 116, 59, 2, 286, 287, 7, 9, 2, 2, 287, 288, 5, 30, 16, 2, 288, 345, 3, 2, 2, 2, 289, 290, 7, 76, 2, 2, 290, 292, 7, 8, 2, 2, 291, 293, 5, 116, 59, 2, 292, 291, 3, 2, 2, 2, 292, 293, 3, 2, 2, 2, 293, 294, 3, 2, 2, 2, 294, 296, 7, 12, 2, 2, 295, 297, 5, 116, 59, 2, 296, 295, 3, 2, 2, 2, 296, 297, 3, 2, 2, 2, 297, 298, 3, 2, 2, 2, 298, 300, 7, 12, 2, 2, 299, 301, 5, 116, 59, 2, 300, 299, 3, 2, 2, 2, 300, 301, 3, 2, 2, 2, 301, 302, 3, 2, 2, 2, 302, 303, 7, 9, 2, 2, 303, 345, 5, 30, 16, 2, 304, 305, 7, 76, 2, 2, 305, 306, 7, 8, 2, 2, 306, 307, 5, 50, 26, 2, 307, 308, 5, 38, 20, 2, 308, 310, 7, 12, 2, 2, 309, 311, 5, 116, 59, 2, 310, 309, 3, 2, 2, 2, 310, 311, 3, 2, 2, 2, 311, 312, 3, 2, 2, 2, 312, 314, 7, 12, 2, 2, 313, 315, 5, 116, 59, 2, 314, 313, 3, 2, 2, 2, 314, 315, 3, 2, 2, 2, 315, 316, 3, 2, 2, 2, 316, 317, 7, 9, 2, 2, 317, 318, 5, 30, 16, 2, 318, 345, 3, 2, 2, 2, 319, 320, 7, 76, 2, 2, 320, 321, 7, 8, 2, 2, 321, 325, 5, 118, 60, 2, 322, 326, 7, 87, 2, 2, 323, 324, 7, 113, 2, 2, 324, 326, 6, 25, 3, 2, 325, 322, 3, 2, 2, 2, 325, 323, 3, 2, 2, 2, 326, 327, 3, 2, 2, 2, 327, 328, 5, 116, 59, 2, 328, 329, 7, 9, 2, 2, 329, 330, 5, 30, 16, 2, 330, 345, 3, 2, 2, 2, 331, 332, 7, 76, 2, 2, 332, 333, 7, 8, 2, 2, 333, 334, 5, 50, 26, 2, 334, 338, 5, 40, 21, 2, 335, 339, 7, 87, 2, 2, 336, 337, 7, 113, 2, 2, 337, 339, 6, 25, 4, 2, 338, 335, 3, 2, 2, 2, 338, 336, 3, 2, 2, 2, 339, 340, 3, 2, 2, 2, 340, 341, 5, 116, 59, 2, 341, 342, 7, 9, 2, 2, 342, 343, 5, 30, 16, 2, 343, 345, 3, 2, 2, 2, 344, 275, 3, 2, 2, 2, 344, 283, 3, 2, 2, 2, 344, 289, 3, 2, 2, 2, 344, 304, 3, 2, 2, 2, 344, 319, 3, 2, 2, 2, 344, 331, 3, 2, 2, 2, 345, 49, 3, 2, 2, 2, 346, 347, 7, 70, 2, 2, 347, 51, 3, 2, 2, 2, 348, 351, 7, 75, 2, 2, 349, 350, 6, 27, 5, 2, 350, 352, 7, 113, 2, 2, 351, 349, 3, 2, 2, 2, 351, 352, 3, 2, 2, 2, 352, 353, 3, 2, 2, 2, 353, 354, 5, 136, 69, 2, 354, 53, 3, 2, 2, 2, 355, 358, 7, 63, 2, 2, 356, 357, 6, 28, 6, 2, 357, 359, 7, 113, 2, 2, 358, 356, 3, 2, 2, 2, 358, 359, 3, 2, 2, 2, 359, 360, 3, 2, 2, 2, 360, 361, 5, 136, 69, 2, 361, 55, 3, 2, 2, 2, 362, 365, 7, 73, 2, 2, 363, 364, 6, 29, 7, 2, 364, 366, 5, 116, 59, 2, 365, 363, 3, 2, 2, 2, 365, 366, 3, 2, 2, 2, 366, 367, 3, 2, 2, 2, 367, 368, 5, 136, 69, 2, 368, 57, 3, 2, 2, 2, 369, 370, 7, 82, 2, 2, 370, 371, 7, 8, 2, 2, 371, 372, 5, 116, 59, 2, 372, 373, 7, 9, 2, 2, 373, 374, 5, 30, 16, 2, 374, 59, 3, 2, 2, 2, 375, 376, 7, 77, 2, 2, 376, 377, 7, 8, 2, 2, 377, 378, 5, 116, 59, 2, 378, 379, 7, 9, 2, 2, 379, 380, 5, 62, 32, 2, 380, 61, 3, 2, 2, 2, 381, 383, 7, 10, 2, 2, 382, 384, 5, 64, 33, 2, 383, 382, 3, 2, 2, 2, 383, 384, 3, 2, 2, 2, 384, 389, 3, 2, 2, 2, 385, 387, 5, 68, 35, 2, 386, 388, 5, 64, 33, 2, 387, 386, 3, 2, 2, 2, 387, 388, 3, 2, 2, 2, 388, 390, 3, 2, 2, 2, 389, 385, 3, 2, 2, 2, 389, 390, 3, 2, 2, 2, 390, 391, 3, 2, 2, 2, 391, 392, 7, 11, 2, 2, 392, 63, 3, 2, 2, 2, 393, 395, 5, 66, 34, 2, 394, 393, 3, 2, 2, 2, 395, 396, 3, 2, 2, 2, 396, 394, 3, 2, 2, 2, 396, 397, 3, 2, 2, 2, 397, 65, 3, 2, 2, 2, 398, 399, 7, 67, 2, 2, 399, 400, 5, 116, 59, 2, 400, 402, 7, 16, 2, 2, 401, 403, 5, 34, 18, 2, 402, 401, 3, 2, 2, 2, 402, 403, 3, 2, 2, 2, 403, 67, 3, 2, 2, 2, 404, 405, 7, 83, 2, 2, 405, 407, 7, 16, 2, 2, 406, 408, 5, 34, 18, 2, 407, 406, 3, 2, 2, 2, 407, 408, 3, 2, 2, 2, 408, 69, 3, 2, 2, 2, 409, 410, 7, 85, 2, 2, 410, 411, 6, 36, 8, 2, 411, 412, 5, 116, 59, 2, 412, 413, 5, 136, 69, 2, 413, 71, 3, 2, 2, 2, 414, 415, 7, 88, 2, 2, 415, 421, 5, 32, 17, 2, 416, 418, 5, 74, 38, 2, 417, 419, 5, 76, 39, 2, 418, 417, 3, 2, 2, 2, 418, 419, 3, 2, 2, 2, 419, 422, 3, 2, 2, 2, 420, 422, 5, 76, 39, 2, 421, 416, 3, 2, 2, 2, 421, 420, 3, 2, 2, 2, 422, 73, 3, 2, 2, 2, 423, 424, 7, 71, 2, 2, 424, 425, 7, 8, 2, 2, 425, 426, 7, 113, 2, 2, 426, 427, 7, 9, 2, 2, 427, 428, 5, 32, 17, 2, 428, 75, 3, 2, 2, 2, 429, 430, 7, 72, 2, 2, 430, 431, 5, 32, 17, 2, 431, 77, 3, 2, 2, 2, 432, 433, 7, 79, 2, 2, 433, 434, 5, 136, 69, 2, 434, 79, 3, 2, 2, 2, 435, 437, 5, 6, 4, 2, 436, 435, 3, 2, 2, 2, 436, 437, 3, 2, 2, 2, 437, 439, 3, 2, 2, 2, 438, 440, 7, 99, 2, 2, 439, 438, 3, 2, 2, 2, 439, 440, 3, 2, 2, 2, 440, 441, 3, 2, 2, 2, 441, 442, 7, 80, 2, 2, 442, 443, 7, 113, 2, 2, 443, 445, 7, 8, 2, 2, 444, 446, 5, 90, 46, 2, 445, 444, 3, 2, 2, 2, 445, 446, 3, 2, 2, 2, 446, 447, 3, 2, 2, 2, 447, 448, 7, 9, 2, 2, 448, 449, 7, 10, 2, 2, 449, 450, 5, 96, 49, 2, 450, 451, 7, 11, 2, 2, 451, 81, 3, 2, 2, 2, 452, 453, 7, 94, 2, 2, 453, 454, 7, 113, 2, 2, 454, 455, 5, 84, 43, 2, 455, 83, 3, 2, 2, 2, 456, 457, 7, 96, 2, 2, 457, 459, 5, 118, 60, 2, 458, 456, 3, 2, 2, 2, 458, 459, 3, 2, 2, 2, 459, 460, 3, 2, 2, 2, 460, 464, 7, 10, 2, 2, 461, 463, 5, 86, 44, 2, 462, 461, 3, 2, 2, 2, 463, 466, 3, 2, 2, 2, 464, 462, 3, 2, 2, 2, 464, 465, 3, 2, 2, 2, 465, 467, 3, 2, 2, 2, 466, 464, 3, 2, 2, 2, 467, 468, 7, 11, 2, 2, 468, 85, 3, 2, 2, 2, 469, 471, 7, 111, 2, 2, 470, 469, 3, 2, 2, 2, 470, 471, 3, 2, 2, 2, 471, 472, 3, 2, 2, 2, 472, 473, 5, 88, 45, 2, 473, 87, 3, 2, 2, 2, 474, 475, 5, 110, 56, 2, 475, 477, 7, 8, 2, 2, 476, 478, 5, 90, 46, 2, 477, 476, 3, 2, 2, 2, 477, 478, 3, 2, 2, 2, 478, 479, 3, 2, 2, 2, 479, 480, 7, 9, 2, 2, 480, 481, 7, 10, 2, 2, 481, 482, 5, 96, 49, 2, 482, 483, 7, 11, 2, 2, 483, 89, 3, 2, 2, 2, 484, 489, 5, 92, 47, 2, 485, 486, 7, 13, 2, 2, 486, 488, 5, 92, 47, 2, 487, 485, 3, 2, 2, 2, 488, 491, 3, 2, 2, 2, 489, 487, 3, 2, 2, 2, 489, 490, 3, 2, 2, 2, 490, 494, 3, 2, 2, 2, 491, 489, 3, 2, 2, 2, 492, 493, 7, 13, 2, 2, 493, 495, 5, 94, 48, 2, 494, 492, 3, 2, 2, 2, 494, 495, 3, 2, 2, 2, 495, 500, 3, 2, 2, 2, 496, 500, 5, 94, 48, 2, 497, 500, 5, 100, 51, 2, 498, 500, 5, 106, 54, 2, 499, 484, 3, 2, 2, 2, 499, 496, 3, 2, 2, 2, 499, 497, 3, 2, 2, 2, 499, 498, 3, 2, 2, 2, 500, 91, 3, 2, 2, 2, 501, 504, 7, 113, 2, 2, 502, 503, 7, 14, 2, 2, 503, 505, 5, 118, 60, 2, 504, 502, 3, 2, 2, 2, 504, 505, 3, 2, 2, 2, 505, 93, 3, 2, 2, 2, 506, 507, 7, 17, 2, 2, 507, 508, 7, 113, 2, 2, 508, 95, 3, 2, 2, 2, 509, 511, 5, 98, 50, 2, 510, 509, 3, 2, 2, 2, 510, 511, 3, 2, 2, 2, 511, 97, 3, 2, 2, 2, 512, 514, 5, 20, 11, 2, 513, 512, 3, 2, 2, 2, 514, 515, 3, 2, 2, 2, 515, 513, 3, 2, 2, 2, 515, 516, 3, 2, 2, 2, 516, 99, 3, 2, 2, 2, 517, 521, 7, 6, 2, 2, 518, 520, 7, 13, 2, 2, 519, 518, 3, 2, 2, 2, 520, 523, 3, 2, 2, 2, 521, 519, 3, 2, 2, 2, 521, 522, 3, 2, 2, 2, 522, 525, 3, 2, 2, 2, 523, 521, 3, 2, 2, 2, 524, 526, 5, 102, 52, 2, 525, 524, 3, 2, 2, 2, 525, 526, 3, 2, 2, 2, 526, 530, 3, 2, 2, 2, 527, 529, 7, 13, 2, 2, 528, 527, 3, 2, 2, 2, 529, 532, 3, 2, 2, 2, 530, 528, 3, 2, 2, 2, 530, 531, 3, 2, 2, 2, 531, 533, 3, 2, 2, 2, 532, 530, 3, 2, 2, 2, 533, 534, 7, 7, 2, 2, 534, 101, 3, 2, 2, 2, 535, 544, 5, 118, 60, 2, 536, 538, 7, 13, 2, 2, 537, 536, 3, 2, 2, 2, 538, 539, 3, 2, 2, 2, 539, 537, 3, 2, 2, 2, 539, 540, 3, 2, 2, 2, 540, 541, 3, 2, 2, 2, 541, 543, 5, 118, 60, 2, 542, 537, 3, 2, 2, 2, 543, 546, 3, 2, 2, 2, 544, 542, 3, 2, 2, 2, 544, 545, 3, 2, 2, 2, 545, 553, 3, 2, 2, 2, 546, 544, 3, 2, 2, 2, 547, 549, 7, 13, 2, 2, 548, 547, 3, 2, 2, 2, 549, 550, 3, 2, 2, 2, 550, 548, 3, 2, 2, 2, 550, 551, 3, 2, 2, 2, 551, 552, 3, 2, 2, 2, 552, 554, 5, 104, 53, 2, 553, 548, 3, 2, 2, 2, 553, 554, 3, 2, 2, 2, 554, 557, 3, 2, 2, 2, 555, 557, 5, 104, 53, 2, 556, 535, 3, 2, 2, 2, 556, 555, 3, 2, 2, 2, 557, 103, 3, 2, 2, 2, 558, 559, 7, 17, 2, 2, 559, 560, 7, 113, 2, 2, 560, 105, 3, 2, 2, 2, 561, 570, 7, 10, 2, 2, 562, 567, 5, 108, 55, 2, 563, 564, 7, 13, 2, 2, 564, 566, 5, 108, 55, 2, 565, 563, 3, 2, 2, 2, 566, 569, 3, 2, 2, 2, 567, 565, 3, 2, 2, 2, 567, 568, 3, 2, 2, 2, 568, 571, 3, 2, 2, 2, 569, 567, 3, 2, 2, 2, 570, 562, 3, 2, 2, 2, 570, 571, 3, 2, 2, 2, 571, 573, 3, 2, 2, 2, 572, 574, 7, 13, 2, 2, 573, 572, 3, 2, 2, 2, 573, 574, 3, 2, 2, 2, 574, 575, 3, 2, 2, 2, 575, 576, 7, 11, 2, 2, 576, 107, 3, 2, 2, 2, 577, 578, 5, 110, 56, 2, 578, 579, 9, 4, 2, 2, 579, 580, 5, 118, 60, 2, 580, 589, 3, 2, 2, 2, 581, 582, 7, 6, 2, 2, 582, 583, 5, 118, 60, 2, 583, 584, 7, 7, 2, 2, 584, 585, 7, 16, 2, 2, 585, 586, 5, 118, 60, 2, 586, 589, 3, 2, 2, 2, 587, 589, 7, 113, 2, 2, 588, 577, 3, 2, 2, 2, 588, 581, 3, 2, 2, 2, 588, 587, 3, 2, 2, 2, 589, 109, 3, 2, 2, 2, 590, 594, 5, 130, 66, 2, 591, 594, 7, 114, 2, 2, 592, 594, 5, 128, 65, 2, 593, 590, 3, 2, 2, 2, 593, 591, 3, 2, 2, 2, 593, 592, 3, 2, 2, 2, 594, 111, 3, 2, 2, 2, 595, 609, 7, 8, 2, 2, 596, 601, 5, 118, 60, 2, 597, 598, 7, 13, 2, 2, 598, 600, 5, 118, 60, 2, 599, 597, 3, 2, 2, 2, 600, 603, 3, 2, 2, 2, 601, 599, 3, 2, 2, 2, 601, 602, 3, 2, 2, 2, 602, 606, 3, 2, 2, 2, 603, 601, 3, 2, 2, 2, 604, 605, 7, 13, 2, 2, 605, 607, 5, 114, 58, 2, 606, 604, 3, 2, 2, 2, 606, 607, 3, 2, 2, 2, 607, 610, 3, 2, 2, 2, 608, 610, 5, 114, 58, 2, 609, 596, 3, 2, 2, 2, 609, 608, 3, 2, 2, 2, 609, 610, 3, 2, 2, 2, 610, 611, 3, 2, 2, 2, 611, 612, 7, 9, 2, 2, 612, 113, 3, 2, 2, 2, 613, 614, 7, 17, 2, 2, 614, 615, 7, 113, 2, 2, 615, 115, 3, 2, 2, 2, 616, 621, 5, 118, 60, 2, 617, 618, 7, 13, 2, 2, 618, 620, 5, 118, 60, 2, 619, 617, 3, 2, 2, 2, 620, 623, 3, 2, 2, 2, 621, 619, 3, 2, 2, 2, 621, 622, 3, 2, 2, 2, 622, 117, 3, 2, 2, 2, 623, 621, 3, 2, 2, 2, 624, 625, 8, 60, 1, 2, 625, 626, 7, 69, 2, 2, 626, 628, 5, 118, 60, 2, 627, 629, 5, 112, 57, 2, 628, 627, 3, 2, 2, 2, 628, 629, 3, 2, 2, 2, 629, 659, 3, 2, 2, 2, 630, 631, 7, 66, 2, 2, 631, 659, 5, 118, 60, 33, 632, 633, 7, 19, 2, 2, 633, 659, 5, 118, 60, 32, 634, 635, 7, 20, 2, 2, 635, 659, 5, 118, 60, 31, 636, 637, 7, 21, 2, 2, 637, 659, 5, 118, 60, 30, 638, 639, 7, 22, 2, 2, 639, 659, 5, 118, 60, 29, 640, 641, 7, 23, 2, 2, 641, 659, 5, 118, 60, 28, 642, 643, 7, 24, 2, 2, 643, 659, 5, 118, 60, 27, 644, 659, 7, 81, 2, 2, 645, 659, 7, 113, 2, 2, 646, 659, 7, 97, 2, 2, 647, 659, 5, 126, 64, 2, 648, 659, 5, 100, 51, 2, 649, 659, 5, 106, 54, 2, 650, 651, 7, 8, 2, 2, 651, 652, 5, 116, 59, 2, 652, 653, 7, 9, 2, 2, 653, 659, 3, 2, 2, 2, 654, 655, 5, 120, 61, 2, 655, 656, 7, 55, 2, 2, 656, 657, 5, 122, 62, 2, 657, 659, 3, 2, 2, 2, 658, 624, 3, 2, 2, 2, 658, 630, 3, 2, 2, 2, 658, 632, 3, 2, 2, 2, 658, 634, 3, 2, 2, 2, 658, 636, 3, 2, 2, 2, 658, 638, 3, 2, 2, 2, 658, 640, 3, 2, 2, 2, 658, 642, 3, 2, 2, 2, 658, 644, 3, 2, 2, 2, 658, 645, 3, 2, 2, 2, 658, 646, 3, 2, 2, 2, 658, 647, 3, 2, 2, 2, 658, 648, 3, 2, 2, 2, 658, 649, 3, 2, 2, 2, 658, 650, 3, 2, 2, 2, 658, 654, 3, 2, 2, 2, 659, 729, 3, 2, 2, 2, 660, 661, 12, 26, 2, 2, 661, 662, 9, 5, 2, 2, 662, 728, 5, 118, 60, 27, 663, 664, 12, 25, 2, 2, 664, 665, 9, 6, 2, 2, 665, 728, 5, 118, 60, 26, 666, 667, 12, 24, 2, 2, 667, 668, 9, 7, 2, 2, 668, 728, 5, 118, 60, 25, 669, 670, 12, 23, 2, 2, 670, 671, 9, 8, 2, 2, 671, 728, 5, 118, 60, 24, 672, 673, 12, 22, 2, 2, 673, 674, 7, 65, 2, 2, 674, 728, 5, 118, 60, 23, 675, 676, 12, 21, 2, 2, 676, 677, 7, 87, 2, 2, 677, 728, 5, 118, 60, 22, 678, 679, 12, 20, 2, 2, 679, 680, 9, 9, 2, 2, 680, 728, 5, 118, 60, 21, 681, 682, 12, 19, 2, 2, 682, 683, 7, 39, 2, 2, 683, 728, 5, 118, 60, 20, 684, 685, 12, 18, 2, 2, 685, 686, 7, 40, 2, 2, 686, 728, 5, 118, 60, 19, 687, 688, 12, 17, 2, 2, 688, 689, 7, 41, 2, 2, 689, 728, 5, 118, 60, 18, 690, 691, 12, 16, 2, 2, 691, 692, 7, 42, 2, 2, 692, 728, 5, 118, 60, 17, 693, 694, 12, 15, 2, 2, 694, 695, 7, 43, 2, 2, 695, 728, 5, 118, 60, 16, 696, 697, 12, 14, 2, 2, 697, 698, 7, 15, 2, 2, 698, 699, 5, 118, 60, 2, 699, 700, 7, 16, 2, 2, 700, 701, 5, 118, 60, 15, 701, 728, 3, 2, 2, 2, 702, 703, 12, 13, 2, 2, 703, 704, 7, 14, 2, 2, 704, 728, 5, 118, 60, 14, 705, 706, 12, 12, 2, 2, 706, 707, 5, 124, 63, 2, 707, 708, 5, 118, 60, 13, 708, 728, 3, 2, 2, 2, 709, 710, 12, 39, 2, 2, 710, 711, 7, 6, 2, 2, 711, 712, 5, 116, 59, 2, 712, 713, 7, 7, 2, 2, 713, 728, 3, 2, 2, 2, 714, 715, 12, 38, 2, 2, 715, 716, 7, 18, 2, 2, 716, 728, 5, 130, 66, 2, 717, 718, 12, 37, 2, 2, 718, 728, 5, 112, 57, 2, 719, 720, 12, 35, 2, 2, 720, 721, 6, 60, 28, 2, 721, 728, 7, 19, 2, 2, 722, 723, 12, 34, 2, 2, 723, 724, 6, 60, 30, 2, 724, 728, 7, 20, 2, 2, 725, 726, 12, 11, 2, 2, 726, 728, 7, 115, 2, 2, 727, 660, 3, 2, 2, 2, 727, 663, 3, 2, 2, 2, 727, 666, 3, 2, 2, 2, 727, 669, 3, 2, 2, 2, 727, 672, 3, 2, 2, 2, 727, 675, 3, 2, 2, 2, 727, 678, 3, 2, 2, 2, 727, 681, 3, 2, 2, 2, 727, 684, 3, 2, 2, 2, 727, 687, 3, 2, 2, 2, 727, 690, 3, 2, 2, 2, 727, 693, 3, 2, 2, 2, 727, 696, 3, 2, 2, 2, 727, 702, 3, 2, 2, 2, 727, 705, 3, 2, 2, 2, 727, 709, 3, 2, 2, 2, 727, 714, 3, 2, 2, 2, 727, 717, 3, 2, 2, 2, 727, 719, 3, 2, 2, 2, 727, 722, 3, 2, 2, 2, 727, 725, 3, 2, 2, 2, 728, 731, 3, 2, 2, 2, 729, 727, 3, 2, 2, 2, 729, 730, 3, 2, 2, 2, 730, 119, 3, 2, 2, 2, 731, 729, 3, 2, 2, 2, 732, 739, 7, 113, 2, 2, 733, 735, 7, 8, 2, 2, 734, 736, 5, 90, 46, 2, 735, 734, 3, 2, 2, 2, 735, 736, 3, 2, 2, 2, 736, 737, 3, 2, 2, 2, 737, 739, 7, 9, 2, 2, 738, 732, 3, 2, 2, 2, 738, 733, 3, 2, 2, 2, 739, 121, 3, 2, 2, 2, 740, 746, 5, 118, 60, 2, 741, 742, 7, 10, 2, 2, 742, 743, 5, 96, 49, 2, 743, 744, 7, 11, 2, 2, 744, 746, 3, 2, 2, 2, 745, 740, 3, 2, 2, 2, 745, 741, 3, 2, 2, 2, 746, 123, 3, 2, 2, 2, 747, 748, 9, 10, 2, 2, 748, 125, 3, 2, 2, 2, 749, 756, 7, 56, 2, 2, 750, 756, 7, 57, 2, 2, 751, 756, 7, 114, 2, 2, 752, 756, 7, 115, 2, 2, 753, 756, 7, 5, 2, 2, 754, 756, 5, 128, 65, 2, 755, 749, 3, 2, 2, 2, 755, 750, 3, 2, 2, 2, 755, 751, 3, 2, 2, 2, 755, 752, 3, 2, 2, 2, 755, 753, 3, 2, 2, 2, 755, 754, 3, 2, 2, 2, 756, 127, 3, 2, 2, 2, 757, 758, 9, 11, 2, 2, 758, 129, 3, 2, 2, 2, 759, 762, 7, 113, 2, 2, 760, 762, 5, 132, 67, 2, 761, 759, 3, 2, 2, 2, 761, 760, 3, 2, 2, 2, 762, 131, 3, 2, 2, 2, 763, 767, 5, 134, 68, 2, 764, 767, 7, 56, 2, 2, 765, 767, 7, 57, 2, 2, 766, 763, 3, 2, 2, 2, 766, 764, 3, 2, 2, 2, 766, 765, 3, 2, 2, 2, 767, 133, 3, 2, 2, 2, 768, 769, 9, 12, 2, 2, 769, 135, 3, 2, 2, 2, 770, 775, 7, 12, 2, 2, 771, 775, 7, 2, 2, 3, 772, 775, 6, 69, 32, 2, 773, 775, 6, 69, 33, 2, 774, 770, 3, 2, 2, 2, 774, 771, 3, 2, 2, 2, 774, 772, 3, 2, 2, 2, 774, 773, 3, 2, 2, 2, 775, 137, 3, 2, 2, 2, 79, 139, 144, 152, 159, 165, 174, 180, 185, 191, 201, 217, 230, 234, 241, 252, 258, 273, 292, 296, 300, 310, 314, 325, 338, 344, 351, 358, 365, 383, 387, 389, 396, 402, 407, 418, 421, 436, 439, 445, 458, 464, 470, 477, 489, 494, 499, 504, 510, 515, 521, 525, 530, 539, 544, 550, 553, 556, 567, 570, 573, 588, 593, 601, 606, 609, 621, 628, 658, 727, 729, 735, 738, 745, 755, 761, 766, 774]
\ No newline at end of file
diff --git a/src/main/gen/org/bdware/sc/parser/YJSParser.java b/src/main/gen/org/bdware/sc/parser/YJSParser.java
new file mode 100644
index 0000000..e9244b6
--- /dev/null
+++ b/src/main/gen/org/bdware/sc/parser/YJSParser.java
@@ -0,0 +1,8748 @@
+package org.bdware.sc.parser;// Generated from /Users/frankrwu/Workspace/JetBrains/Idea/BDContract/genparser/input/YJSParser.g4 by ANTLR 4.9.1
+
+import org.antlr.v4.runtime.*;
+import org.antlr.v4.runtime.atn.ATN;
+import org.antlr.v4.runtime.atn.ATNDeserializer;
+import org.antlr.v4.runtime.atn.ParserATNSimulator;
+import org.antlr.v4.runtime.atn.PredictionContextCache;
+import org.antlr.v4.runtime.dfa.DFA;
+import org.antlr.v4.runtime.tree.ParseTreeListener;
+import org.antlr.v4.runtime.tree.ParseTreeVisitor;
+import org.antlr.v4.runtime.tree.TerminalNode;
+
+import java.util.List;
+
+@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
+public class YJSParser extends JavaScriptBaseParser {
+    public static final int
+            MultiLineComment = 1, SingleLineComment = 2, RegularExpressionLiteral = 3, OpenBracket = 4,
+            CloseBracket = 5, OpenParen = 6, CloseParen = 7, OpenBrace = 8, CloseBrace = 9,
+            SemiColon = 10, Comma = 11, Assign = 12, QuestionMark = 13, Colon = 14, Ellipsis = 15,
+            Dot = 16, PlusPlus = 17, MinusMinus = 18, Plus = 19, Minus = 20, BitNot = 21, Not = 22,
+            Multiply = 23, Divide = 24, Modulus = 25, RightShiftArithmetic = 26, LeftShiftArithmetic = 27,
+            RightShiftLogical = 28, LessThan = 29, MoreThan = 30, LessThanEquals = 31, GreaterThanEquals = 32,
+            Equals_ = 33, NotEquals = 34, IdentityEquals = 35, IdentityNotEquals = 36, BitAnd = 37,
+            BitXOr = 38, BitOr = 39, And = 40, Or = 41, MultiplyAssign = 42, DivideAssign = 43,
+            ModulusAssign = 44, PlusAssign = 45, MinusAssign = 46, LeftShiftArithmeticAssign = 47,
+            RightShiftArithmeticAssign = 48, RightShiftLogicalAssign = 49, BitAndAssign = 50,
+            BitXorAssign = 51, BitOrAssign = 52, ARROW = 53, NullLiteral = 54, BooleanLiteral = 55,
+            DecimalLiteral = 56, HexIntegerLiteral = 57, OctalIntegerLiteral = 58, OctalIntegerLiteral2 = 59,
+            BinaryIntegerLiteral = 60, Break = 61, Do = 62, Instanceof = 63, Typeof = 64, Case = 65,
+            Else = 66, New = 67, Var = 68, Catch = 69, Finally = 70, Return = 71, Void = 72, Continue = 73,
+            For = 74, Switch = 75, While = 76, Debugger = 77, Function = 78, This = 79, With = 80,
+            Default = 81, If = 82, Throw = 83, Delete = 84, In = 85, Try = 86, Event = 87, AtToken = 88,
+            AtLeastOnce = 89, AtMostOnce = 90, OnlyOnce = 91, Class = 92, Enum = 93, Extends = 94,
+            Super = 95, Const = 96, Export = 97, Import = 98, Contract = 99, Module = 100, Oracle = 101,
+            Implements = 102, Let = 103, Private = 104, Public = 105, Interface = 106, Package = 107,
+            Protected = 108, Static = 109, Yield = 110, Identifier = 111, StringLiteral = 112,
+            TemplateStringLiteral = 113, WhiteSpaces = 114, LineTerminator = 115, HtmlComment = 116,
+            CDataComment = 117, UnexpectedCharacter = 118;
+    public static final int
+            RULE_program = 0, RULE_contractDeclar = 1, RULE_annotations = 2, RULE_annotation = 3,
+            RULE_annotationArgs = 4, RULE_annotationLiteral = 5, RULE_clzOrFunctionDeclaration = 6,
+            RULE_eventSemantics = 7, RULE_eventDeclaration = 8, RULE_sourceElement = 9,
+            RULE_importStmts = 10, RULE_importStmt = 11, RULE_exportStmt = 12, RULE_versionName = 13,
+            RULE_statement = 14, RULE_block = 15, RULE_statementList = 16, RULE_variableStatement = 17,
+            RULE_variableDeclarationList = 18, RULE_variableDeclaration = 19, RULE_emptyStatement = 20,
+            RULE_expressionStatement = 21, RULE_ifStatement = 22, RULE_iterationStatement = 23,
+            RULE_varModifier = 24, RULE_continueStatement = 25, RULE_breakStatement = 26,
+            RULE_returnStatement = 27, RULE_withStatement = 28, RULE_switchStatement = 29,
+            RULE_caseBlock = 30, RULE_caseClauses = 31, RULE_caseClause = 32, RULE_defaultClause = 33,
+            RULE_throwStatement = 34, RULE_tryStatement = 35, RULE_catchProduction = 36,
+            RULE_finallyProduction = 37, RULE_debuggerStatement = 38, RULE_functionDeclaration = 39,
+            RULE_classDeclaration = 40, RULE_classTail = 41, RULE_classElement = 42,
+            RULE_methodDefinition = 43, RULE_formalParameterList = 44, RULE_formalParameterArg = 45,
+            RULE_lastFormalParameterArg = 46, RULE_functionBody = 47, RULE_sourceElements = 48,
+            RULE_arrayLiteral = 49, RULE_elementList = 50, RULE_lastElement = 51,
+            RULE_objectLiteral = 52, RULE_propertyAssignment = 53, RULE_propertyName = 54,
+            RULE_arguments = 55, RULE_lastArgument = 56, RULE_expressionSequence = 57,
+            RULE_singleExpression = 58, RULE_arrowFunctionParameters = 59, RULE_arrowFunctionBody = 60,
+            RULE_assignmentOperator = 61, RULE_literal = 62, RULE_numericLiteral = 63,
+            RULE_identifierName = 64, RULE_reservedWord = 65, RULE_keyword = 66, RULE_eos = 67;
+    public static final String[] ruleNames = makeRuleNames();
+    /**
+     * @deprecated Use {@link #VOCABULARY} instead.
+     */
+    @Deprecated
+    public static final String[] tokenNames;
+    public static final String _serializedATN =
+            "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3x\u0309\4\2\t\2\4" +
+                    "\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t" +
+                    "\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22" +
+                    "\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31" +
+                    "\4\32\t\32\4\33\t\33\4\34\t\34\4\35\t\35\4\36\t\36\4\37\t\37\4 \t \4!" +
+                    "\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\4*\t*\4+\t+\4" +
+                    ",\t,\4-\t-\4.\t.\4/\t/\4\60\t\60\4\61\t\61\4\62\t\62\4\63\t\63\4\64\t" +
+                    "\64\4\65\t\65\4\66\t\66\4\67\t\67\48\t8\49\t9\4:\t:\4;\t;\4<\t<\4=\t=" +
+                    "\4>\t>\4?\t?\4@\t@\4A\tA\4B\tB\4C\tC\4D\tD\4E\tE\3\2\5\2\u008c\n\2\3\2" +
+                    "\3\2\3\3\5\3\u0091\n\3\3\3\3\3\3\3\3\3\6\3\u0097\n\3\r\3\16\3\u0098\3" +
+                    "\3\3\3\3\4\6\4\u009e\n\4\r\4\16\4\u009f\3\5\3\5\3\5\3\5\5\5\u00a6\n\5" +
+                    "\3\5\3\5\3\6\3\6\3\6\7\6\u00ad\n\6\f\6\16\6\u00b0\13\6\3\7\3\7\3\7\5\7" +
+                    "\u00b5\n\7\3\b\3\b\3\b\5\b\u00ba\n\b\3\t\3\t\3\n\3\n\5\n\u00c0\n\n\3\n" +
+                    "\3\n\3\n\3\13\3\13\3\f\6\f\u00c8\n\f\r\f\16\f\u00c9\3\r\3\r\3\r\3\r\3" +
+                    "\16\3\16\3\16\3\16\3\16\3\17\3\17\3\17\7\17\u00d8\n\17\f\17\16\17\u00db" +
+                    "\13\17\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\20\5\20\u00e7\n" +
+                    "\20\3\21\3\21\5\21\u00eb\n\21\3\21\3\21\3\22\6\22\u00f0\n\22\r\22\16\22" +
+                    "\u00f1\3\23\3\23\3\23\3\23\3\24\3\24\3\24\7\24\u00fb\n\24\f\24\16\24\u00fe" +
+                    "\13\24\3\25\3\25\3\25\5\25\u0103\n\25\3\26\3\26\3\27\3\27\3\27\3\27\3" +
+                    "\30\3\30\3\30\3\30\3\30\3\30\3\30\5\30\u0112\n\30\3\31\3\31\3\31\3\31" +
+                    "\3\31\3\31\3\31\3\31\3\31\3\31\3\31\3\31\3\31\3\31\3\31\3\31\3\31\5\31" +
+                    "\u0125\n\31\3\31\3\31\5\31\u0129\n\31\3\31\3\31\5\31\u012d\n\31\3\31\3" +
+                    "\31\3\31\3\31\3\31\3\31\3\31\3\31\5\31\u0137\n\31\3\31\3\31\5\31\u013b" +
+                    "\n\31\3\31\3\31\3\31\3\31\3\31\3\31\3\31\3\31\3\31\5\31\u0146\n\31\3\31" +
+                    "\3\31\3\31\3\31\3\31\3\31\3\31\3\31\3\31\3\31\3\31\5\31\u0153\n\31\3\31" +
+                    "\3\31\3\31\3\31\5\31\u0159\n\31\3\32\3\32\3\33\3\33\3\33\5\33\u0160\n" +
+                    "\33\3\33\3\33\3\34\3\34\3\34\5\34\u0167\n\34\3\34\3\34\3\35\3\35\3\35" +
+                    "\5\35\u016e\n\35\3\35\3\35\3\36\3\36\3\36\3\36\3\36\3\36\3\37\3\37\3\37" +
+                    "\3\37\3\37\3\37\3 \3 \5 \u0180\n \3 \3 \5 \u0184\n \5 \u0186\n \3 \3 " +
+                    "\3!\6!\u018b\n!\r!\16!\u018c\3\"\3\"\3\"\3\"\5\"\u0193\n\"\3#\3#\3#\5" +
+                    "#\u0198\n#\3$\3$\3$\3$\3$\3%\3%\3%\3%\5%\u01a3\n%\3%\5%\u01a6\n%\3&\3" +
+                    "&\3&\3&\3&\3&\3\'\3\'\3\'\3(\3(\3(\3)\5)\u01b5\n)\3)\5)\u01b8\n)\3)\3" +
+                    ")\3)\3)\5)\u01be\n)\3)\3)\3)\3)\3)\3*\3*\3*\3*\3+\3+\5+\u01cb\n+\3+\3" +
+                    "+\7+\u01cf\n+\f+\16+\u01d2\13+\3+\3+\3,\5,\u01d7\n,\3,\3,\3-\3-\3-\5-" +
+                    "\u01de\n-\3-\3-\3-\3-\3-\3.\3.\3.\7.\u01e8\n.\f.\16.\u01eb\13.\3.\3.\5" +
+                    ".\u01ef\n.\3.\3.\3.\5.\u01f4\n.\3/\3/\3/\5/\u01f9\n/\3\60\3\60\3\60\3" +
+                    "\61\5\61\u01ff\n\61\3\62\6\62\u0202\n\62\r\62\16\62\u0203\3\63\3\63\7" +
+                    "\63\u0208\n\63\f\63\16\63\u020b\13\63\3\63\5\63\u020e\n\63\3\63\7\63\u0211" +
+                    "\n\63\f\63\16\63\u0214\13\63\3\63\3\63\3\64\3\64\6\64\u021a\n\64\r\64" +
+                    "\16\64\u021b\3\64\7\64\u021f\n\64\f\64\16\64\u0222\13\64\3\64\6\64\u0225" +
+                    "\n\64\r\64\16\64\u0226\3\64\5\64\u022a\n\64\3\64\5\64\u022d\n\64\3\65" +
+                    "\3\65\3\65\3\66\3\66\3\66\3\66\7\66\u0236\n\66\f\66\16\66\u0239\13\66" +
+                    "\5\66\u023b\n\66\3\66\5\66\u023e\n\66\3\66\3\66\3\67\3\67\3\67\3\67\3" +
+                    "\67\3\67\3\67\3\67\3\67\3\67\3\67\5\67\u024d\n\67\38\38\38\58\u0252\n" +
+                    "8\39\39\39\39\79\u0258\n9\f9\169\u025b\139\39\39\59\u025f\n9\39\59\u0262" +
+                    "\n9\39\39\3:\3:\3:\3;\3;\3;\7;\u026c\n;\f;\16;\u026f\13;\3<\3<\3<\3<\5" +
+                    "<\u0275\n<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3" +
+                    "<\3<\3<\3<\3<\3<\3<\3<\3<\5<\u0293\n<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3" +
+                    "<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3" +
+                    "<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3" +
+                    "<\3<\3<\3<\3<\3<\3<\3<\3<\3<\3<\7<\u02d8\n<\f<\16<\u02db\13<\3=\3=\3=" +
+                    "\5=\u02e0\n=\3=\5=\u02e3\n=\3>\3>\3>\3>\3>\5>\u02ea\n>\3?\3?\3@\3@\3@" +
+                    "\3@\3@\3@\5@\u02f4\n@\3A\3A\3B\3B\5B\u02fa\nB\3C\3C\3C\5C\u02ff\nC\3D" +
+                    "\3D\3E\3E\3E\3E\5E\u0307\nE\3E\2\3vF\2\4\6\b\n\f\16\20\22\24\26\30\32" +
+                    "\34\36 \"$&(*,.\60\62\64\668:<>@BDFHJLNPRTVXZ\\^`bdfhjlnprtvxz|~\u0080" +
+                    "\u0082\u0084\u0086\u0088\2\r\3\2eg\3\2[]\4\2\16\16\20\20\3\2\31\33\3\2" +
+                    "\25\26\3\2\34\36\3\2\37\"\3\2#&\3\2,\66\3\2:>\5\2?X^dhp\2\u034c\2\u008b" +
+                    "\3\2\2\2\4\u0090\3\2\2\2\6\u009d\3\2\2\2\b\u00a1\3\2\2\2\n\u00a9\3\2\2" +
+                    "\2\f\u00b4\3\2\2\2\16\u00b9\3\2\2\2\20\u00bb\3\2\2\2\22\u00bd\3\2\2\2" +
+                    "\24\u00c4\3\2\2\2\26\u00c7\3\2\2\2\30\u00cb\3\2\2\2\32\u00cf\3\2\2\2\34" +
+                    "\u00d4\3\2\2\2\36\u00e6\3\2\2\2 \u00e8\3\2\2\2\"\u00ef\3\2\2\2$\u00f3" +
+                    "\3\2\2\2&\u00f7\3\2\2\2(\u00ff\3\2\2\2*\u0104\3\2\2\2,\u0106\3\2\2\2." +
+                    "\u010a\3\2\2\2\60\u0158\3\2\2\2\62\u015a\3\2\2\2\64\u015c\3\2\2\2\66\u0163" +
+                    "\3\2\2\28\u016a\3\2\2\2:\u0171\3\2\2\2<\u0177\3\2\2\2>\u017d\3\2\2\2@" +
+                    "\u018a\3\2\2\2B\u018e\3\2\2\2D\u0194\3\2\2\2F\u0199\3\2\2\2H\u019e\3\2" +
+                    "\2\2J\u01a7\3\2\2\2L\u01ad\3\2\2\2N\u01b0\3\2\2\2P\u01b4\3\2\2\2R\u01c4" +
+                    "\3\2\2\2T\u01ca\3\2\2\2V\u01d6\3\2\2\2X\u01da\3\2\2\2Z\u01f3\3\2\2\2\\" +
+                    "\u01f5\3\2\2\2^\u01fa\3\2\2\2`\u01fe\3\2\2\2b\u0201\3\2\2\2d\u0205\3\2" +
+                    "\2\2f\u022c\3\2\2\2h\u022e\3\2\2\2j\u0231\3\2\2\2l\u024c\3\2\2\2n\u0251" +
+                    "\3\2\2\2p\u0253\3\2\2\2r\u0265\3\2\2\2t\u0268\3\2\2\2v\u0292\3\2\2\2x" +
+                    "\u02e2\3\2\2\2z\u02e9\3\2\2\2|\u02eb\3\2\2\2~\u02f3\3\2\2\2\u0080\u02f5" +
+                    "\3\2\2\2\u0082\u02f9\3\2\2\2\u0084\u02fe\3\2\2\2\u0086\u0300\3\2\2\2\u0088" +
+                    "\u0306\3\2\2\2\u008a\u008c\5\26\f\2\u008b\u008a\3\2\2\2\u008b\u008c\3" +
+                    "\2\2\2\u008c\u008d\3\2\2\2\u008d\u008e\5\4\3\2\u008e\3\3\2\2\2\u008f\u0091" +
+                    "\5\6\4\2\u0090\u008f\3\2\2\2\u0090\u0091\3\2\2\2\u0091\u0092\3\2\2\2\u0092" +
+                    "\u0093\t\2\2\2\u0093\u0094\7q\2\2\u0094\u0096\7\n\2\2\u0095\u0097\5\16" +
+                    "\b\2\u0096\u0095\3\2\2\2\u0097\u0098\3\2\2\2\u0098\u0096\3\2\2\2\u0098" +
+                    "\u0099\3\2\2\2\u0099\u009a\3\2\2\2\u009a\u009b\7\13\2\2\u009b\5\3\2\2" +
+                    "\2\u009c\u009e\5\b\5\2\u009d\u009c\3\2\2\2\u009e\u009f\3\2\2\2\u009f\u009d" +
+                    "\3\2\2\2\u009f\u00a0\3\2\2\2\u00a0\7\3\2\2\2\u00a1\u00a2\7Z\2\2\u00a2" +
+                    "\u00a3\7q\2\2\u00a3\u00a5\7\b\2\2\u00a4\u00a6\5\n\6\2\u00a5\u00a4\3\2" +
+                    "\2\2\u00a5\u00a6\3\2\2\2\u00a6\u00a7\3\2\2\2\u00a7\u00a8\7\t\2\2\u00a8" +
+                    "\t\3\2\2\2\u00a9\u00ae\5\f\7\2\u00aa\u00ab\7\r\2\2\u00ab\u00ad\5\f\7\2" +
+                    "\u00ac\u00aa\3\2\2\2\u00ad\u00b0\3\2\2\2\u00ae\u00ac\3\2\2\2\u00ae\u00af" +
+                    "\3\2\2\2\u00af\13\3\2\2\2\u00b0\u00ae\3\2\2\2\u00b1\u00b5\5\u0080A\2\u00b2" +
+                    "\u00b5\7r\2\2\u00b3\u00b5\5j\66\2\u00b4\u00b1\3\2\2\2\u00b4\u00b2\3\2" +
+                    "\2\2\u00b4\u00b3\3\2\2\2\u00b5\r\3\2\2\2\u00b6\u00ba\5R*\2\u00b7\u00ba" +
+                    "\5P)\2\u00b8\u00ba\5\22\n\2\u00b9\u00b6\3\2\2\2\u00b9\u00b7\3\2\2\2\u00b9" +
+                    "\u00b8\3\2\2\2\u00ba\17\3\2\2\2\u00bb\u00bc\t\3\2\2\u00bc\21\3\2\2\2\u00bd" +
+                    "\u00bf\7Y\2\2\u00be\u00c0\5\20\t\2\u00bf\u00be\3\2\2\2\u00bf\u00c0\3\2" +
+                    "\2\2\u00c0\u00c1\3\2\2\2\u00c1\u00c2\7q\2\2\u00c2\u00c3\7\f\2\2\u00c3" +
+                    "\23\3\2\2\2\u00c4\u00c5\5\36\20\2\u00c5\25\3\2\2\2\u00c6\u00c8\5\30\r" +
+                    "\2\u00c7\u00c6\3\2\2\2\u00c8\u00c9\3\2\2\2\u00c9\u00c7\3\2\2\2\u00c9\u00ca" +
+                    "\3\2\2\2\u00ca\27\3\2\2\2\u00cb\u00cc\7d\2\2\u00cc\u00cd\7r\2\2\u00cd" +
+                    "\u00ce\7\f\2\2\u00ce\31\3\2\2\2\u00cf\u00d0\7c\2\2\u00d0\u00d1\7q\2\2" +
+                    "\u00d1\u00d2\5\34\17\2\u00d2\u00d3\7\f\2\2\u00d3\33\3\2\2\2\u00d4\u00d9" +
+                    "\7:\2\2\u00d5\u00d6\7\22\2\2\u00d6\u00d8\7:\2\2\u00d7\u00d5\3\2\2\2\u00d8" +
+                    "\u00db\3\2\2\2\u00d9\u00d7\3\2\2\2\u00d9\u00da\3\2\2\2\u00da\35\3\2\2" +
+                    "\2\u00db\u00d9\3\2\2\2\u00dc\u00e7\5 \21\2\u00dd\u00e7\5$\23\2\u00de\u00e7" +
+                    "\5*\26\2\u00df\u00e7\5,\27\2\u00e0\u00e7\5.\30\2\u00e1\u00e7\5\60\31\2" +
+                    "\u00e2\u00e7\5\64\33\2\u00e3\u00e7\5\66\34\2\u00e4\u00e7\58\35\2\u00e5" +
+                    "\u00e7\5<\37\2\u00e6\u00dc\3\2\2\2\u00e6\u00dd\3\2\2\2\u00e6\u00de\3\2" +
+                    "\2\2\u00e6\u00df\3\2\2\2\u00e6\u00e0\3\2\2\2\u00e6\u00e1\3\2\2\2\u00e6" +
+                    "\u00e2\3\2\2\2\u00e6\u00e3\3\2\2\2\u00e6\u00e4\3\2\2\2\u00e6\u00e5\3\2" +
+                    "\2\2\u00e7\37\3\2\2\2\u00e8\u00ea\7\n\2\2\u00e9\u00eb\5\"\22\2\u00ea\u00e9" +
+                    "\3\2\2\2\u00ea\u00eb\3\2\2\2\u00eb\u00ec\3\2\2\2\u00ec\u00ed\7\13\2\2" +
+                    "\u00ed!\3\2\2\2\u00ee\u00f0\5\36\20\2\u00ef\u00ee\3\2\2\2\u00f0\u00f1" +
+                    "\3\2\2\2\u00f1\u00ef\3\2\2\2\u00f1\u00f2\3\2\2\2\u00f2#\3\2\2\2\u00f3" +
+                    "\u00f4\5\62\32\2\u00f4\u00f5\5&\24\2\u00f5\u00f6\5\u0088E\2\u00f6%\3\2" +
+                    "\2\2\u00f7\u00fc\5(\25\2\u00f8\u00f9\7\r\2\2\u00f9\u00fb\5(\25\2\u00fa" +
+                    "\u00f8\3\2\2\2\u00fb\u00fe\3\2\2\2\u00fc\u00fa\3\2\2\2\u00fc\u00fd\3\2" +
+                    "\2\2\u00fd\'\3\2\2\2\u00fe\u00fc\3\2\2\2\u00ff\u0102\7q\2\2\u0100\u0101" +
+                    "\7\16\2\2\u0101\u0103\5v<\2\u0102\u0100\3\2\2\2\u0102\u0103\3\2\2\2\u0103" +
+                    ")\3\2\2\2\u0104\u0105\7\f\2\2\u0105+\3\2\2\2\u0106\u0107\6\27\2\2\u0107" +
+                    "\u0108\5t;\2\u0108\u0109\5\u0088E\2\u0109-\3\2\2\2\u010a\u010b\7T\2\2" +
+                    "\u010b\u010c\7\b\2\2\u010c\u010d\5t;\2\u010d\u010e\7\t\2\2\u010e\u0111" +
+                    "\5\36\20\2\u010f\u0110\7D\2\2\u0110\u0112\5\36\20\2\u0111\u010f\3\2\2" +
+                    "\2\u0111\u0112\3\2\2\2\u0112/\3\2\2\2\u0113\u0114\7@\2\2\u0114\u0115\5" +
+                    "\36\20\2\u0115\u0116\7N\2\2\u0116\u0117\7\b\2\2\u0117\u0118\5t;\2\u0118" +
+                    "\u0119\7\t\2\2\u0119\u011a\5\u0088E\2\u011a\u0159\3\2\2\2\u011b\u011c" +
+                    "\7N\2\2\u011c\u011d\7\b\2\2\u011d\u011e\5t;\2\u011e\u011f\7\t\2\2\u011f" +
+                    "\u0120\5\36\20\2\u0120\u0159\3\2\2\2\u0121\u0122\7L\2\2\u0122\u0124\7" +
+                    "\b\2\2\u0123\u0125\5t;\2\u0124\u0123\3\2\2\2\u0124\u0125\3\2\2\2\u0125" +
+                    "\u0126\3\2\2\2\u0126\u0128\7\f\2\2\u0127\u0129\5t;\2\u0128\u0127\3\2\2" +
+                    "\2\u0128\u0129\3\2\2\2\u0129\u012a\3\2\2\2\u012a\u012c\7\f\2\2\u012b\u012d" +
+                    "\5t;\2\u012c\u012b\3\2\2\2\u012c\u012d\3\2\2\2\u012d\u012e\3\2\2\2\u012e" +
+                    "\u012f\7\t\2\2\u012f\u0159\5\36\20\2\u0130\u0131\7L\2\2\u0131\u0132\7" +
+                    "\b\2\2\u0132\u0133\5\62\32\2\u0133\u0134\5&\24\2\u0134\u0136\7\f\2\2\u0135" +
+                    "\u0137\5t;\2\u0136\u0135\3\2\2\2\u0136\u0137\3\2\2\2\u0137\u0138\3\2\2" +
+                    "\2\u0138\u013a\7\f\2\2\u0139\u013b\5t;\2\u013a\u0139\3\2\2\2\u013a\u013b" +
+                    "\3\2\2\2\u013b\u013c\3\2\2\2\u013c\u013d\7\t\2\2\u013d\u013e\5\36\20\2" +
+                    "\u013e\u0159\3\2\2\2\u013f\u0140\7L\2\2\u0140\u0141\7\b\2\2\u0141\u0145" +
+                    "\5v<\2\u0142\u0146\7W\2\2\u0143\u0144\7q\2\2\u0144\u0146\6\31\3\2\u0145" +
+                    "\u0142\3\2\2\2\u0145\u0143\3\2\2\2\u0146\u0147\3\2\2\2\u0147\u0148\5t" +
+                    ";\2\u0148\u0149\7\t\2\2\u0149\u014a\5\36\20\2\u014a\u0159\3\2\2\2\u014b" +
+                    "\u014c\7L\2\2\u014c\u014d\7\b\2\2\u014d\u014e\5\62\32\2\u014e\u0152\5" +
+                    "(\25\2\u014f\u0153\7W\2\2\u0150\u0151\7q\2\2\u0151\u0153\6\31\4\2\u0152" +
+                    "\u014f\3\2\2\2\u0152\u0150\3\2\2\2\u0153\u0154\3\2\2\2\u0154\u0155\5t" +
+                    ";\2\u0155\u0156\7\t\2\2\u0156\u0157\5\36\20\2\u0157\u0159\3\2\2\2\u0158" +
+                    "\u0113\3\2\2\2\u0158\u011b\3\2\2\2\u0158\u0121\3\2\2\2\u0158\u0130\3\2" +
+                    "\2\2\u0158\u013f\3\2\2\2\u0158\u014b\3\2\2\2\u0159\61\3\2\2\2\u015a\u015b" +
+                    "\7F\2\2\u015b\63\3\2\2\2\u015c\u015f\7K\2\2\u015d\u015e\6\33\5\2\u015e" +
+                    "\u0160\7q\2\2\u015f\u015d\3\2\2\2\u015f\u0160\3\2\2\2\u0160\u0161\3\2" +
+                    "\2\2\u0161\u0162\5\u0088E\2\u0162\65\3\2\2\2\u0163\u0166\7?\2\2\u0164" +
+                    "\u0165\6\34\6\2\u0165\u0167\7q\2\2\u0166\u0164\3\2\2\2\u0166\u0167\3\2" +
+                    "\2\2\u0167\u0168\3\2\2\2\u0168\u0169\5\u0088E\2\u0169\67\3\2\2\2\u016a" +
+                    "\u016d\7I\2\2\u016b\u016c\6\35\7\2\u016c\u016e\5t;\2\u016d\u016b\3\2\2" +
+                    "\2\u016d\u016e\3\2\2\2\u016e\u016f\3\2\2\2\u016f\u0170\5\u0088E\2\u0170" +
+                    "9\3\2\2\2\u0171\u0172\7R\2\2\u0172\u0173\7\b\2\2\u0173\u0174\5t;\2\u0174" +
+                    "\u0175\7\t\2\2\u0175\u0176\5\36\20\2\u0176;\3\2\2\2\u0177\u0178\7M\2\2" +
+                    "\u0178\u0179\7\b\2\2\u0179\u017a\5t;\2\u017a\u017b\7\t\2\2\u017b\u017c" +
+                    "\5> \2\u017c=\3\2\2\2\u017d\u017f\7\n\2\2\u017e\u0180\5@!\2\u017f\u017e" +
+                    "\3\2\2\2\u017f\u0180\3\2\2\2\u0180\u0185\3\2\2\2\u0181\u0183\5D#\2\u0182" +
+                    "\u0184\5@!\2\u0183\u0182\3\2\2\2\u0183\u0184\3\2\2\2\u0184\u0186\3\2\2" +
+                    "\2\u0185\u0181\3\2\2\2\u0185\u0186\3\2\2\2\u0186\u0187\3\2\2\2\u0187\u0188" +
+                    "\7\13\2\2\u0188?\3\2\2\2\u0189\u018b\5B\"\2\u018a\u0189\3\2\2\2\u018b" +
+                    "\u018c\3\2\2\2\u018c\u018a\3\2\2\2\u018c\u018d\3\2\2\2\u018dA\3\2\2\2" +
+                    "\u018e\u018f\7C\2\2\u018f\u0190\5t;\2\u0190\u0192\7\20\2\2\u0191\u0193" +
+                    "\5\"\22\2\u0192\u0191\3\2\2\2\u0192\u0193\3\2\2\2\u0193C\3\2\2\2\u0194" +
+                    "\u0195\7S\2\2\u0195\u0197\7\20\2\2\u0196\u0198\5\"\22\2\u0197\u0196\3" +
+                    "\2\2\2\u0197\u0198\3\2\2\2\u0198E\3\2\2\2\u0199\u019a\7U\2\2\u019a\u019b" +
+                    "\6$\b\2\u019b\u019c\5t;\2\u019c\u019d\5\u0088E\2\u019dG\3\2\2\2\u019e" +
+                    "\u019f\7X\2\2\u019f\u01a5\5 \21\2\u01a0\u01a2\5J&\2\u01a1\u01a3\5L\'\2" +
+                    "\u01a2\u01a1\3\2\2\2\u01a2\u01a3\3\2\2\2\u01a3\u01a6\3\2\2\2\u01a4\u01a6" +
+                    "\5L\'\2\u01a5\u01a0\3\2\2\2\u01a5\u01a4\3\2\2\2\u01a6I\3\2\2\2\u01a7\u01a8" +
+                    "\7G\2\2\u01a8\u01a9\7\b\2\2\u01a9\u01aa\7q\2\2\u01aa\u01ab\7\t\2\2\u01ab" +
+                    "\u01ac\5 \21\2\u01acK\3\2\2\2\u01ad\u01ae\7H\2\2\u01ae\u01af\5 \21\2\u01af" +
+                    "M\3\2\2\2\u01b0\u01b1\7O\2\2\u01b1\u01b2\5\u0088E\2\u01b2O\3\2\2\2\u01b3" +
+                    "\u01b5\5\6\4\2\u01b4\u01b3\3\2\2\2\u01b4\u01b5\3\2\2\2\u01b5\u01b7\3\2" +
+                    "\2\2\u01b6\u01b8\7c\2\2\u01b7\u01b6\3\2\2\2\u01b7\u01b8\3\2\2\2\u01b8" +
+                    "\u01b9\3\2\2\2\u01b9\u01ba\7P\2\2\u01ba\u01bb\7q\2\2\u01bb\u01bd\7\b\2" +
+                    "\2\u01bc\u01be\5Z.\2\u01bd\u01bc\3\2\2\2\u01bd\u01be\3\2\2\2\u01be\u01bf" +
+                    "\3\2\2\2\u01bf\u01c0\7\t\2\2\u01c0\u01c1\7\n\2\2\u01c1\u01c2\5`\61\2\u01c2" +
+                    "\u01c3\7\13\2\2\u01c3Q\3\2\2\2\u01c4\u01c5\7^\2\2\u01c5\u01c6\7q\2\2\u01c6" +
+                    "\u01c7\5T+\2\u01c7S\3\2\2\2\u01c8\u01c9\7`\2\2\u01c9\u01cb\5v<\2\u01ca" +
+                    "\u01c8\3\2\2\2\u01ca\u01cb\3\2\2\2\u01cb\u01cc\3\2\2\2\u01cc\u01d0\7\n" +
+                    "\2\2\u01cd\u01cf\5V,\2\u01ce\u01cd\3\2\2\2\u01cf\u01d2\3\2\2\2\u01d0\u01ce" +
+                    "\3\2\2\2\u01d0\u01d1\3\2\2\2\u01d1\u01d3\3\2\2\2\u01d2\u01d0\3\2\2\2\u01d3" +
+                    "\u01d4\7\13\2\2\u01d4U\3\2\2\2\u01d5\u01d7\7o\2\2\u01d6\u01d5\3\2\2\2" +
+                    "\u01d6\u01d7\3\2\2\2\u01d7\u01d8\3\2\2\2\u01d8\u01d9\5X-\2\u01d9W\3\2" +
+                    "\2\2\u01da\u01db\5n8\2\u01db\u01dd\7\b\2\2\u01dc\u01de\5Z.\2\u01dd\u01dc" +
+                    "\3\2\2\2\u01dd\u01de\3\2\2\2\u01de\u01df\3\2\2\2\u01df\u01e0\7\t\2\2\u01e0" +
+                    "\u01e1\7\n\2\2\u01e1\u01e2\5`\61\2\u01e2\u01e3\7\13\2\2\u01e3Y\3\2\2\2" +
+                    "\u01e4\u01e9\5\\/\2\u01e5\u01e6\7\r\2\2\u01e6\u01e8\5\\/\2\u01e7\u01e5" +
+                    "\3\2\2\2\u01e8\u01eb\3\2\2\2\u01e9\u01e7\3\2\2\2\u01e9\u01ea\3\2\2\2\u01ea" +
+                    "\u01ee\3\2\2\2\u01eb\u01e9\3\2\2\2\u01ec\u01ed\7\r\2\2\u01ed\u01ef\5^" +
+                    "\60\2\u01ee\u01ec\3\2\2\2\u01ee\u01ef\3\2\2\2\u01ef\u01f4\3\2\2\2\u01f0" +
+                    "\u01f4\5^\60\2\u01f1\u01f4\5d\63\2\u01f2\u01f4\5j\66\2\u01f3\u01e4\3\2" +
+                    "\2\2\u01f3\u01f0\3\2\2\2\u01f3\u01f1\3\2\2\2\u01f3\u01f2\3\2\2\2\u01f4" +
+                    "[\3\2\2\2\u01f5\u01f8\7q\2\2\u01f6\u01f7\7\16\2\2\u01f7\u01f9\5v<\2\u01f8" +
+                    "\u01f6\3\2\2\2\u01f8\u01f9\3\2\2\2\u01f9]\3\2\2\2\u01fa\u01fb\7\21\2\2" +
+                    "\u01fb\u01fc\7q\2\2\u01fc_\3\2\2\2\u01fd\u01ff\5b\62\2\u01fe\u01fd\3\2" +
+                    "\2\2\u01fe\u01ff\3\2\2\2\u01ffa\3\2\2\2\u0200\u0202\5\24\13\2\u0201\u0200" +
+                    "\3\2\2\2\u0202\u0203\3\2\2\2\u0203\u0201\3\2\2\2\u0203\u0204\3\2\2\2\u0204" +
+                    "c\3\2\2\2\u0205\u0209\7\6\2\2\u0206\u0208\7\r\2\2\u0207\u0206\3\2\2\2" +
+                    "\u0208\u020b\3\2\2\2\u0209\u0207\3\2\2\2\u0209\u020a\3\2\2\2\u020a\u020d" +
+                    "\3\2\2\2\u020b\u0209\3\2\2\2\u020c\u020e\5f\64\2\u020d\u020c\3\2\2\2\u020d" +
+                    "\u020e\3\2\2\2\u020e\u0212\3\2\2\2\u020f\u0211\7\r\2\2\u0210\u020f\3\2" +
+                    "\2\2\u0211\u0214\3\2\2\2\u0212\u0210\3\2\2\2\u0212\u0213\3\2\2\2\u0213" +
+                    "\u0215\3\2\2\2\u0214\u0212\3\2\2\2\u0215\u0216\7\7\2\2\u0216e\3\2\2\2" +
+                    "\u0217\u0220\5v<\2\u0218\u021a\7\r\2\2\u0219\u0218\3\2\2\2\u021a\u021b" +
+                    "\3\2\2\2\u021b\u0219\3\2\2\2\u021b\u021c\3\2\2\2\u021c\u021d\3\2\2\2\u021d" +
+                    "\u021f\5v<\2\u021e\u0219\3\2\2\2\u021f\u0222\3\2\2\2\u0220\u021e\3\2\2" +
+                    "\2\u0220\u0221\3\2\2\2\u0221\u0229\3\2\2\2\u0222\u0220\3\2\2\2\u0223\u0225" +
+                    "\7\r\2\2\u0224\u0223\3\2\2\2\u0225\u0226\3\2\2\2\u0226\u0224\3\2\2\2\u0226" +
+                    "\u0227\3\2\2\2\u0227\u0228\3\2\2\2\u0228\u022a\5h\65\2\u0229\u0224\3\2" +
+                    "\2\2\u0229\u022a\3\2\2\2\u022a\u022d\3\2\2\2\u022b\u022d\5h\65\2\u022c" +
+                    "\u0217\3\2\2\2\u022c\u022b\3\2\2\2\u022dg\3\2\2\2\u022e\u022f\7\21\2\2" +
+                    "\u022f\u0230\7q\2\2\u0230i\3\2\2\2\u0231\u023a\7\n\2\2\u0232\u0237\5l" +
+                    "\67\2\u0233\u0234\7\r\2\2\u0234\u0236\5l\67\2\u0235\u0233\3\2\2\2\u0236" +
+                    "\u0239\3\2\2\2\u0237\u0235\3\2\2\2\u0237\u0238\3\2\2\2\u0238\u023b\3\2" +
+                    "\2\2\u0239\u0237\3\2\2\2\u023a\u0232\3\2\2\2\u023a\u023b\3\2\2\2\u023b" +
+                    "\u023d\3\2\2\2\u023c\u023e\7\r\2\2\u023d\u023c\3\2\2\2\u023d\u023e\3\2" +
+                    "\2\2\u023e\u023f\3\2\2\2\u023f\u0240\7\13\2\2\u0240k\3\2\2\2\u0241\u0242" +
+                    "\5n8\2\u0242\u0243\t\4\2\2\u0243\u0244\5v<\2\u0244\u024d\3\2\2\2\u0245" +
+                    "\u0246\7\6\2\2\u0246\u0247\5v<\2\u0247\u0248\7\7\2\2\u0248\u0249\7\20" +
+                    "\2\2\u0249\u024a\5v<\2\u024a\u024d\3\2\2\2\u024b\u024d\7q\2\2\u024c\u0241" +
+                    "\3\2\2\2\u024c\u0245\3\2\2\2\u024c\u024b\3\2\2\2\u024dm\3\2\2\2\u024e" +
+                    "\u0252\5\u0082B\2\u024f\u0252\7r\2\2\u0250\u0252\5\u0080A\2\u0251\u024e" +
+                    "\3\2\2\2\u0251\u024f\3\2\2\2\u0251\u0250\3\2\2\2\u0252o\3\2\2\2\u0253" +
+                    "\u0261\7\b\2\2\u0254\u0259\5v<\2\u0255\u0256\7\r\2\2\u0256\u0258\5v<\2" +
+                    "\u0257\u0255\3\2\2\2\u0258\u025b\3\2\2\2\u0259\u0257\3\2\2\2\u0259\u025a" +
+                    "\3\2\2\2\u025a\u025e\3\2\2\2\u025b\u0259\3\2\2\2\u025c\u025d\7\r\2\2\u025d" +
+                    "\u025f\5r:\2\u025e\u025c\3\2\2\2\u025e\u025f\3\2\2\2\u025f\u0262\3\2\2" +
+                    "\2\u0260\u0262\5r:\2\u0261\u0254\3\2\2\2\u0261\u0260\3\2\2\2\u0261\u0262" +
+                    "\3\2\2\2\u0262\u0263\3\2\2\2\u0263\u0264\7\t\2\2\u0264q\3\2\2\2\u0265" +
+                    "\u0266\7\21\2\2\u0266\u0267\7q\2\2\u0267s\3\2\2\2\u0268\u026d\5v<\2\u0269" +
+                    "\u026a\7\r\2\2\u026a\u026c\5v<\2\u026b\u0269\3\2\2\2\u026c\u026f\3\2\2" +
+                    "\2\u026d\u026b\3\2\2\2\u026d\u026e\3\2\2\2\u026eu\3\2\2\2\u026f\u026d" +
+                    "\3\2\2\2\u0270\u0271\b<\1\2\u0271\u0272\7E\2\2\u0272\u0274\5v<\2\u0273" +
+                    "\u0275\5p9\2\u0274\u0273\3\2\2\2\u0274\u0275\3\2\2\2\u0275\u0293\3\2\2" +
+                    "\2\u0276\u0277\7B\2\2\u0277\u0293\5v<!\u0278\u0279\7\23\2\2\u0279\u0293" +
+                    "\5v< \u027a\u027b\7\24\2\2\u027b\u0293\5v<\37\u027c\u027d\7\25\2\2\u027d" +
+                    "\u0293\5v<\36\u027e\u027f\7\26\2\2\u027f\u0293\5v<\35\u0280\u0281\7\27" +
+                    "\2\2\u0281\u0293\5v<\34\u0282\u0283\7\30\2\2\u0283\u0293\5v<\33\u0284" +
+                    "\u0293\7Q\2\2\u0285\u0293\7q\2\2\u0286\u0293\7a\2\2\u0287\u0293\5~@\2" +
+                    "\u0288\u0293\5d\63\2\u0289\u0293\5j\66\2\u028a\u028b\7\b\2\2\u028b\u028c" +
+                    "\5t;\2\u028c\u028d\7\t\2\2\u028d\u0293\3\2\2\2\u028e\u028f\5x=\2\u028f" +
+                    "\u0290\7\67\2\2\u0290\u0291\5z>\2\u0291\u0293\3\2\2\2\u0292\u0270\3\2" +
+                    "\2\2\u0292\u0276\3\2\2\2\u0292\u0278\3\2\2\2\u0292\u027a\3\2\2\2\u0292" +
+                    "\u027c\3\2\2\2\u0292\u027e\3\2\2\2\u0292\u0280\3\2\2\2\u0292\u0282\3\2" +
+                    "\2\2\u0292\u0284\3\2\2\2\u0292\u0285\3\2\2\2\u0292\u0286\3\2\2\2\u0292" +
+                    "\u0287\3\2\2\2\u0292\u0288\3\2\2\2\u0292\u0289\3\2\2\2\u0292\u028a\3\2" +
+                    "\2\2\u0292\u028e\3\2\2\2\u0293\u02d9\3\2\2\2\u0294\u0295\f\32\2\2\u0295" +
+                    "\u0296\t\5\2\2\u0296\u02d8\5v<\33\u0297\u0298\f\31\2\2\u0298\u0299\t\6" +
+                    "\2\2\u0299\u02d8\5v<\32\u029a\u029b\f\30\2\2\u029b\u029c\t\7\2\2\u029c" +
+                    "\u02d8\5v<\31\u029d\u029e\f\27\2\2\u029e\u029f\t\b\2\2\u029f\u02d8\5v" +
+                    "<\30\u02a0\u02a1\f\26\2\2\u02a1\u02a2\7A\2\2\u02a2\u02d8\5v<\27\u02a3" +
+                    "\u02a4\f\25\2\2\u02a4\u02a5\7W\2\2\u02a5\u02d8\5v<\26\u02a6\u02a7\f\24" +
+                    "\2\2\u02a7\u02a8\t\t\2\2\u02a8\u02d8\5v<\25\u02a9\u02aa\f\23\2\2\u02aa" +
+                    "\u02ab\7\'\2\2\u02ab\u02d8\5v<\24\u02ac\u02ad\f\22\2\2\u02ad\u02ae\7(" +
+                    "\2\2\u02ae\u02d8\5v<\23\u02af\u02b0\f\21\2\2\u02b0\u02b1\7)\2\2\u02b1" +
+                    "\u02d8\5v<\22\u02b2\u02b3\f\20\2\2\u02b3\u02b4\7*\2\2\u02b4\u02d8\5v<" +
+                    "\21\u02b5\u02b6\f\17\2\2\u02b6\u02b7\7+\2\2\u02b7\u02d8\5v<\20\u02b8\u02b9" +
+                    "\f\16\2\2\u02b9\u02ba\7\17\2\2\u02ba\u02bb\5v<\2\u02bb\u02bc\7\20\2\2" +
+                    "\u02bc\u02bd\5v<\17\u02bd\u02d8\3\2\2\2\u02be\u02bf\f\r\2\2\u02bf\u02c0" +
+                    "\7\16\2\2\u02c0\u02d8\5v<\16\u02c1\u02c2\f\f\2\2\u02c2\u02c3\5|?\2\u02c3" +
+                    "\u02c4\5v<\r\u02c4\u02d8\3\2\2\2\u02c5\u02c6\f\'\2\2\u02c6\u02c7\7\6\2" +
+                    "\2\u02c7\u02c8\5t;\2\u02c8\u02c9\7\7\2\2\u02c9\u02d8\3\2\2\2\u02ca\u02cb" +
+                    "\f&\2\2\u02cb\u02cc\7\22\2\2\u02cc\u02d8\5\u0082B\2\u02cd\u02ce\f%\2\2" +
+                    "\u02ce\u02d8\5p9\2\u02cf\u02d0\f#\2\2\u02d0\u02d1\6<\34\2\u02d1\u02d8" +
+                    "\7\23\2\2\u02d2\u02d3\f\"\2\2\u02d3\u02d4\6<\36\2\u02d4\u02d8\7\24\2\2" +
+                    "\u02d5\u02d6\f\13\2\2\u02d6\u02d8\7s\2\2\u02d7\u0294\3\2\2\2\u02d7\u0297" +
+                    "\3\2\2\2\u02d7\u029a\3\2\2\2\u02d7\u029d\3\2\2\2\u02d7\u02a0\3\2\2\2\u02d7" +
+                    "\u02a3\3\2\2\2\u02d7\u02a6\3\2\2\2\u02d7\u02a9\3\2\2\2\u02d7\u02ac\3\2" +
+                    "\2\2\u02d7\u02af\3\2\2\2\u02d7\u02b2\3\2\2\2\u02d7\u02b5\3\2\2\2\u02d7" +
+                    "\u02b8\3\2\2\2\u02d7\u02be\3\2\2\2\u02d7\u02c1\3\2\2\2\u02d7\u02c5\3\2" +
+                    "\2\2\u02d7\u02ca\3\2\2\2\u02d7\u02cd\3\2\2\2\u02d7\u02cf\3\2\2\2\u02d7" +
+                    "\u02d2\3\2\2\2\u02d7\u02d5\3\2\2\2\u02d8\u02db\3\2\2\2\u02d9\u02d7\3\2" +
+                    "\2\2\u02d9\u02da\3\2\2\2\u02daw\3\2\2\2\u02db\u02d9\3\2\2\2\u02dc\u02e3" +
+                    "\7q\2\2\u02dd\u02df\7\b\2\2\u02de\u02e0\5Z.\2\u02df\u02de\3\2\2\2\u02df" +
+                    "\u02e0\3\2\2\2\u02e0\u02e1\3\2\2\2\u02e1\u02e3\7\t\2\2\u02e2\u02dc\3\2" +
+                    "\2\2\u02e2\u02dd\3\2\2\2\u02e3y\3\2\2\2\u02e4\u02ea\5v<\2\u02e5\u02e6" +
+                    "\7\n\2\2\u02e6\u02e7\5`\61\2\u02e7\u02e8\7\13\2\2\u02e8\u02ea\3\2\2\2" +
+                    "\u02e9\u02e4\3\2\2\2\u02e9\u02e5\3\2\2\2\u02ea{\3\2\2\2\u02eb\u02ec\t" +
+                    "\n\2\2\u02ec}\3\2\2\2\u02ed\u02f4\78\2\2\u02ee\u02f4\79\2\2\u02ef\u02f4" +
+                    "\7r\2\2\u02f0\u02f4\7s\2\2\u02f1\u02f4\7\5\2\2\u02f2\u02f4\5\u0080A\2" +
+                    "\u02f3\u02ed\3\2\2\2\u02f3\u02ee\3\2\2\2\u02f3\u02ef\3\2\2\2\u02f3\u02f0" +
+                    "\3\2\2\2\u02f3\u02f1\3\2\2\2\u02f3\u02f2\3\2\2\2\u02f4\177\3\2\2\2\u02f5" +
+                    "\u02f6\t\13\2\2\u02f6\u0081\3\2\2\2\u02f7\u02fa\7q\2\2\u02f8\u02fa\5\u0084" +
+                    "C\2\u02f9\u02f7\3\2\2\2\u02f9\u02f8\3\2\2\2\u02fa\u0083\3\2\2\2\u02fb" +
+                    "\u02ff\5\u0086D\2\u02fc\u02ff\78\2\2\u02fd\u02ff\79\2\2\u02fe\u02fb\3" +
+                    "\2\2\2\u02fe\u02fc\3\2\2\2\u02fe\u02fd\3\2\2\2\u02ff\u0085\3\2\2\2\u0300" +
+                    "\u0301\t\f\2\2\u0301\u0087\3\2\2\2\u0302\u0307\7\f\2\2\u0303\u0307\7\2" +
+                    "\2\3\u0304\u0307\6E \2\u0305\u0307\6E!\2\u0306\u0302\3\2\2\2\u0306\u0303" +
+                    "\3\2\2\2\u0306\u0304\3\2\2\2\u0306\u0305\3\2\2\2\u0307\u0089\3\2\2\2O" +
+                    "\u008b\u0090\u0098\u009f\u00a5\u00ae\u00b4\u00b9\u00bf\u00c9\u00d9\u00e6" +
+                    "\u00ea\u00f1\u00fc\u0102\u0111\u0124\u0128\u012c\u0136\u013a\u0145\u0152" +
+                    "\u0158\u015f\u0166\u016d\u017f\u0183\u0185\u018c\u0192\u0197\u01a2\u01a5" +
+                    "\u01b4\u01b7\u01bd\u01ca\u01d0\u01d6\u01dd\u01e9\u01ee\u01f3\u01f8\u01fe" +
+                    "\u0203\u0209\u020d\u0212\u021b\u0220\u0226\u0229\u022c\u0237\u023a\u023d" +
+                    "\u024c\u0251\u0259\u025e\u0261\u026d\u0274\u0292\u02d7\u02d9\u02df\u02e2" +
+                    "\u02e9\u02f3\u02f9\u02fe\u0306";
+    public static final ATN _ATN =
+            new ATNDeserializer().deserialize(_serializedATN.toCharArray());
+    protected static final DFA[] _decisionToDFA;
+    protected static final PredictionContextCache _sharedContextCache =
+            new PredictionContextCache();
+    private static final String[] _LITERAL_NAMES = makeLiteralNames();
+    private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
+    public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
+
+    static {
+        RuntimeMetaData.checkVersion("4.9.1", RuntimeMetaData.VERSION);
+    }
+
+    static {
+        tokenNames = new String[_SYMBOLIC_NAMES.length];
+        for (int i = 0; i < tokenNames.length; i++) {
+            tokenNames[i] = VOCABULARY.getLiteralName(i);
+            if (tokenNames[i] == null) {
+                tokenNames[i] = VOCABULARY.getSymbolicName(i);
+            }
+
+            if (tokenNames[i] == null) {
+                tokenNames[i] = "<INVALID>";
+            }
+        }
+    }
+
+    static {
+        _decisionToDFA = new DFA[_ATN.getNumberOfDecisions()];
+        for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) {
+            _decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
+        }
+    }
+
+    public YJSParser(TokenStream input) {
+        super(input);
+        _interp = new ParserATNSimulator(this, _ATN, _decisionToDFA, _sharedContextCache);
+    }
+
+    private static String[] makeRuleNames() {
+        return new String[]{
+                "program", "contractDeclar", "annotations", "annotation", "annotationArgs",
+                "annotationLiteral", "clzOrFunctionDeclaration", "eventSemantics", "eventDeclaration",
+                "sourceElement", "importStmts", "importStmt", "exportStmt", "versionName",
+                "statement", "block", "statementList", "variableStatement", "variableDeclarationList",
+                "variableDeclaration", "emptyStatement", "expressionStatement", "ifStatement",
+                "iterationStatement", "varModifier", "continueStatement", "breakStatement",
+                "returnStatement", "withStatement", "switchStatement", "caseBlock", "caseClauses",
+                "caseClause", "defaultClause", "throwStatement", "tryStatement", "catchProduction",
+                "finallyProduction", "debuggerStatement", "functionDeclaration", "classDeclaration",
+                "classTail", "classElement", "methodDefinition", "formalParameterList",
+                "formalParameterArg", "lastFormalParameterArg", "functionBody", "sourceElements",
+                "arrayLiteral", "elementList", "lastElement", "objectLiteral", "propertyAssignment",
+                "propertyName", "arguments", "lastArgument", "expressionSequence", "singleExpression",
+                "arrowFunctionParameters", "arrowFunctionBody", "assignmentOperator",
+                "literal", "numericLiteral", "identifierName", "reservedWord", "keyword",
+                "eos"
+        };
+    }
+
+    private static String[] makeLiteralNames() {
+        return new String[]{
+                null, null, null, null, "'['", "']'", "'('", "')'", "'{'", "'}'", "';'",
+                "','", "'='", "'?'", "':'", "'...'", "'.'", "'++'", "'--'", "'+'", "'-'",
+                "'~'", "'!'", "'*'", "'/'", "'%'", "'>>'", "'<<'", "'>>>'", "'<'", "'>'",
+                "'<='", "'>='", "'=='", "'!='", "'==='", "'!=='", "'&'", "'^'", "'|'",
+                "'&&'", "'||'", "'*='", "'/='", "'%='", "'+='", "'-='", "'<<='", "'>>='",
+                "'>>>='", "'&='", "'^='", "'|='", "'=>'", "'null'", null, null, null,
+                null, null, null, "'break'", "'do'", "'instanceof'", "'typeof'", "'case'",
+                "'else'", "'new'", "'var'", "'catch'", "'finally'", "'return'", "'void'",
+                "'continue'", "'for'", "'switch'", "'while'", "'debugger'", "'function'",
+                "'this'", "'with'", "'default'", "'if'", "'throw'", "'delete'", "'in'",
+                "'try'", "'event'", "'@'", "'AT_LEAST_ONCE'", "'AT_MOST_ONCE'", "'ONLY_ONCE'",
+                "'class'", "'enum'", "'extends'", "'super'", "'const'", "'export'", "'import'",
+                "'contract'", "'module'", "'oracle'", "'implements'", "'let'", "'private'",
+                "'public'", "'interface'", "'package'", "'protected'", "'static'", "'yield'"
+        };
+    }
+
+    private static String[] makeSymbolicNames() {
+        return new String[]{
+                null, "MultiLineComment", "SingleLineComment", "RegularExpressionLiteral",
+                "OpenBracket", "CloseBracket", "OpenParen", "CloseParen", "OpenBrace",
+                "CloseBrace", "SemiColon", "Comma", "Assign", "QuestionMark", "Colon",
+                "Ellipsis", "Dot", "PlusPlus", "MinusMinus", "Plus", "Minus", "BitNot",
+                "Not", "Multiply", "Divide", "Modulus", "RightShiftArithmetic", "LeftShiftArithmetic",
+                "RightShiftLogical", "LessThan", "MoreThan", "LessThanEquals", "GreaterThanEquals",
+                "Equals_", "NotEquals", "IdentityEquals", "IdentityNotEquals", "BitAnd",
+                "BitXOr", "BitOr", "And", "Or", "MultiplyAssign", "DivideAssign", "ModulusAssign",
+                "PlusAssign", "MinusAssign", "LeftShiftArithmeticAssign", "RightShiftArithmeticAssign",
+                "RightShiftLogicalAssign", "BitAndAssign", "BitXorAssign", "BitOrAssign",
+                "ARROW", "NullLiteral", "BooleanLiteral", "DecimalLiteral", "HexIntegerLiteral",
+                "OctalIntegerLiteral", "OctalIntegerLiteral2", "BinaryIntegerLiteral",
+                "Break", "Do", "Instanceof", "Typeof", "Case", "Else", "New", "Var",
+                "Catch", "Finally", "Return", "Void", "Continue", "For", "Switch", "While",
+                "Debugger", "Function", "This", "With", "Default", "If", "Throw", "Delete",
+                "In", "Try", "Event", "AtToken", "AtLeastOnce", "AtMostOnce", "OnlyOnce",
+                "Class", "Enum", "Extends", "Super", "Const", "Export", "Import", "Contract",
+                "Module", "Oracle", "Implements", "Let", "Private", "Public", "Interface",
+                "Package", "Protected", "Static", "Yield", "Identifier", "StringLiteral",
+                "TemplateStringLiteral", "WhiteSpaces", "LineTerminator", "HtmlComment",
+                "CDataComment", "UnexpectedCharacter"
+        };
+    }
+
+    @Override
+    @Deprecated
+    public String[] getTokenNames() {
+        return tokenNames;
+    }
+
+    @Override
+
+    public Vocabulary getVocabulary() {
+        return VOCABULARY;
+    }
+
+    @Override
+    public String getGrammarFileName() {
+        return "YJSParser.g4";
+    }
+
+    @Override
+    public String[] getRuleNames() {
+        return ruleNames;
+    }
+
+    @Override
+    public String getSerializedATN() {
+        return _serializedATN;
+    }
+
+    @Override
+    public ATN getATN() {
+        return _ATN;
+    }
+
+    public final ProgramContext program() throws RecognitionException {
+        ProgramContext _localctx = new ProgramContext(_ctx, getState());
+        enterRule(_localctx, 0, RULE_program);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(137);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if (_la == Import) {
+                    {
+                        setState(136);
+                        importStmts();
+                    }
+                }
+
+                setState(139);
+                contractDeclar();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final ContractDeclarContext contractDeclar() throws RecognitionException {
+        ContractDeclarContext _localctx = new ContractDeclarContext(_ctx, getState());
+        enterRule(_localctx, 2, RULE_contractDeclar);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(142);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if (_la == AtToken) {
+                    {
+                        setState(141);
+                        annotations();
+                    }
+                }
+
+                setState(144);
+                _la = _input.LA(1);
+                if (!(((((_la - 99)) & ~0x3f) == 0 && ((1L << (_la - 99)) & ((1L << (Contract - 99)) | (1L << (Module - 99)) | (1L << (Oracle - 99)))) != 0))) {
+                    _errHandler.recoverInline(this);
+                } else {
+                    if (_input.LA(1) == Token.EOF) matchedEOF = true;
+                    _errHandler.reportMatch(this);
+                    consume();
+                }
+                setState(145);
+                match(Identifier);
+                setState(146);
+                match(OpenBrace);
+                setState(148);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                do {
+                    {
+                        {
+                            setState(147);
+                            clzOrFunctionDeclaration();
+                        }
+                    }
+                    setState(150);
+                    _errHandler.sync(this);
+                    _la = _input.LA(1);
+                } while (((((_la - 78)) & ~0x3f) == 0 && ((1L << (_la - 78)) & ((1L << (Function - 78)) | (1L << (Event - 78)) | (1L << (AtToken - 78)) | (1L << (Class - 78)) | (1L << (Export - 78)))) != 0));
+                setState(152);
+                match(CloseBrace);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final AnnotationsContext annotations() throws RecognitionException {
+        AnnotationsContext _localctx = new AnnotationsContext(_ctx, getState());
+        enterRule(_localctx, 4, RULE_annotations);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(155);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                do {
+                    {
+                        {
+                            setState(154);
+                            annotation();
+                        }
+                    }
+                    setState(157);
+                    _errHandler.sync(this);
+                    _la = _input.LA(1);
+                } while (_la == AtToken);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final AnnotationContext annotation() throws RecognitionException {
+        AnnotationContext _localctx = new AnnotationContext(_ctx, getState());
+        enterRule(_localctx, 6, RULE_annotation);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(159);
+                match(AtToken);
+                setState(160);
+                match(Identifier);
+                setState(161);
+                match(OpenParen);
+                setState(163);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << OpenBrace) | (1L << DecimalLiteral) | (1L << HexIntegerLiteral) | (1L << OctalIntegerLiteral) | (1L << OctalIntegerLiteral2) | (1L << BinaryIntegerLiteral))) != 0) || _la == StringLiteral) {
+                    {
+                        setState(162);
+                        annotationArgs();
+                    }
+                }
+
+                setState(165);
+                match(CloseParen);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final AnnotationArgsContext annotationArgs() throws RecognitionException {
+        AnnotationArgsContext _localctx = new AnnotationArgsContext(_ctx, getState());
+        enterRule(_localctx, 8, RULE_annotationArgs);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(167);
+                annotationLiteral();
+                setState(172);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                while (_la == Comma) {
+                    {
+                        {
+                            setState(168);
+                            match(Comma);
+                            setState(169);
+                            annotationLiteral();
+                        }
+                    }
+                    setState(174);
+                    _errHandler.sync(this);
+                    _la = _input.LA(1);
+                }
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final AnnotationLiteralContext annotationLiteral() throws RecognitionException {
+        AnnotationLiteralContext _localctx = new AnnotationLiteralContext(_ctx, getState());
+        enterRule(_localctx, 10, RULE_annotationLiteral);
+        try {
+            setState(178);
+            _errHandler.sync(this);
+            switch (_input.LA(1)) {
+                case DecimalLiteral:
+                case HexIntegerLiteral:
+                case OctalIntegerLiteral:
+                case OctalIntegerLiteral2:
+                case BinaryIntegerLiteral:
+                    enterOuterAlt(_localctx, 1);
+                {
+                    setState(175);
+                    numericLiteral();
+                }
+                break;
+                case StringLiteral:
+                    enterOuterAlt(_localctx, 2);
+                {
+                    setState(176);
+                    match(StringLiteral);
+                }
+                break;
+                case OpenBrace:
+                    enterOuterAlt(_localctx, 3);
+                {
+                    setState(177);
+                    objectLiteral();
+                }
+                break;
+                default:
+                    throw new NoViableAltException(this);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final ClzOrFunctionDeclarationContext clzOrFunctionDeclaration() throws RecognitionException {
+        ClzOrFunctionDeclarationContext _localctx = new ClzOrFunctionDeclarationContext(_ctx, getState());
+        enterRule(_localctx, 12, RULE_clzOrFunctionDeclaration);
+        try {
+            setState(183);
+            _errHandler.sync(this);
+            switch (_input.LA(1)) {
+                case Class:
+                    enterOuterAlt(_localctx, 1);
+                {
+                    setState(180);
+                    classDeclaration();
+                }
+                break;
+                case Function:
+                case AtToken:
+                case Export:
+                    enterOuterAlt(_localctx, 2);
+                {
+                    setState(181);
+                    functionDeclaration();
+                }
+                break;
+                case Event:
+                    enterOuterAlt(_localctx, 3);
+                {
+                    setState(182);
+                    eventDeclaration();
+                }
+                break;
+                default:
+                    throw new NoViableAltException(this);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final EventSemanticsContext eventSemantics() throws RecognitionException {
+        EventSemanticsContext _localctx = new EventSemanticsContext(_ctx, getState());
+        enterRule(_localctx, 14, RULE_eventSemantics);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(185);
+                _la = _input.LA(1);
+                if (!(((((_la - 89)) & ~0x3f) == 0 && ((1L << (_la - 89)) & ((1L << (AtLeastOnce - 89)) | (1L << (AtMostOnce - 89)) | (1L << (OnlyOnce - 89)))) != 0))) {
+                    _errHandler.recoverInline(this);
+                } else {
+                    if (_input.LA(1) == Token.EOF) matchedEOF = true;
+                    _errHandler.reportMatch(this);
+                    consume();
+                }
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final EventDeclarationContext eventDeclaration() throws RecognitionException {
+        EventDeclarationContext _localctx = new EventDeclarationContext(_ctx, getState());
+        enterRule(_localctx, 16, RULE_eventDeclaration);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(187);
+                match(Event);
+                setState(189);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if (((((_la - 89)) & ~0x3f) == 0 && ((1L << (_la - 89)) & ((1L << (AtLeastOnce - 89)) | (1L << (AtMostOnce - 89)) | (1L << (OnlyOnce - 89)))) != 0)) {
+                    {
+                        setState(188);
+                        eventSemantics();
+                    }
+                }
+
+                setState(191);
+                match(Identifier);
+                setState(192);
+                match(SemiColon);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final SourceElementContext sourceElement() throws RecognitionException {
+        SourceElementContext _localctx = new SourceElementContext(_ctx, getState());
+        enterRule(_localctx, 18, RULE_sourceElement);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(194);
+                statement();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final ImportStmtsContext importStmts() throws RecognitionException {
+        ImportStmtsContext _localctx = new ImportStmtsContext(_ctx, getState());
+        enterRule(_localctx, 20, RULE_importStmts);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(197);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                do {
+                    {
+                        {
+                            setState(196);
+                            importStmt();
+                        }
+                    }
+                    setState(199);
+                    _errHandler.sync(this);
+                    _la = _input.LA(1);
+                } while (_la == Import);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final ImportStmtContext importStmt() throws RecognitionException {
+        ImportStmtContext _localctx = new ImportStmtContext(_ctx, getState());
+        enterRule(_localctx, 22, RULE_importStmt);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(201);
+                match(Import);
+                setState(202);
+                match(StringLiteral);
+                setState(203);
+                match(SemiColon);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final ExportStmtContext exportStmt() throws RecognitionException {
+        ExportStmtContext _localctx = new ExportStmtContext(_ctx, getState());
+        enterRule(_localctx, 24, RULE_exportStmt);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(205);
+                match(Export);
+                setState(206);
+                match(Identifier);
+                setState(207);
+                versionName();
+                setState(208);
+                match(SemiColon);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final VersionNameContext versionName() throws RecognitionException {
+        VersionNameContext _localctx = new VersionNameContext(_ctx, getState());
+        enterRule(_localctx, 26, RULE_versionName);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(210);
+                match(DecimalLiteral);
+                setState(215);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                while (_la == Dot) {
+                    {
+                        {
+                            setState(211);
+                            match(Dot);
+                            setState(212);
+                            match(DecimalLiteral);
+                        }
+                    }
+                    setState(217);
+                    _errHandler.sync(this);
+                    _la = _input.LA(1);
+                }
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final StatementContext statement() throws RecognitionException {
+        StatementContext _localctx = new StatementContext(_ctx, getState());
+        enterRule(_localctx, 28, RULE_statement);
+        try {
+            setState(228);
+            _errHandler.sync(this);
+            switch (getInterpreter().adaptivePredict(_input, 11, _ctx)) {
+                case 1:
+                    enterOuterAlt(_localctx, 1);
+                {
+                    setState(218);
+                    block();
+                }
+                break;
+                case 2:
+                    enterOuterAlt(_localctx, 2);
+                {
+                    setState(219);
+                    variableStatement();
+                }
+                break;
+                case 3:
+                    enterOuterAlt(_localctx, 3);
+                {
+                    setState(220);
+                    emptyStatement();
+                }
+                break;
+                case 4:
+                    enterOuterAlt(_localctx, 4);
+                {
+                    setState(221);
+                    expressionStatement();
+                }
+                break;
+                case 5:
+                    enterOuterAlt(_localctx, 5);
+                {
+                    setState(222);
+                    ifStatement();
+                }
+                break;
+                case 6:
+                    enterOuterAlt(_localctx, 6);
+                {
+                    setState(223);
+                    iterationStatement();
+                }
+                break;
+                case 7:
+                    enterOuterAlt(_localctx, 7);
+                {
+                    setState(224);
+                    continueStatement();
+                }
+                break;
+                case 8:
+                    enterOuterAlt(_localctx, 8);
+                {
+                    setState(225);
+                    breakStatement();
+                }
+                break;
+                case 9:
+                    enterOuterAlt(_localctx, 9);
+                {
+                    setState(226);
+                    returnStatement();
+                }
+                break;
+                case 10:
+                    enterOuterAlt(_localctx, 10);
+                {
+                    setState(227);
+                    switchStatement();
+                }
+                break;
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final BlockContext block() throws RecognitionException {
+        BlockContext _localctx = new BlockContext(_ctx, getState());
+        enterRule(_localctx, 30, RULE_block);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(230);
+                match(OpenBrace);
+                setState(232);
+                _errHandler.sync(this);
+                switch (getInterpreter().adaptivePredict(_input, 12, _ctx)) {
+                    case 1: {
+                        setState(231);
+                        statementList();
+                    }
+                    break;
+                }
+                setState(234);
+                match(CloseBrace);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final StatementListContext statementList() throws RecognitionException {
+        StatementListContext _localctx = new StatementListContext(_ctx, getState());
+        enterRule(_localctx, 32, RULE_statementList);
+        try {
+            int _alt;
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(237);
+                _errHandler.sync(this);
+                _alt = 1;
+                do {
+                    switch (_alt) {
+                        case 1: {
+                            {
+                                setState(236);
+                                statement();
+                            }
+                        }
+                        break;
+                        default:
+                            throw new NoViableAltException(this);
+                    }
+                    setState(239);
+                    _errHandler.sync(this);
+                    _alt = getInterpreter().adaptivePredict(_input, 13, _ctx);
+                } while (_alt != 2 && _alt != ATN.INVALID_ALT_NUMBER);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final VariableStatementContext variableStatement() throws RecognitionException {
+        VariableStatementContext _localctx = new VariableStatementContext(_ctx, getState());
+        enterRule(_localctx, 34, RULE_variableStatement);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(241);
+                varModifier();
+                setState(242);
+                variableDeclarationList();
+                setState(243);
+                eos();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final VariableDeclarationListContext variableDeclarationList() throws RecognitionException {
+        VariableDeclarationListContext _localctx = new VariableDeclarationListContext(_ctx, getState());
+        enterRule(_localctx, 36, RULE_variableDeclarationList);
+        try {
+            int _alt;
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(245);
+                variableDeclaration();
+                setState(250);
+                _errHandler.sync(this);
+                _alt = getInterpreter().adaptivePredict(_input, 14, _ctx);
+                while (_alt != 2 && _alt != ATN.INVALID_ALT_NUMBER) {
+                    if (_alt == 1) {
+                        {
+                            {
+                                setState(246);
+                                match(Comma);
+                                setState(247);
+                                variableDeclaration();
+                            }
+                        }
+                    }
+                    setState(252);
+                    _errHandler.sync(this);
+                    _alt = getInterpreter().adaptivePredict(_input, 14, _ctx);
+                }
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final VariableDeclarationContext variableDeclaration() throws RecognitionException {
+        VariableDeclarationContext _localctx = new VariableDeclarationContext(_ctx, getState());
+        enterRule(_localctx, 38, RULE_variableDeclaration);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                {
+                    setState(253);
+                    match(Identifier);
+                }
+                setState(256);
+                _errHandler.sync(this);
+                switch (getInterpreter().adaptivePredict(_input, 15, _ctx)) {
+                    case 1: {
+                        setState(254);
+                        match(Assign);
+                        setState(255);
+                        singleExpression(0);
+                    }
+                    break;
+                }
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final EmptyStatementContext emptyStatement() throws RecognitionException {
+        EmptyStatementContext _localctx = new EmptyStatementContext(_ctx, getState());
+        enterRule(_localctx, 40, RULE_emptyStatement);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(258);
+                match(SemiColon);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final ExpressionStatementContext expressionStatement() throws RecognitionException {
+        ExpressionStatementContext _localctx = new ExpressionStatementContext(_ctx, getState());
+        enterRule(_localctx, 42, RULE_expressionStatement);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(260);
+                if (!(notOpenBraceAndNotFunction()))
+                    throw new FailedPredicateException(this, "notOpenBraceAndNotFunction()");
+                setState(261);
+                expressionSequence();
+                setState(262);
+                eos();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final IfStatementContext ifStatement() throws RecognitionException {
+        IfStatementContext _localctx = new IfStatementContext(_ctx, getState());
+        enterRule(_localctx, 44, RULE_ifStatement);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(264);
+                match(If);
+                setState(265);
+                match(OpenParen);
+                setState(266);
+                expressionSequence();
+                setState(267);
+                match(CloseParen);
+                setState(268);
+                statement();
+                setState(271);
+                _errHandler.sync(this);
+                switch (getInterpreter().adaptivePredict(_input, 16, _ctx)) {
+                    case 1: {
+                        setState(269);
+                        match(Else);
+                        setState(270);
+                        statement();
+                    }
+                    break;
+                }
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final IterationStatementContext iterationStatement() throws RecognitionException {
+        IterationStatementContext _localctx = new IterationStatementContext(_ctx, getState());
+        enterRule(_localctx, 46, RULE_iterationStatement);
+        int _la;
+        try {
+            setState(342);
+            _errHandler.sync(this);
+            switch (getInterpreter().adaptivePredict(_input, 24, _ctx)) {
+                case 1:
+                    _localctx = new DoStatementContext(_localctx);
+                    enterOuterAlt(_localctx, 1);
+                {
+                    setState(273);
+                    match(Do);
+                    setState(274);
+                    statement();
+                    setState(275);
+                    match(While);
+                    setState(276);
+                    match(OpenParen);
+                    setState(277);
+                    expressionSequence();
+                    setState(278);
+                    match(CloseParen);
+                    setState(279);
+                    eos();
+                }
+                break;
+                case 2:
+                    _localctx = new WhileStatementContext(_localctx);
+                    enterOuterAlt(_localctx, 2);
+                {
+                    setState(281);
+                    match(While);
+                    setState(282);
+                    match(OpenParen);
+                    setState(283);
+                    expressionSequence();
+                    setState(284);
+                    match(CloseParen);
+                    setState(285);
+                    statement();
+                }
+                break;
+                case 3:
+                    _localctx = new ForStatementContext(_localctx);
+                    enterOuterAlt(_localctx, 3);
+                {
+                    setState(287);
+                    match(For);
+                    setState(288);
+                    match(OpenParen);
+                    setState(290);
+                    _errHandler.sync(this);
+                    _la = _input.LA(1);
+                    if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << RegularExpressionLiteral) | (1L << OpenBracket) | (1L << OpenParen) | (1L << OpenBrace) | (1L << PlusPlus) | (1L << MinusMinus) | (1L << Plus) | (1L << Minus) | (1L << BitNot) | (1L << Not) | (1L << NullLiteral) | (1L << BooleanLiteral) | (1L << DecimalLiteral) | (1L << HexIntegerLiteral) | (1L << OctalIntegerLiteral) | (1L << OctalIntegerLiteral2) | (1L << BinaryIntegerLiteral))) != 0) || ((((_la - 64)) & ~0x3f) == 0 && ((1L << (_la - 64)) & ((1L << (Typeof - 64)) | (1L << (New - 64)) | (1L << (This - 64)) | (1L << (Super - 64)) | (1L << (Identifier - 64)) | (1L << (StringLiteral - 64)) | (1L << (TemplateStringLiteral - 64)))) != 0)) {
+                        {
+                            setState(289);
+                            expressionSequence();
+                        }
+                    }
+
+                    setState(292);
+                    match(SemiColon);
+                    setState(294);
+                    _errHandler.sync(this);
+                    _la = _input.LA(1);
+                    if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << RegularExpressionLiteral) | (1L << OpenBracket) | (1L << OpenParen) | (1L << OpenBrace) | (1L << PlusPlus) | (1L << MinusMinus) | (1L << Plus) | (1L << Minus) | (1L << BitNot) | (1L << Not) | (1L << NullLiteral) | (1L << BooleanLiteral) | (1L << DecimalLiteral) | (1L << HexIntegerLiteral) | (1L << OctalIntegerLiteral) | (1L << OctalIntegerLiteral2) | (1L << BinaryIntegerLiteral))) != 0) || ((((_la - 64)) & ~0x3f) == 0 && ((1L << (_la - 64)) & ((1L << (Typeof - 64)) | (1L << (New - 64)) | (1L << (This - 64)) | (1L << (Super - 64)) | (1L << (Identifier - 64)) | (1L << (StringLiteral - 64)) | (1L << (TemplateStringLiteral - 64)))) != 0)) {
+                        {
+                            setState(293);
+                            expressionSequence();
+                        }
+                    }
+
+                    setState(296);
+                    match(SemiColon);
+                    setState(298);
+                    _errHandler.sync(this);
+                    _la = _input.LA(1);
+                    if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << RegularExpressionLiteral) | (1L << OpenBracket) | (1L << OpenParen) | (1L << OpenBrace) | (1L << PlusPlus) | (1L << MinusMinus) | (1L << Plus) | (1L << Minus) | (1L << BitNot) | (1L << Not) | (1L << NullLiteral) | (1L << BooleanLiteral) | (1L << DecimalLiteral) | (1L << HexIntegerLiteral) | (1L << OctalIntegerLiteral) | (1L << OctalIntegerLiteral2) | (1L << BinaryIntegerLiteral))) != 0) || ((((_la - 64)) & ~0x3f) == 0 && ((1L << (_la - 64)) & ((1L << (Typeof - 64)) | (1L << (New - 64)) | (1L << (This - 64)) | (1L << (Super - 64)) | (1L << (Identifier - 64)) | (1L << (StringLiteral - 64)) | (1L << (TemplateStringLiteral - 64)))) != 0)) {
+                        {
+                            setState(297);
+                            expressionSequence();
+                        }
+                    }
+
+                    setState(300);
+                    match(CloseParen);
+                    setState(301);
+                    statement();
+                }
+                break;
+                case 4:
+                    _localctx = new ForVarStatementContext(_localctx);
+                    enterOuterAlt(_localctx, 4);
+                {
+                    setState(302);
+                    match(For);
+                    setState(303);
+                    match(OpenParen);
+                    setState(304);
+                    varModifier();
+                    setState(305);
+                    variableDeclarationList();
+                    setState(306);
+                    match(SemiColon);
+                    setState(308);
+                    _errHandler.sync(this);
+                    _la = _input.LA(1);
+                    if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << RegularExpressionLiteral) | (1L << OpenBracket) | (1L << OpenParen) | (1L << OpenBrace) | (1L << PlusPlus) | (1L << MinusMinus) | (1L << Plus) | (1L << Minus) | (1L << BitNot) | (1L << Not) | (1L << NullLiteral) | (1L << BooleanLiteral) | (1L << DecimalLiteral) | (1L << HexIntegerLiteral) | (1L << OctalIntegerLiteral) | (1L << OctalIntegerLiteral2) | (1L << BinaryIntegerLiteral))) != 0) || ((((_la - 64)) & ~0x3f) == 0 && ((1L << (_la - 64)) & ((1L << (Typeof - 64)) | (1L << (New - 64)) | (1L << (This - 64)) | (1L << (Super - 64)) | (1L << (Identifier - 64)) | (1L << (StringLiteral - 64)) | (1L << (TemplateStringLiteral - 64)))) != 0)) {
+                        {
+                            setState(307);
+                            expressionSequence();
+                        }
+                    }
+
+                    setState(310);
+                    match(SemiColon);
+                    setState(312);
+                    _errHandler.sync(this);
+                    _la = _input.LA(1);
+                    if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << RegularExpressionLiteral) | (1L << OpenBracket) | (1L << OpenParen) | (1L << OpenBrace) | (1L << PlusPlus) | (1L << MinusMinus) | (1L << Plus) | (1L << Minus) | (1L << BitNot) | (1L << Not) | (1L << NullLiteral) | (1L << BooleanLiteral) | (1L << DecimalLiteral) | (1L << HexIntegerLiteral) | (1L << OctalIntegerLiteral) | (1L << OctalIntegerLiteral2) | (1L << BinaryIntegerLiteral))) != 0) || ((((_la - 64)) & ~0x3f) == 0 && ((1L << (_la - 64)) & ((1L << (Typeof - 64)) | (1L << (New - 64)) | (1L << (This - 64)) | (1L << (Super - 64)) | (1L << (Identifier - 64)) | (1L << (StringLiteral - 64)) | (1L << (TemplateStringLiteral - 64)))) != 0)) {
+                        {
+                            setState(311);
+                            expressionSequence();
+                        }
+                    }
+
+                    setState(314);
+                    match(CloseParen);
+                    setState(315);
+                    statement();
+                }
+                break;
+                case 5:
+                    _localctx = new ForInStatementContext(_localctx);
+                    enterOuterAlt(_localctx, 5);
+                {
+                    setState(317);
+                    match(For);
+                    setState(318);
+                    match(OpenParen);
+                    setState(319);
+                    singleExpression(0);
+                    setState(323);
+                    _errHandler.sync(this);
+                    switch (_input.LA(1)) {
+                        case In: {
+                            setState(320);
+                            match(In);
+                        }
+                        break;
+                        case Identifier: {
+                            setState(321);
+                            match(Identifier);
+                            setState(322);
+                            if (!(p("of"))) throw new FailedPredicateException(this, "p(\"of\")");
+                        }
+                        break;
+                        default:
+                            throw new NoViableAltException(this);
+                    }
+                    setState(325);
+                    expressionSequence();
+                    setState(326);
+                    match(CloseParen);
+                    setState(327);
+                    statement();
+                }
+                break;
+                case 6:
+                    _localctx = new ForVarInStatementContext(_localctx);
+                    enterOuterAlt(_localctx, 6);
+                {
+                    setState(329);
+                    match(For);
+                    setState(330);
+                    match(OpenParen);
+                    setState(331);
+                    varModifier();
+                    setState(332);
+                    variableDeclaration();
+                    setState(336);
+                    _errHandler.sync(this);
+                    switch (_input.LA(1)) {
+                        case In: {
+                            setState(333);
+                            match(In);
+                        }
+                        break;
+                        case Identifier: {
+                            setState(334);
+                            match(Identifier);
+                            setState(335);
+                            if (!(p("of"))) throw new FailedPredicateException(this, "p(\"of\")");
+                        }
+                        break;
+                        default:
+                            throw new NoViableAltException(this);
+                    }
+                    setState(338);
+                    expressionSequence();
+                    setState(339);
+                    match(CloseParen);
+                    setState(340);
+                    statement();
+                }
+                break;
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final VarModifierContext varModifier() throws RecognitionException {
+        VarModifierContext _localctx = new VarModifierContext(_ctx, getState());
+        enterRule(_localctx, 48, RULE_varModifier);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(344);
+                match(Var);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final ContinueStatementContext continueStatement() throws RecognitionException {
+        ContinueStatementContext _localctx = new ContinueStatementContext(_ctx, getState());
+        enterRule(_localctx, 50, RULE_continueStatement);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(346);
+                match(Continue);
+                setState(349);
+                _errHandler.sync(this);
+                switch (getInterpreter().adaptivePredict(_input, 25, _ctx)) {
+                    case 1: {
+                        setState(347);
+                        if (!(notLineTerminator())) throw new FailedPredicateException(this, "notLineTerminator()");
+                        setState(348);
+                        match(Identifier);
+                    }
+                    break;
+                }
+                setState(351);
+                eos();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final BreakStatementContext breakStatement() throws RecognitionException {
+        BreakStatementContext _localctx = new BreakStatementContext(_ctx, getState());
+        enterRule(_localctx, 52, RULE_breakStatement);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(353);
+                match(Break);
+                setState(356);
+                _errHandler.sync(this);
+                switch (getInterpreter().adaptivePredict(_input, 26, _ctx)) {
+                    case 1: {
+                        setState(354);
+                        if (!(notLineTerminator())) throw new FailedPredicateException(this, "notLineTerminator()");
+                        setState(355);
+                        match(Identifier);
+                    }
+                    break;
+                }
+                setState(358);
+                eos();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final ReturnStatementContext returnStatement() throws RecognitionException {
+        ReturnStatementContext _localctx = new ReturnStatementContext(_ctx, getState());
+        enterRule(_localctx, 54, RULE_returnStatement);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(360);
+                match(Return);
+                setState(363);
+                _errHandler.sync(this);
+                switch (getInterpreter().adaptivePredict(_input, 27, _ctx)) {
+                    case 1: {
+                        setState(361);
+                        if (!(notLineTerminator())) throw new FailedPredicateException(this, "notLineTerminator()");
+                        setState(362);
+                        expressionSequence();
+                    }
+                    break;
+                }
+                setState(365);
+                eos();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final WithStatementContext withStatement() throws RecognitionException {
+        WithStatementContext _localctx = new WithStatementContext(_ctx, getState());
+        enterRule(_localctx, 56, RULE_withStatement);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(367);
+                match(With);
+                setState(368);
+                match(OpenParen);
+                setState(369);
+                expressionSequence();
+                setState(370);
+                match(CloseParen);
+                setState(371);
+                statement();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final SwitchStatementContext switchStatement() throws RecognitionException {
+        SwitchStatementContext _localctx = new SwitchStatementContext(_ctx, getState());
+        enterRule(_localctx, 58, RULE_switchStatement);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(373);
+                match(Switch);
+                setState(374);
+                match(OpenParen);
+                setState(375);
+                expressionSequence();
+                setState(376);
+                match(CloseParen);
+                setState(377);
+                caseBlock();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final CaseBlockContext caseBlock() throws RecognitionException {
+        CaseBlockContext _localctx = new CaseBlockContext(_ctx, getState());
+        enterRule(_localctx, 60, RULE_caseBlock);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(379);
+                match(OpenBrace);
+                setState(381);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if (_la == Case) {
+                    {
+                        setState(380);
+                        caseClauses();
+                    }
+                }
+
+                setState(387);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if (_la == Default) {
+                    {
+                        setState(383);
+                        defaultClause();
+                        setState(385);
+                        _errHandler.sync(this);
+                        _la = _input.LA(1);
+                        if (_la == Case) {
+                            {
+                                setState(384);
+                                caseClauses();
+                            }
+                        }
+
+                    }
+                }
+
+                setState(389);
+                match(CloseBrace);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final CaseClausesContext caseClauses() throws RecognitionException {
+        CaseClausesContext _localctx = new CaseClausesContext(_ctx, getState());
+        enterRule(_localctx, 62, RULE_caseClauses);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(392);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                do {
+                    {
+                        {
+                            setState(391);
+                            caseClause();
+                        }
+                    }
+                    setState(394);
+                    _errHandler.sync(this);
+                    _la = _input.LA(1);
+                } while (_la == Case);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final CaseClauseContext caseClause() throws RecognitionException {
+        CaseClauseContext _localctx = new CaseClauseContext(_ctx, getState());
+        enterRule(_localctx, 64, RULE_caseClause);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(396);
+                match(Case);
+                setState(397);
+                expressionSequence();
+                setState(398);
+                match(Colon);
+                setState(400);
+                _errHandler.sync(this);
+                switch (getInterpreter().adaptivePredict(_input, 32, _ctx)) {
+                    case 1: {
+                        setState(399);
+                        statementList();
+                    }
+                    break;
+                }
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final DefaultClauseContext defaultClause() throws RecognitionException {
+        DefaultClauseContext _localctx = new DefaultClauseContext(_ctx, getState());
+        enterRule(_localctx, 66, RULE_defaultClause);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(402);
+                match(Default);
+                setState(403);
+                match(Colon);
+                setState(405);
+                _errHandler.sync(this);
+                switch (getInterpreter().adaptivePredict(_input, 33, _ctx)) {
+                    case 1: {
+                        setState(404);
+                        statementList();
+                    }
+                    break;
+                }
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final ThrowStatementContext throwStatement() throws RecognitionException {
+        ThrowStatementContext _localctx = new ThrowStatementContext(_ctx, getState());
+        enterRule(_localctx, 68, RULE_throwStatement);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(407);
+                match(Throw);
+                setState(408);
+                if (!(notLineTerminator())) throw new FailedPredicateException(this, "notLineTerminator()");
+                setState(409);
+                expressionSequence();
+                setState(410);
+                eos();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final TryStatementContext tryStatement() throws RecognitionException {
+        TryStatementContext _localctx = new TryStatementContext(_ctx, getState());
+        enterRule(_localctx, 70, RULE_tryStatement);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(412);
+                match(Try);
+                setState(413);
+                block();
+                setState(419);
+                _errHandler.sync(this);
+                switch (_input.LA(1)) {
+                    case Catch: {
+                        setState(414);
+                        catchProduction();
+                        setState(416);
+                        _errHandler.sync(this);
+                        _la = _input.LA(1);
+                        if (_la == Finally) {
+                            {
+                                setState(415);
+                                finallyProduction();
+                            }
+                        }
+
+                    }
+                    break;
+                    case Finally: {
+                        setState(418);
+                        finallyProduction();
+                    }
+                    break;
+                    default:
+                        throw new NoViableAltException(this);
+                }
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final CatchProductionContext catchProduction() throws RecognitionException {
+        CatchProductionContext _localctx = new CatchProductionContext(_ctx, getState());
+        enterRule(_localctx, 72, RULE_catchProduction);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(421);
+                match(Catch);
+                setState(422);
+                match(OpenParen);
+                setState(423);
+                match(Identifier);
+                setState(424);
+                match(CloseParen);
+                setState(425);
+                block();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final FinallyProductionContext finallyProduction() throws RecognitionException {
+        FinallyProductionContext _localctx = new FinallyProductionContext(_ctx, getState());
+        enterRule(_localctx, 74, RULE_finallyProduction);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(427);
+                match(Finally);
+                setState(428);
+                block();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final DebuggerStatementContext debuggerStatement() throws RecognitionException {
+        DebuggerStatementContext _localctx = new DebuggerStatementContext(_ctx, getState());
+        enterRule(_localctx, 76, RULE_debuggerStatement);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(430);
+                match(Debugger);
+                setState(431);
+                eos();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final FunctionDeclarationContext functionDeclaration() throws RecognitionException {
+        FunctionDeclarationContext _localctx = new FunctionDeclarationContext(_ctx, getState());
+        enterRule(_localctx, 78, RULE_functionDeclaration);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(434);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if (_la == AtToken) {
+                    {
+                        setState(433);
+                        annotations();
+                    }
+                }
+
+                setState(437);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if (_la == Export) {
+                    {
+                        setState(436);
+                        match(Export);
+                    }
+                }
+
+                setState(439);
+                match(Function);
+                setState(440);
+                match(Identifier);
+                setState(441);
+                match(OpenParen);
+                setState(443);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << OpenBracket) | (1L << OpenBrace) | (1L << Ellipsis))) != 0) || _la == Identifier) {
+                    {
+                        setState(442);
+                        formalParameterList();
+                    }
+                }
+
+                setState(445);
+                match(CloseParen);
+                setState(446);
+                match(OpenBrace);
+                setState(447);
+                functionBody();
+                setState(448);
+                match(CloseBrace);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final ClassDeclarationContext classDeclaration() throws RecognitionException {
+        ClassDeclarationContext _localctx = new ClassDeclarationContext(_ctx, getState());
+        enterRule(_localctx, 80, RULE_classDeclaration);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(450);
+                match(Class);
+                setState(451);
+                match(Identifier);
+                setState(452);
+                classTail();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final ClassTailContext classTail() throws RecognitionException {
+        ClassTailContext _localctx = new ClassTailContext(_ctx, getState());
+        enterRule(_localctx, 82, RULE_classTail);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(456);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if (_la == Extends) {
+                    {
+                        setState(454);
+                        match(Extends);
+                        setState(455);
+                        singleExpression(0);
+                    }
+                }
+
+                setState(458);
+                match(OpenBrace);
+                setState(462);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                while (((((_la - 54)) & ~0x3f) == 0 && ((1L << (_la - 54)) & ((1L << (NullLiteral - 54)) | (1L << (BooleanLiteral - 54)) | (1L << (DecimalLiteral - 54)) | (1L << (HexIntegerLiteral - 54)) | (1L << (OctalIntegerLiteral - 54)) | (1L << (OctalIntegerLiteral2 - 54)) | (1L << (BinaryIntegerLiteral - 54)) | (1L << (Break - 54)) | (1L << (Do - 54)) | (1L << (Instanceof - 54)) | (1L << (Typeof - 54)) | (1L << (Case - 54)) | (1L << (Else - 54)) | (1L << (New - 54)) | (1L << (Var - 54)) | (1L << (Catch - 54)) | (1L << (Finally - 54)) | (1L << (Return - 54)) | (1L << (Void - 54)) | (1L << (Continue - 54)) | (1L << (For - 54)) | (1L << (Switch - 54)) | (1L << (While - 54)) | (1L << (Debugger - 54)) | (1L << (Function - 54)) | (1L << (This - 54)) | (1L << (With - 54)) | (1L << (Default - 54)) | (1L << (If - 54)) | (1L << (Throw - 54)) | (1L << (Delete - 54)) | (1L << (In - 54)) | (1L << (Try - 54)) | (1L << (Class - 54)) | (1L << (Enum - 54)) | (1L << (Extends - 54)) | (1L << (Super - 54)) | (1L << (Const - 54)) | (1L << (Export - 54)) | (1L << (Import - 54)) | (1L << (Implements - 54)) | (1L << (Let - 54)) | (1L << (Private - 54)) | (1L << (Public - 54)) | (1L << (Interface - 54)) | (1L << (Package - 54)) | (1L << (Protected - 54)) | (1L << (Static - 54)) | (1L << (Yield - 54)) | (1L << (Identifier - 54)) | (1L << (StringLiteral - 54)))) != 0)) {
+                    {
+                        {
+                            setState(459);
+                            classElement();
+                        }
+                    }
+                    setState(464);
+                    _errHandler.sync(this);
+                    _la = _input.LA(1);
+                }
+                setState(465);
+                match(CloseBrace);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final ClassElementContext classElement() throws RecognitionException {
+        ClassElementContext _localctx = new ClassElementContext(_ctx, getState());
+        enterRule(_localctx, 84, RULE_classElement);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(468);
+                _errHandler.sync(this);
+                switch (getInterpreter().adaptivePredict(_input, 41, _ctx)) {
+                    case 1: {
+                        setState(467);
+                        match(Static);
+                    }
+                    break;
+                }
+                setState(470);
+                methodDefinition();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final MethodDefinitionContext methodDefinition() throws RecognitionException {
+        MethodDefinitionContext _localctx = new MethodDefinitionContext(_ctx, getState());
+        enterRule(_localctx, 86, RULE_methodDefinition);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(472);
+                propertyName();
+                setState(473);
+                match(OpenParen);
+                setState(475);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << OpenBracket) | (1L << OpenBrace) | (1L << Ellipsis))) != 0) || _la == Identifier) {
+                    {
+                        setState(474);
+                        formalParameterList();
+                    }
+                }
+
+                setState(477);
+                match(CloseParen);
+                setState(478);
+                match(OpenBrace);
+                setState(479);
+                functionBody();
+                setState(480);
+                match(CloseBrace);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final FormalParameterListContext formalParameterList() throws RecognitionException {
+        FormalParameterListContext _localctx = new FormalParameterListContext(_ctx, getState());
+        enterRule(_localctx, 88, RULE_formalParameterList);
+        int _la;
+        try {
+            int _alt;
+            setState(497);
+            _errHandler.sync(this);
+            switch (_input.LA(1)) {
+                case Identifier:
+                    enterOuterAlt(_localctx, 1);
+                {
+                    setState(482);
+                    formalParameterArg();
+                    setState(487);
+                    _errHandler.sync(this);
+                    _alt = getInterpreter().adaptivePredict(_input, 43, _ctx);
+                    while (_alt != 2 && _alt != ATN.INVALID_ALT_NUMBER) {
+                        if (_alt == 1) {
+                            {
+                                {
+                                    setState(483);
+                                    match(Comma);
+                                    setState(484);
+                                    formalParameterArg();
+                                }
+                            }
+                        }
+                        setState(489);
+                        _errHandler.sync(this);
+                        _alt = getInterpreter().adaptivePredict(_input, 43, _ctx);
+                    }
+                    setState(492);
+                    _errHandler.sync(this);
+                    _la = _input.LA(1);
+                    if (_la == Comma) {
+                        {
+                            setState(490);
+                            match(Comma);
+                            setState(491);
+                            lastFormalParameterArg();
+                        }
+                    }
+
+                }
+                break;
+                case Ellipsis:
+                    enterOuterAlt(_localctx, 2);
+                {
+                    setState(494);
+                    lastFormalParameterArg();
+                }
+                break;
+                case OpenBracket:
+                    enterOuterAlt(_localctx, 3);
+                {
+                    setState(495);
+                    arrayLiteral();
+                }
+                break;
+                case OpenBrace:
+                    enterOuterAlt(_localctx, 4);
+                {
+                    setState(496);
+                    objectLiteral();
+                }
+                break;
+                default:
+                    throw new NoViableAltException(this);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final FormalParameterArgContext formalParameterArg() throws RecognitionException {
+        FormalParameterArgContext _localctx = new FormalParameterArgContext(_ctx, getState());
+        enterRule(_localctx, 90, RULE_formalParameterArg);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(499);
+                match(Identifier);
+                setState(502);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if (_la == Assign) {
+                    {
+                        setState(500);
+                        match(Assign);
+                        setState(501);
+                        singleExpression(0);
+                    }
+                }
+
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final LastFormalParameterArgContext lastFormalParameterArg() throws RecognitionException {
+        LastFormalParameterArgContext _localctx = new LastFormalParameterArgContext(_ctx, getState());
+        enterRule(_localctx, 92, RULE_lastFormalParameterArg);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(504);
+                match(Ellipsis);
+                setState(505);
+                match(Identifier);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final FunctionBodyContext functionBody() throws RecognitionException {
+        FunctionBodyContext _localctx = new FunctionBodyContext(_ctx, getState());
+        enterRule(_localctx, 94, RULE_functionBody);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(508);
+                _errHandler.sync(this);
+                switch (getInterpreter().adaptivePredict(_input, 47, _ctx)) {
+                    case 1: {
+                        setState(507);
+                        sourceElements();
+                    }
+                    break;
+                }
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final SourceElementsContext sourceElements() throws RecognitionException {
+        SourceElementsContext _localctx = new SourceElementsContext(_ctx, getState());
+        enterRule(_localctx, 96, RULE_sourceElements);
+        try {
+            int _alt;
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(511);
+                _errHandler.sync(this);
+                _alt = 1;
+                do {
+                    switch (_alt) {
+                        case 1: {
+                            {
+                                setState(510);
+                                sourceElement();
+                            }
+                        }
+                        break;
+                        default:
+                            throw new NoViableAltException(this);
+                    }
+                    setState(513);
+                    _errHandler.sync(this);
+                    _alt = getInterpreter().adaptivePredict(_input, 48, _ctx);
+                } while (_alt != 2 && _alt != ATN.INVALID_ALT_NUMBER);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final ArrayLiteralContext arrayLiteral() throws RecognitionException {
+        ArrayLiteralContext _localctx = new ArrayLiteralContext(_ctx, getState());
+        enterRule(_localctx, 98, RULE_arrayLiteral);
+        int _la;
+        try {
+            int _alt;
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(515);
+                match(OpenBracket);
+                setState(519);
+                _errHandler.sync(this);
+                _alt = getInterpreter().adaptivePredict(_input, 49, _ctx);
+                while (_alt != 2 && _alt != ATN.INVALID_ALT_NUMBER) {
+                    if (_alt == 1) {
+                        {
+                            {
+                                setState(516);
+                                match(Comma);
+                            }
+                        }
+                    }
+                    setState(521);
+                    _errHandler.sync(this);
+                    _alt = getInterpreter().adaptivePredict(_input, 49, _ctx);
+                }
+                setState(523);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << RegularExpressionLiteral) | (1L << OpenBracket) | (1L << OpenParen) | (1L << OpenBrace) | (1L << Ellipsis) | (1L << PlusPlus) | (1L << MinusMinus) | (1L << Plus) | (1L << Minus) | (1L << BitNot) | (1L << Not) | (1L << NullLiteral) | (1L << BooleanLiteral) | (1L << DecimalLiteral) | (1L << HexIntegerLiteral) | (1L << OctalIntegerLiteral) | (1L << OctalIntegerLiteral2) | (1L << BinaryIntegerLiteral))) != 0) || ((((_la - 64)) & ~0x3f) == 0 && ((1L << (_la - 64)) & ((1L << (Typeof - 64)) | (1L << (New - 64)) | (1L << (This - 64)) | (1L << (Super - 64)) | (1L << (Identifier - 64)) | (1L << (StringLiteral - 64)) | (1L << (TemplateStringLiteral - 64)))) != 0)) {
+                    {
+                        setState(522);
+                        elementList();
+                    }
+                }
+
+                setState(528);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                while (_la == Comma) {
+                    {
+                        {
+                            setState(525);
+                            match(Comma);
+                        }
+                    }
+                    setState(530);
+                    _errHandler.sync(this);
+                    _la = _input.LA(1);
+                }
+                setState(531);
+                match(CloseBracket);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final ElementListContext elementList() throws RecognitionException {
+        ElementListContext _localctx = new ElementListContext(_ctx, getState());
+        enterRule(_localctx, 100, RULE_elementList);
+        int _la;
+        try {
+            int _alt;
+            setState(554);
+            _errHandler.sync(this);
+            switch (_input.LA(1)) {
+                case RegularExpressionLiteral:
+                case OpenBracket:
+                case OpenParen:
+                case OpenBrace:
+                case PlusPlus:
+                case MinusMinus:
+                case Plus:
+                case Minus:
+                case BitNot:
+                case Not:
+                case NullLiteral:
+                case BooleanLiteral:
+                case DecimalLiteral:
+                case HexIntegerLiteral:
+                case OctalIntegerLiteral:
+                case OctalIntegerLiteral2:
+                case BinaryIntegerLiteral:
+                case Typeof:
+                case New:
+                case This:
+                case Super:
+                case Identifier:
+                case StringLiteral:
+                case TemplateStringLiteral:
+                    enterOuterAlt(_localctx, 1);
+                {
+                    setState(533);
+                    singleExpression(0);
+                    setState(542);
+                    _errHandler.sync(this);
+                    _alt = getInterpreter().adaptivePredict(_input, 53, _ctx);
+                    while (_alt != 2 && _alt != ATN.INVALID_ALT_NUMBER) {
+                        if (_alt == 1) {
+                            {
+                                {
+                                    setState(535);
+                                    _errHandler.sync(this);
+                                    _la = _input.LA(1);
+                                    do {
+                                        {
+                                            {
+                                                setState(534);
+                                                match(Comma);
+                                            }
+                                        }
+                                        setState(537);
+                                        _errHandler.sync(this);
+                                        _la = _input.LA(1);
+                                    } while (_la == Comma);
+                                    setState(539);
+                                    singleExpression(0);
+                                }
+                            }
+                        }
+                        setState(544);
+                        _errHandler.sync(this);
+                        _alt = getInterpreter().adaptivePredict(_input, 53, _ctx);
+                    }
+                    setState(551);
+                    _errHandler.sync(this);
+                    switch (getInterpreter().adaptivePredict(_input, 55, _ctx)) {
+                        case 1: {
+                            setState(546);
+                            _errHandler.sync(this);
+                            _la = _input.LA(1);
+                            do {
+                                {
+                                    {
+                                        setState(545);
+                                        match(Comma);
+                                    }
+                                }
+                                setState(548);
+                                _errHandler.sync(this);
+                                _la = _input.LA(1);
+                            } while (_la == Comma);
+                            setState(550);
+                            lastElement();
+                        }
+                        break;
+                    }
+                }
+                break;
+                case Ellipsis:
+                    enterOuterAlt(_localctx, 2);
+                {
+                    setState(553);
+                    lastElement();
+                }
+                break;
+                default:
+                    throw new NoViableAltException(this);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final LastElementContext lastElement() throws RecognitionException {
+        LastElementContext _localctx = new LastElementContext(_ctx, getState());
+        enterRule(_localctx, 102, RULE_lastElement);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(556);
+                match(Ellipsis);
+                setState(557);
+                match(Identifier);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final ObjectLiteralContext objectLiteral() throws RecognitionException {
+        ObjectLiteralContext _localctx = new ObjectLiteralContext(_ctx, getState());
+        enterRule(_localctx, 104, RULE_objectLiteral);
+        int _la;
+        try {
+            int _alt;
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(559);
+                match(OpenBrace);
+                setState(568);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << OpenBracket) | (1L << NullLiteral) | (1L << BooleanLiteral) | (1L << DecimalLiteral) | (1L << HexIntegerLiteral) | (1L << OctalIntegerLiteral) | (1L << OctalIntegerLiteral2) | (1L << BinaryIntegerLiteral) | (1L << Break) | (1L << Do) | (1L << Instanceof))) != 0) || ((((_la - 64)) & ~0x3f) == 0 && ((1L << (_la - 64)) & ((1L << (Typeof - 64)) | (1L << (Case - 64)) | (1L << (Else - 64)) | (1L << (New - 64)) | (1L << (Var - 64)) | (1L << (Catch - 64)) | (1L << (Finally - 64)) | (1L << (Return - 64)) | (1L << (Void - 64)) | (1L << (Continue - 64)) | (1L << (For - 64)) | (1L << (Switch - 64)) | (1L << (While - 64)) | (1L << (Debugger - 64)) | (1L << (Function - 64)) | (1L << (This - 64)) | (1L << (With - 64)) | (1L << (Default - 64)) | (1L << (If - 64)) | (1L << (Throw - 64)) | (1L << (Delete - 64)) | (1L << (In - 64)) | (1L << (Try - 64)) | (1L << (Class - 64)) | (1L << (Enum - 64)) | (1L << (Extends - 64)) | (1L << (Super - 64)) | (1L << (Const - 64)) | (1L << (Export - 64)) | (1L << (Import - 64)) | (1L << (Implements - 64)) | (1L << (Let - 64)) | (1L << (Private - 64)) | (1L << (Public - 64)) | (1L << (Interface - 64)) | (1L << (Package - 64)) | (1L << (Protected - 64)) | (1L << (Static - 64)) | (1L << (Yield - 64)) | (1L << (Identifier - 64)) | (1L << (StringLiteral - 64)))) != 0)) {
+                    {
+                        setState(560);
+                        propertyAssignment();
+                        setState(565);
+                        _errHandler.sync(this);
+                        _alt = getInterpreter().adaptivePredict(_input, 57, _ctx);
+                        while (_alt != 2 && _alt != ATN.INVALID_ALT_NUMBER) {
+                            if (_alt == 1) {
+                                {
+                                    {
+                                        setState(561);
+                                        match(Comma);
+                                        setState(562);
+                                        propertyAssignment();
+                                    }
+                                }
+                            }
+                            setState(567);
+                            _errHandler.sync(this);
+                            _alt = getInterpreter().adaptivePredict(_input, 57, _ctx);
+                        }
+                    }
+                }
+
+                setState(571);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if (_la == Comma) {
+                    {
+                        setState(570);
+                        match(Comma);
+                    }
+                }
+
+                setState(573);
+                match(CloseBrace);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final PropertyAssignmentContext propertyAssignment() throws RecognitionException {
+        PropertyAssignmentContext _localctx = new PropertyAssignmentContext(_ctx, getState());
+        enterRule(_localctx, 106, RULE_propertyAssignment);
+        int _la;
+        try {
+            setState(586);
+            _errHandler.sync(this);
+            switch (getInterpreter().adaptivePredict(_input, 60, _ctx)) {
+                case 1:
+                    _localctx = new PropertyExpressionAssignmentContext(_localctx);
+                    enterOuterAlt(_localctx, 1);
+                {
+                    setState(575);
+                    propertyName();
+                    setState(576);
+                    _la = _input.LA(1);
+                    if (!(_la == Assign || _la == Colon)) {
+                        _errHandler.recoverInline(this);
+                    } else {
+                        if (_input.LA(1) == Token.EOF) matchedEOF = true;
+                        _errHandler.reportMatch(this);
+                        consume();
+                    }
+                    setState(577);
+                    singleExpression(0);
+                }
+                break;
+                case 2:
+                    _localctx = new ComputedPropertyExpressionAssignmentContext(_localctx);
+                    enterOuterAlt(_localctx, 2);
+                {
+                    setState(579);
+                    match(OpenBracket);
+                    setState(580);
+                    singleExpression(0);
+                    setState(581);
+                    match(CloseBracket);
+                    setState(582);
+                    match(Colon);
+                    setState(583);
+                    singleExpression(0);
+                }
+                break;
+                case 3:
+                    _localctx = new PropertyShorthandContext(_localctx);
+                    enterOuterAlt(_localctx, 3);
+                {
+                    setState(585);
+                    match(Identifier);
+                }
+                break;
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final PropertyNameContext propertyName() throws RecognitionException {
+        PropertyNameContext _localctx = new PropertyNameContext(_ctx, getState());
+        enterRule(_localctx, 108, RULE_propertyName);
+        try {
+            setState(591);
+            _errHandler.sync(this);
+            switch (_input.LA(1)) {
+                case NullLiteral:
+                case BooleanLiteral:
+                case Break:
+                case Do:
+                case Instanceof:
+                case Typeof:
+                case Case:
+                case Else:
+                case New:
+                case Var:
+                case Catch:
+                case Finally:
+                case Return:
+                case Void:
+                case Continue:
+                case For:
+                case Switch:
+                case While:
+                case Debugger:
+                case Function:
+                case This:
+                case With:
+                case Default:
+                case If:
+                case Throw:
+                case Delete:
+                case In:
+                case Try:
+                case Class:
+                case Enum:
+                case Extends:
+                case Super:
+                case Const:
+                case Export:
+                case Import:
+                case Implements:
+                case Let:
+                case Private:
+                case Public:
+                case Interface:
+                case Package:
+                case Protected:
+                case Static:
+                case Yield:
+                case Identifier:
+                    enterOuterAlt(_localctx, 1);
+                {
+                    setState(588);
+                    identifierName();
+                }
+                break;
+                case StringLiteral:
+                    enterOuterAlt(_localctx, 2);
+                {
+                    setState(589);
+                    match(StringLiteral);
+                }
+                break;
+                case DecimalLiteral:
+                case HexIntegerLiteral:
+                case OctalIntegerLiteral:
+                case OctalIntegerLiteral2:
+                case BinaryIntegerLiteral:
+                    enterOuterAlt(_localctx, 3);
+                {
+                    setState(590);
+                    numericLiteral();
+                }
+                break;
+                default:
+                    throw new NoViableAltException(this);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final ArgumentsContext arguments() throws RecognitionException {
+        ArgumentsContext _localctx = new ArgumentsContext(_ctx, getState());
+        enterRule(_localctx, 110, RULE_arguments);
+        int _la;
+        try {
+            int _alt;
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(593);
+                match(OpenParen);
+                setState(607);
+                _errHandler.sync(this);
+                switch (_input.LA(1)) {
+                    case RegularExpressionLiteral:
+                    case OpenBracket:
+                    case OpenParen:
+                    case OpenBrace:
+                    case PlusPlus:
+                    case MinusMinus:
+                    case Plus:
+                    case Minus:
+                    case BitNot:
+                    case Not:
+                    case NullLiteral:
+                    case BooleanLiteral:
+                    case DecimalLiteral:
+                    case HexIntegerLiteral:
+                    case OctalIntegerLiteral:
+                    case OctalIntegerLiteral2:
+                    case BinaryIntegerLiteral:
+                    case Typeof:
+                    case New:
+                    case This:
+                    case Super:
+                    case Identifier:
+                    case StringLiteral:
+                    case TemplateStringLiteral: {
+                        setState(594);
+                        singleExpression(0);
+                        setState(599);
+                        _errHandler.sync(this);
+                        _alt = getInterpreter().adaptivePredict(_input, 62, _ctx);
+                        while (_alt != 2 && _alt != ATN.INVALID_ALT_NUMBER) {
+                            if (_alt == 1) {
+                                {
+                                    {
+                                        setState(595);
+                                        match(Comma);
+                                        setState(596);
+                                        singleExpression(0);
+                                    }
+                                }
+                            }
+                            setState(601);
+                            _errHandler.sync(this);
+                            _alt = getInterpreter().adaptivePredict(_input, 62, _ctx);
+                        }
+                        setState(604);
+                        _errHandler.sync(this);
+                        _la = _input.LA(1);
+                        if (_la == Comma) {
+                            {
+                                setState(602);
+                                match(Comma);
+                                setState(603);
+                                lastArgument();
+                            }
+                        }
+
+                    }
+                    break;
+                    case Ellipsis: {
+                        setState(606);
+                        lastArgument();
+                    }
+                    break;
+                    case CloseParen:
+                        break;
+                    default:
+                        break;
+                }
+                setState(609);
+                match(CloseParen);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final LastArgumentContext lastArgument() throws RecognitionException {
+        LastArgumentContext _localctx = new LastArgumentContext(_ctx, getState());
+        enterRule(_localctx, 112, RULE_lastArgument);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(611);
+                match(Ellipsis);
+                setState(612);
+                match(Identifier);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final ExpressionSequenceContext expressionSequence() throws RecognitionException {
+        ExpressionSequenceContext _localctx = new ExpressionSequenceContext(_ctx, getState());
+        enterRule(_localctx, 114, RULE_expressionSequence);
+        try {
+            int _alt;
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(614);
+                singleExpression(0);
+                setState(619);
+                _errHandler.sync(this);
+                _alt = getInterpreter().adaptivePredict(_input, 65, _ctx);
+                while (_alt != 2 && _alt != ATN.INVALID_ALT_NUMBER) {
+                    if (_alt == 1) {
+                        {
+                            {
+                                setState(615);
+                                match(Comma);
+                                setState(616);
+                                singleExpression(0);
+                            }
+                        }
+                    }
+                    setState(621);
+                    _errHandler.sync(this);
+                    _alt = getInterpreter().adaptivePredict(_input, 65, _ctx);
+                }
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final SingleExpressionContext singleExpression() throws RecognitionException {
+        return singleExpression(0);
+    }
+
+    private SingleExpressionContext singleExpression(int _p) throws RecognitionException {
+        ParserRuleContext _parentctx = _ctx;
+        int _parentState = getState();
+        SingleExpressionContext _localctx = new SingleExpressionContext(_ctx, _parentState);
+        SingleExpressionContext _prevctx = _localctx;
+        int _startState = 116;
+        enterRecursionRule(_localctx, 116, RULE_singleExpression, _p);
+        int _la;
+        try {
+            int _alt;
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(656);
+                _errHandler.sync(this);
+                switch (getInterpreter().adaptivePredict(_input, 67, _ctx)) {
+                    case 1: {
+                        _localctx = new NewExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+
+                        setState(623);
+                        match(New);
+                        setState(624);
+                        singleExpression(0);
+                        setState(626);
+                        _errHandler.sync(this);
+                        switch (getInterpreter().adaptivePredict(_input, 66, _ctx)) {
+                            case 1: {
+                                setState(625);
+                                arguments();
+                            }
+                            break;
+                        }
+                    }
+                    break;
+                    case 2: {
+                        _localctx = new TypeofExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(628);
+                        match(Typeof);
+                        setState(629);
+                        singleExpression(31);
+                    }
+                    break;
+                    case 3: {
+                        _localctx = new PreIncrementExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(630);
+                        match(PlusPlus);
+                        setState(631);
+                        singleExpression(30);
+                    }
+                    break;
+                    case 4: {
+                        _localctx = new PreDecreaseExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(632);
+                        match(MinusMinus);
+                        setState(633);
+                        singleExpression(29);
+                    }
+                    break;
+                    case 5: {
+                        _localctx = new UnaryPlusExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(634);
+                        match(Plus);
+                        setState(635);
+                        singleExpression(28);
+                    }
+                    break;
+                    case 6: {
+                        _localctx = new UnaryMinusExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(636);
+                        match(Minus);
+                        setState(637);
+                        singleExpression(27);
+                    }
+                    break;
+                    case 7: {
+                        _localctx = new BitNotExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(638);
+                        match(BitNot);
+                        setState(639);
+                        singleExpression(26);
+                    }
+                    break;
+                    case 8: {
+                        _localctx = new NotExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(640);
+                        match(Not);
+                        setState(641);
+                        singleExpression(25);
+                    }
+                    break;
+                    case 9: {
+                        _localctx = new ThisExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(642);
+                        match(This);
+                    }
+                    break;
+                    case 10: {
+                        _localctx = new IdentifierExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(643);
+                        match(Identifier);
+                    }
+                    break;
+                    case 11: {
+                        _localctx = new SuperExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(644);
+                        match(Super);
+                    }
+                    break;
+                    case 12: {
+                        _localctx = new LiteralExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(645);
+                        literal();
+                    }
+                    break;
+                    case 13: {
+                        _localctx = new ArrayLiteralExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(646);
+                        arrayLiteral();
+                    }
+                    break;
+                    case 14: {
+                        _localctx = new ObjectLiteralExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(647);
+                        objectLiteral();
+                    }
+                    break;
+                    case 15: {
+                        _localctx = new ParenthesizedExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(648);
+                        match(OpenParen);
+                        setState(649);
+                        expressionSequence();
+                        setState(650);
+                        match(CloseParen);
+                    }
+                    break;
+                    case 16: {
+                        _localctx = new ArrowFunctionExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(652);
+                        arrowFunctionParameters();
+                        setState(653);
+                        match(ARROW);
+                        setState(654);
+                        arrowFunctionBody();
+                    }
+                    break;
+                }
+                _ctx.stop = _input.LT(-1);
+                setState(727);
+                _errHandler.sync(this);
+                _alt = getInterpreter().adaptivePredict(_input, 69, _ctx);
+                while (_alt != 2 && _alt != ATN.INVALID_ALT_NUMBER) {
+                    if (_alt == 1) {
+                        if (_parseListeners != null) triggerExitRuleEvent();
+                        _prevctx = _localctx;
+                        {
+                            setState(725);
+                            _errHandler.sync(this);
+                            switch (getInterpreter().adaptivePredict(_input, 68, _ctx)) {
+                                case 1: {
+                                    _localctx = new MultiplicativeExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
+                                    setState(658);
+                                    if (!(precpred(_ctx, 24)))
+                                        throw new FailedPredicateException(this, "precpred(_ctx, 24)");
+                                    setState(659);
+                                    _la = _input.LA(1);
+                                    if (!((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << Multiply) | (1L << Divide) | (1L << Modulus))) != 0))) {
+                                        _errHandler.recoverInline(this);
+                                    } else {
+                                        if (_input.LA(1) == Token.EOF) matchedEOF = true;
+                                        _errHandler.reportMatch(this);
+                                        consume();
+                                    }
+                                    setState(660);
+                                    singleExpression(25);
+                                }
+                                break;
+                                case 2: {
+                                    _localctx = new AdditiveExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
+                                    setState(661);
+                                    if (!(precpred(_ctx, 23)))
+                                        throw new FailedPredicateException(this, "precpred(_ctx, 23)");
+                                    setState(662);
+                                    _la = _input.LA(1);
+                                    if (!(_la == Plus || _la == Minus)) {
+                                        _errHandler.recoverInline(this);
+                                    } else {
+                                        if (_input.LA(1) == Token.EOF) matchedEOF = true;
+                                        _errHandler.reportMatch(this);
+                                        consume();
+                                    }
+                                    setState(663);
+                                    singleExpression(24);
+                                }
+                                break;
+                                case 3: {
+                                    _localctx = new BitShiftExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
+                                    setState(664);
+                                    if (!(precpred(_ctx, 22)))
+                                        throw new FailedPredicateException(this, "precpred(_ctx, 22)");
+                                    setState(665);
+                                    _la = _input.LA(1);
+                                    if (!((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << RightShiftArithmetic) | (1L << LeftShiftArithmetic) | (1L << RightShiftLogical))) != 0))) {
+                                        _errHandler.recoverInline(this);
+                                    } else {
+                                        if (_input.LA(1) == Token.EOF) matchedEOF = true;
+                                        _errHandler.reportMatch(this);
+                                        consume();
+                                    }
+                                    setState(666);
+                                    singleExpression(23);
+                                }
+                                break;
+                                case 4: {
+                                    _localctx = new RelationalExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
+                                    setState(667);
+                                    if (!(precpred(_ctx, 21)))
+                                        throw new FailedPredicateException(this, "precpred(_ctx, 21)");
+                                    setState(668);
+                                    _la = _input.LA(1);
+                                    if (!((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << LessThan) | (1L << MoreThan) | (1L << LessThanEquals) | (1L << GreaterThanEquals))) != 0))) {
+                                        _errHandler.recoverInline(this);
+                                    } else {
+                                        if (_input.LA(1) == Token.EOF) matchedEOF = true;
+                                        _errHandler.reportMatch(this);
+                                        consume();
+                                    }
+                                    setState(669);
+                                    singleExpression(22);
+                                }
+                                break;
+                                case 5: {
+                                    _localctx = new InstanceofExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
+                                    setState(670);
+                                    if (!(precpred(_ctx, 20)))
+                                        throw new FailedPredicateException(this, "precpred(_ctx, 20)");
+                                    setState(671);
+                                    match(Instanceof);
+                                    setState(672);
+                                    singleExpression(21);
+                                }
+                                break;
+                                case 6: {
+                                    _localctx = new InExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
+                                    setState(673);
+                                    if (!(precpred(_ctx, 19)))
+                                        throw new FailedPredicateException(this, "precpred(_ctx, 19)");
+                                    setState(674);
+                                    match(In);
+                                    setState(675);
+                                    singleExpression(20);
+                                }
+                                break;
+                                case 7: {
+                                    _localctx = new EqualityExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
+                                    setState(676);
+                                    if (!(precpred(_ctx, 18)))
+                                        throw new FailedPredicateException(this, "precpred(_ctx, 18)");
+                                    setState(677);
+                                    _la = _input.LA(1);
+                                    if (!((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << Equals_) | (1L << NotEquals) | (1L << IdentityEquals) | (1L << IdentityNotEquals))) != 0))) {
+                                        _errHandler.recoverInline(this);
+                                    } else {
+                                        if (_input.LA(1) == Token.EOF) matchedEOF = true;
+                                        _errHandler.reportMatch(this);
+                                        consume();
+                                    }
+                                    setState(678);
+                                    singleExpression(19);
+                                }
+                                break;
+                                case 8: {
+                                    _localctx = new BitAndExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
+                                    setState(679);
+                                    if (!(precpred(_ctx, 17)))
+                                        throw new FailedPredicateException(this, "precpred(_ctx, 17)");
+                                    setState(680);
+                                    match(BitAnd);
+                                    setState(681);
+                                    singleExpression(18);
+                                }
+                                break;
+                                case 9: {
+                                    _localctx = new BitXOrExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
+                                    setState(682);
+                                    if (!(precpred(_ctx, 16)))
+                                        throw new FailedPredicateException(this, "precpred(_ctx, 16)");
+                                    setState(683);
+                                    match(BitXOr);
+                                    setState(684);
+                                    singleExpression(17);
+                                }
+                                break;
+                                case 10: {
+                                    _localctx = new BitOrExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
+                                    setState(685);
+                                    if (!(precpred(_ctx, 15)))
+                                        throw new FailedPredicateException(this, "precpred(_ctx, 15)");
+                                    setState(686);
+                                    match(BitOr);
+                                    setState(687);
+                                    singleExpression(16);
+                                }
+                                break;
+                                case 11: {
+                                    _localctx = new LogicalAndExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
+                                    setState(688);
+                                    if (!(precpred(_ctx, 14)))
+                                        throw new FailedPredicateException(this, "precpred(_ctx, 14)");
+                                    setState(689);
+                                    match(And);
+                                    setState(690);
+                                    singleExpression(15);
+                                }
+                                break;
+                                case 12: {
+                                    _localctx = new LogicalOrExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
+                                    setState(691);
+                                    if (!(precpred(_ctx, 13)))
+                                        throw new FailedPredicateException(this, "precpred(_ctx, 13)");
+                                    setState(692);
+                                    match(Or);
+                                    setState(693);
+                                    singleExpression(14);
+                                }
+                                break;
+                                case 13: {
+                                    _localctx = new TernaryExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
+                                    setState(694);
+                                    if (!(precpred(_ctx, 12)))
+                                        throw new FailedPredicateException(this, "precpred(_ctx, 12)");
+                                    setState(695);
+                                    match(QuestionMark);
+                                    setState(696);
+                                    singleExpression(0);
+                                    setState(697);
+                                    match(Colon);
+                                    setState(698);
+                                    singleExpression(13);
+                                }
+                                break;
+                                case 14: {
+                                    _localctx = new AssignmentExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
+                                    setState(700);
+                                    if (!(precpred(_ctx, 11)))
+                                        throw new FailedPredicateException(this, "precpred(_ctx, 11)");
+                                    setState(701);
+                                    match(Assign);
+                                    setState(702);
+                                    singleExpression(12);
+                                }
+                                break;
+                                case 15: {
+                                    _localctx = new AssignmentOperatorExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
+                                    setState(703);
+                                    if (!(precpred(_ctx, 10)))
+                                        throw new FailedPredicateException(this, "precpred(_ctx, 10)");
+                                    setState(704);
+                                    assignmentOperator();
+                                    setState(705);
+                                    singleExpression(11);
+                                }
+                                break;
+                                case 16: {
+                                    _localctx = new MemberIndexExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
+                                    setState(707);
+                                    if (!(precpred(_ctx, 37)))
+                                        throw new FailedPredicateException(this, "precpred(_ctx, 37)");
+                                    setState(708);
+                                    match(OpenBracket);
+                                    setState(709);
+                                    expressionSequence();
+                                    setState(710);
+                                    match(CloseBracket);
+                                }
+                                break;
+                                case 17: {
+                                    _localctx = new MemberDotExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
+                                    setState(712);
+                                    if (!(precpred(_ctx, 36)))
+                                        throw new FailedPredicateException(this, "precpred(_ctx, 36)");
+                                    setState(713);
+                                    match(Dot);
+                                    setState(714);
+                                    identifierName();
+                                }
+                                break;
+                                case 18: {
+                                    _localctx = new ArgumentsExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
+                                    setState(715);
+                                    if (!(precpred(_ctx, 35)))
+                                        throw new FailedPredicateException(this, "precpred(_ctx, 35)");
+                                    setState(716);
+                                    arguments();
+                                }
+                                break;
+                                case 19: {
+                                    _localctx = new PostIncrementExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
+                                    setState(717);
+                                    if (!(precpred(_ctx, 33)))
+                                        throw new FailedPredicateException(this, "precpred(_ctx, 33)");
+                                    setState(718);
+                                    if (!(notLineTerminator()))
+                                        throw new FailedPredicateException(this, "notLineTerminator()");
+                                    setState(719);
+                                    match(PlusPlus);
+                                }
+                                break;
+                                case 20: {
+                                    _localctx = new PostDecreaseExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
+                                    setState(720);
+                                    if (!(precpred(_ctx, 32)))
+                                        throw new FailedPredicateException(this, "precpred(_ctx, 32)");
+                                    setState(721);
+                                    if (!(notLineTerminator()))
+                                        throw new FailedPredicateException(this, "notLineTerminator()");
+                                    setState(722);
+                                    match(MinusMinus);
+                                }
+                                break;
+                                case 21: {
+                                    _localctx = new TemplateStringExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
+                                    setState(723);
+                                    if (!(precpred(_ctx, 9)))
+                                        throw new FailedPredicateException(this, "precpred(_ctx, 9)");
+                                    setState(724);
+                                    match(TemplateStringLiteral);
+                                }
+                                break;
+                            }
+                        }
+                    }
+                    setState(729);
+                    _errHandler.sync(this);
+                    _alt = getInterpreter().adaptivePredict(_input, 69, _ctx);
+                }
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            unrollRecursionContexts(_parentctx);
+        }
+        return _localctx;
+    }
+
+    public final ArrowFunctionParametersContext arrowFunctionParameters() throws RecognitionException {
+        ArrowFunctionParametersContext _localctx = new ArrowFunctionParametersContext(_ctx, getState());
+        enterRule(_localctx, 118, RULE_arrowFunctionParameters);
+        int _la;
+        try {
+            setState(736);
+            _errHandler.sync(this);
+            switch (_input.LA(1)) {
+                case Identifier:
+                    enterOuterAlt(_localctx, 1);
+                {
+                    setState(730);
+                    match(Identifier);
+                }
+                break;
+                case OpenParen:
+                    enterOuterAlt(_localctx, 2);
+                {
+                    setState(731);
+                    match(OpenParen);
+                    setState(733);
+                    _errHandler.sync(this);
+                    _la = _input.LA(1);
+                    if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << OpenBracket) | (1L << OpenBrace) | (1L << Ellipsis))) != 0) || _la == Identifier) {
+                        {
+                            setState(732);
+                            formalParameterList();
+                        }
+                    }
+
+                    setState(735);
+                    match(CloseParen);
+                }
+                break;
+                default:
+                    throw new NoViableAltException(this);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final ArrowFunctionBodyContext arrowFunctionBody() throws RecognitionException {
+        ArrowFunctionBodyContext _localctx = new ArrowFunctionBodyContext(_ctx, getState());
+        enterRule(_localctx, 120, RULE_arrowFunctionBody);
+        try {
+            setState(743);
+            _errHandler.sync(this);
+            switch (getInterpreter().adaptivePredict(_input, 72, _ctx)) {
+                case 1:
+                    enterOuterAlt(_localctx, 1);
+                {
+                    setState(738);
+                    singleExpression(0);
+                }
+                break;
+                case 2:
+                    enterOuterAlt(_localctx, 2);
+                {
+                    setState(739);
+                    match(OpenBrace);
+                    setState(740);
+                    functionBody();
+                    setState(741);
+                    match(CloseBrace);
+                }
+                break;
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final AssignmentOperatorContext assignmentOperator() throws RecognitionException {
+        AssignmentOperatorContext _localctx = new AssignmentOperatorContext(_ctx, getState());
+        enterRule(_localctx, 122, RULE_assignmentOperator);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(745);
+                _la = _input.LA(1);
+                if (!((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << MultiplyAssign) | (1L << DivideAssign) | (1L << ModulusAssign) | (1L << PlusAssign) | (1L << MinusAssign) | (1L << LeftShiftArithmeticAssign) | (1L << RightShiftArithmeticAssign) | (1L << RightShiftLogicalAssign) | (1L << BitAndAssign) | (1L << BitXorAssign) | (1L << BitOrAssign))) != 0))) {
+                    _errHandler.recoverInline(this);
+                } else {
+                    if (_input.LA(1) == Token.EOF) matchedEOF = true;
+                    _errHandler.reportMatch(this);
+                    consume();
+                }
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final LiteralContext literal() throws RecognitionException {
+        LiteralContext _localctx = new LiteralContext(_ctx, getState());
+        enterRule(_localctx, 124, RULE_literal);
+        try {
+            setState(753);
+            _errHandler.sync(this);
+            switch (_input.LA(1)) {
+                case NullLiteral:
+                    enterOuterAlt(_localctx, 1);
+                {
+                    setState(747);
+                    match(NullLiteral);
+                }
+                break;
+                case BooleanLiteral:
+                    enterOuterAlt(_localctx, 2);
+                {
+                    setState(748);
+                    match(BooleanLiteral);
+                }
+                break;
+                case StringLiteral:
+                    enterOuterAlt(_localctx, 3);
+                {
+                    setState(749);
+                    match(StringLiteral);
+                }
+                break;
+                case TemplateStringLiteral:
+                    enterOuterAlt(_localctx, 4);
+                {
+                    setState(750);
+                    match(TemplateStringLiteral);
+                }
+                break;
+                case RegularExpressionLiteral:
+                    enterOuterAlt(_localctx, 5);
+                {
+                    setState(751);
+                    match(RegularExpressionLiteral);
+                }
+                break;
+                case DecimalLiteral:
+                case HexIntegerLiteral:
+                case OctalIntegerLiteral:
+                case OctalIntegerLiteral2:
+                case BinaryIntegerLiteral:
+                    enterOuterAlt(_localctx, 6);
+                {
+                    setState(752);
+                    numericLiteral();
+                }
+                break;
+                default:
+                    throw new NoViableAltException(this);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final NumericLiteralContext numericLiteral() throws RecognitionException {
+        NumericLiteralContext _localctx = new NumericLiteralContext(_ctx, getState());
+        enterRule(_localctx, 126, RULE_numericLiteral);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(755);
+                _la = _input.LA(1);
+                if (!((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << DecimalLiteral) | (1L << HexIntegerLiteral) | (1L << OctalIntegerLiteral) | (1L << OctalIntegerLiteral2) | (1L << BinaryIntegerLiteral))) != 0))) {
+                    _errHandler.recoverInline(this);
+                } else {
+                    if (_input.LA(1) == Token.EOF) matchedEOF = true;
+                    _errHandler.reportMatch(this);
+                    consume();
+                }
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final IdentifierNameContext identifierName() throws RecognitionException {
+        IdentifierNameContext _localctx = new IdentifierNameContext(_ctx, getState());
+        enterRule(_localctx, 128, RULE_identifierName);
+        try {
+            setState(759);
+            _errHandler.sync(this);
+            switch (_input.LA(1)) {
+                case Identifier:
+                    enterOuterAlt(_localctx, 1);
+                {
+                    setState(757);
+                    match(Identifier);
+                }
+                break;
+                case NullLiteral:
+                case BooleanLiteral:
+                case Break:
+                case Do:
+                case Instanceof:
+                case Typeof:
+                case Case:
+                case Else:
+                case New:
+                case Var:
+                case Catch:
+                case Finally:
+                case Return:
+                case Void:
+                case Continue:
+                case For:
+                case Switch:
+                case While:
+                case Debugger:
+                case Function:
+                case This:
+                case With:
+                case Default:
+                case If:
+                case Throw:
+                case Delete:
+                case In:
+                case Try:
+                case Class:
+                case Enum:
+                case Extends:
+                case Super:
+                case Const:
+                case Export:
+                case Import:
+                case Implements:
+                case Let:
+                case Private:
+                case Public:
+                case Interface:
+                case Package:
+                case Protected:
+                case Static:
+                case Yield:
+                    enterOuterAlt(_localctx, 2);
+                {
+                    setState(758);
+                    reservedWord();
+                }
+                break;
+                default:
+                    throw new NoViableAltException(this);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final ReservedWordContext reservedWord() throws RecognitionException {
+        ReservedWordContext _localctx = new ReservedWordContext(_ctx, getState());
+        enterRule(_localctx, 130, RULE_reservedWord);
+        try {
+            setState(764);
+            _errHandler.sync(this);
+            switch (_input.LA(1)) {
+                case Break:
+                case Do:
+                case Instanceof:
+                case Typeof:
+                case Case:
+                case Else:
+                case New:
+                case Var:
+                case Catch:
+                case Finally:
+                case Return:
+                case Void:
+                case Continue:
+                case For:
+                case Switch:
+                case While:
+                case Debugger:
+                case Function:
+                case This:
+                case With:
+                case Default:
+                case If:
+                case Throw:
+                case Delete:
+                case In:
+                case Try:
+                case Class:
+                case Enum:
+                case Extends:
+                case Super:
+                case Const:
+                case Export:
+                case Import:
+                case Implements:
+                case Let:
+                case Private:
+                case Public:
+                case Interface:
+                case Package:
+                case Protected:
+                case Static:
+                case Yield:
+                    enterOuterAlt(_localctx, 1);
+                {
+                    setState(761);
+                    keyword();
+                }
+                break;
+                case NullLiteral:
+                    enterOuterAlt(_localctx, 2);
+                {
+                    setState(762);
+                    match(NullLiteral);
+                }
+                break;
+                case BooleanLiteral:
+                    enterOuterAlt(_localctx, 3);
+                {
+                    setState(763);
+                    match(BooleanLiteral);
+                }
+                break;
+                default:
+                    throw new NoViableAltException(this);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final KeywordContext keyword() throws RecognitionException {
+        KeywordContext _localctx = new KeywordContext(_ctx, getState());
+        enterRule(_localctx, 132, RULE_keyword);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(766);
+                _la = _input.LA(1);
+                if (!(((((_la - 61)) & ~0x3f) == 0 && ((1L << (_la - 61)) & ((1L << (Break - 61)) | (1L << (Do - 61)) | (1L << (Instanceof - 61)) | (1L << (Typeof - 61)) | (1L << (Case - 61)) | (1L << (Else - 61)) | (1L << (New - 61)) | (1L << (Var - 61)) | (1L << (Catch - 61)) | (1L << (Finally - 61)) | (1L << (Return - 61)) | (1L << (Void - 61)) | (1L << (Continue - 61)) | (1L << (For - 61)) | (1L << (Switch - 61)) | (1L << (While - 61)) | (1L << (Debugger - 61)) | (1L << (Function - 61)) | (1L << (This - 61)) | (1L << (With - 61)) | (1L << (Default - 61)) | (1L << (If - 61)) | (1L << (Throw - 61)) | (1L << (Delete - 61)) | (1L << (In - 61)) | (1L << (Try - 61)) | (1L << (Class - 61)) | (1L << (Enum - 61)) | (1L << (Extends - 61)) | (1L << (Super - 61)) | (1L << (Const - 61)) | (1L << (Export - 61)) | (1L << (Import - 61)) | (1L << (Implements - 61)) | (1L << (Let - 61)) | (1L << (Private - 61)) | (1L << (Public - 61)) | (1L << (Interface - 61)) | (1L << (Package - 61)) | (1L << (Protected - 61)) | (1L << (Static - 61)) | (1L << (Yield - 61)))) != 0))) {
+                    _errHandler.recoverInline(this);
+                } else {
+                    if (_input.LA(1) == Token.EOF) matchedEOF = true;
+                    _errHandler.reportMatch(this);
+                    consume();
+                }
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public final EosContext eos() throws RecognitionException {
+        EosContext _localctx = new EosContext(_ctx, getState());
+        enterRule(_localctx, 134, RULE_eos);
+        try {
+            setState(772);
+            _errHandler.sync(this);
+            switch (getInterpreter().adaptivePredict(_input, 76, _ctx)) {
+                case 1:
+                    enterOuterAlt(_localctx, 1);
+                {
+                    setState(768);
+                    match(SemiColon);
+                }
+                break;
+                case 2:
+                    enterOuterAlt(_localctx, 2);
+                {
+                    setState(769);
+                    match(EOF);
+                }
+                break;
+                case 3:
+                    enterOuterAlt(_localctx, 3);
+                {
+                    setState(770);
+                    if (!(lineTerminatorAhead())) throw new FailedPredicateException(this, "lineTerminatorAhead()");
+                }
+                break;
+                case 4:
+                    enterOuterAlt(_localctx, 4);
+                {
+                    setState(771);
+                    if (!(closeBrace())) throw new FailedPredicateException(this, "closeBrace()");
+                }
+                break;
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public boolean sempred(RuleContext _localctx, int ruleIndex, int predIndex) {
+        switch (ruleIndex) {
+            case 21:
+                return expressionStatement_sempred((ExpressionStatementContext) _localctx, predIndex);
+            case 23:
+                return iterationStatement_sempred((IterationStatementContext) _localctx, predIndex);
+            case 25:
+                return continueStatement_sempred((ContinueStatementContext) _localctx, predIndex);
+            case 26:
+                return breakStatement_sempred((BreakStatementContext) _localctx, predIndex);
+            case 27:
+                return returnStatement_sempred((ReturnStatementContext) _localctx, predIndex);
+            case 34:
+                return throwStatement_sempred((ThrowStatementContext) _localctx, predIndex);
+            case 58:
+                return singleExpression_sempred((SingleExpressionContext) _localctx, predIndex);
+            case 67:
+                return eos_sempred((EosContext) _localctx, predIndex);
+        }
+        return true;
+    }
+
+    private boolean expressionStatement_sempred(ExpressionStatementContext _localctx, int predIndex) {
+        switch (predIndex) {
+            case 0:
+                return notOpenBraceAndNotFunction();
+        }
+        return true;
+    }
+
+    private boolean iterationStatement_sempred(IterationStatementContext _localctx, int predIndex) {
+        switch (predIndex) {
+            case 1:
+                return p("of");
+            case 2:
+                return p("of");
+        }
+        return true;
+    }
+
+    private boolean continueStatement_sempred(ContinueStatementContext _localctx, int predIndex) {
+        switch (predIndex) {
+            case 3:
+                return notLineTerminator();
+        }
+        return true;
+    }
+
+    private boolean breakStatement_sempred(BreakStatementContext _localctx, int predIndex) {
+        switch (predIndex) {
+            case 4:
+                return notLineTerminator();
+        }
+        return true;
+    }
+
+    private boolean returnStatement_sempred(ReturnStatementContext _localctx, int predIndex) {
+        switch (predIndex) {
+            case 5:
+                return notLineTerminator();
+        }
+        return true;
+    }
+
+    private boolean throwStatement_sempred(ThrowStatementContext _localctx, int predIndex) {
+        switch (predIndex) {
+            case 6:
+                return notLineTerminator();
+        }
+        return true;
+    }
+
+    private boolean singleExpression_sempred(SingleExpressionContext _localctx, int predIndex) {
+        switch (predIndex) {
+            case 7:
+                return precpred(_ctx, 24);
+            case 8:
+                return precpred(_ctx, 23);
+            case 9:
+                return precpred(_ctx, 22);
+            case 10:
+                return precpred(_ctx, 21);
+            case 11:
+                return precpred(_ctx, 20);
+            case 12:
+                return precpred(_ctx, 19);
+            case 13:
+                return precpred(_ctx, 18);
+            case 14:
+                return precpred(_ctx, 17);
+            case 15:
+                return precpred(_ctx, 16);
+            case 16:
+                return precpred(_ctx, 15);
+            case 17:
+                return precpred(_ctx, 14);
+            case 18:
+                return precpred(_ctx, 13);
+            case 19:
+                return precpred(_ctx, 12);
+            case 20:
+                return precpred(_ctx, 11);
+            case 21:
+                return precpred(_ctx, 10);
+            case 22:
+                return precpred(_ctx, 37);
+            case 23:
+                return precpred(_ctx, 36);
+            case 24:
+                return precpred(_ctx, 35);
+            case 25:
+                return precpred(_ctx, 33);
+            case 26:
+                return notLineTerminator();
+            case 27:
+                return precpred(_ctx, 32);
+            case 28:
+                return notLineTerminator();
+            case 29:
+                return precpred(_ctx, 9);
+        }
+        return true;
+    }
+
+    private boolean eos_sempred(EosContext _localctx, int predIndex) {
+        switch (predIndex) {
+            case 30:
+                return lineTerminatorAhead();
+            case 31:
+                return closeBrace();
+        }
+        return true;
+    }
+
+    public static class ProgramContext extends ParserRuleContext {
+        public ProgramContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public ContractDeclarContext contractDeclar() {
+            return getRuleContext(ContractDeclarContext.class, 0);
+        }
+
+        public ImportStmtsContext importStmts() {
+            return getRuleContext(ImportStmtsContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_program;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterProgram(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitProgram(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitProgram(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ContractDeclarContext extends ParserRuleContext {
+        public ContractDeclarContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        public TerminalNode OpenBrace() {
+            return getToken(YJSParser.OpenBrace, 0);
+        }
+
+        public TerminalNode CloseBrace() {
+            return getToken(YJSParser.CloseBrace, 0);
+        }
+
+        public TerminalNode Contract() {
+            return getToken(YJSParser.Contract, 0);
+        }
+
+        public TerminalNode Module() {
+            return getToken(YJSParser.Module, 0);
+        }
+
+        public TerminalNode Oracle() {
+            return getToken(YJSParser.Oracle, 0);
+        }
+
+        public AnnotationsContext annotations() {
+            return getRuleContext(AnnotationsContext.class, 0);
+        }
+
+        public List<ClzOrFunctionDeclarationContext> clzOrFunctionDeclaration() {
+            return getRuleContexts(ClzOrFunctionDeclarationContext.class);
+        }
+
+        public ClzOrFunctionDeclarationContext clzOrFunctionDeclaration(int i) {
+            return getRuleContext(ClzOrFunctionDeclarationContext.class, i);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_contractDeclar;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterContractDeclar(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitContractDeclar(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitContractDeclar(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class AnnotationsContext extends ParserRuleContext {
+        public AnnotationsContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public List<AnnotationContext> annotation() {
+            return getRuleContexts(AnnotationContext.class);
+        }
+
+        public AnnotationContext annotation(int i) {
+            return getRuleContext(AnnotationContext.class, i);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_annotations;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterAnnotations(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitAnnotations(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitAnnotations(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class AnnotationContext extends ParserRuleContext {
+        public AnnotationContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode AtToken() {
+            return getToken(YJSParser.AtToken, 0);
+        }
+
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        public TerminalNode OpenParen() {
+            return getToken(YJSParser.OpenParen, 0);
+        }
+
+        public TerminalNode CloseParen() {
+            return getToken(YJSParser.CloseParen, 0);
+        }
+
+        public AnnotationArgsContext annotationArgs() {
+            return getRuleContext(AnnotationArgsContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_annotation;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterAnnotation(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitAnnotation(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitAnnotation(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class AnnotationArgsContext extends ParserRuleContext {
+        public AnnotationArgsContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public List<AnnotationLiteralContext> annotationLiteral() {
+            return getRuleContexts(AnnotationLiteralContext.class);
+        }
+
+        public AnnotationLiteralContext annotationLiteral(int i) {
+            return getRuleContext(AnnotationLiteralContext.class, i);
+        }
+
+        public List<TerminalNode> Comma() {
+            return getTokens(YJSParser.Comma);
+        }
+
+        public TerminalNode Comma(int i) {
+            return getToken(YJSParser.Comma, i);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_annotationArgs;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterAnnotationArgs(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitAnnotationArgs(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitAnnotationArgs(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class AnnotationLiteralContext extends ParserRuleContext {
+        public AnnotationLiteralContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public NumericLiteralContext numericLiteral() {
+            return getRuleContext(NumericLiteralContext.class, 0);
+        }
+
+        public TerminalNode StringLiteral() {
+            return getToken(YJSParser.StringLiteral, 0);
+        }
+
+        public ObjectLiteralContext objectLiteral() {
+            return getRuleContext(ObjectLiteralContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_annotationLiteral;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterAnnotationLiteral(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitAnnotationLiteral(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitAnnotationLiteral(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ClzOrFunctionDeclarationContext extends ParserRuleContext {
+        public ClzOrFunctionDeclarationContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public ClassDeclarationContext classDeclaration() {
+            return getRuleContext(ClassDeclarationContext.class, 0);
+        }
+
+        public FunctionDeclarationContext functionDeclaration() {
+            return getRuleContext(FunctionDeclarationContext.class, 0);
+        }
+
+        public EventDeclarationContext eventDeclaration() {
+            return getRuleContext(EventDeclarationContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_clzOrFunctionDeclaration;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener)
+                ((YJSParserListener) listener).enterClzOrFunctionDeclaration(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener)
+                ((YJSParserListener) listener).exitClzOrFunctionDeclaration(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitClzOrFunctionDeclaration(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class EventSemanticsContext extends ParserRuleContext {
+        public EventSemanticsContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode AtLeastOnce() {
+            return getToken(YJSParser.AtLeastOnce, 0);
+        }
+
+        public TerminalNode AtMostOnce() {
+            return getToken(YJSParser.AtMostOnce, 0);
+        }
+
+        public TerminalNode OnlyOnce() {
+            return getToken(YJSParser.OnlyOnce, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_eventSemantics;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterEventSemantics(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitEventSemantics(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitEventSemantics(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class EventDeclarationContext extends ParserRuleContext {
+        public EventDeclarationContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode Event() {
+            return getToken(YJSParser.Event, 0);
+        }
+
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        public TerminalNode SemiColon() {
+            return getToken(YJSParser.SemiColon, 0);
+        }
+
+        public EventSemanticsContext eventSemantics() {
+            return getRuleContext(EventSemanticsContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_eventDeclaration;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterEventDeclaration(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitEventDeclaration(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitEventDeclaration(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class SourceElementContext extends ParserRuleContext {
+        public SourceElementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public StatementContext statement() {
+            return getRuleContext(StatementContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_sourceElement;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterSourceElement(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitSourceElement(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitSourceElement(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ImportStmtsContext extends ParserRuleContext {
+        public ImportStmtsContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public List<ImportStmtContext> importStmt() {
+            return getRuleContexts(ImportStmtContext.class);
+        }
+
+        public ImportStmtContext importStmt(int i) {
+            return getRuleContext(ImportStmtContext.class, i);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_importStmts;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterImportStmts(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitImportStmts(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitImportStmts(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ImportStmtContext extends ParserRuleContext {
+        public ImportStmtContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode Import() {
+            return getToken(YJSParser.Import, 0);
+        }
+
+        public TerminalNode StringLiteral() {
+            return getToken(YJSParser.StringLiteral, 0);
+        }
+
+        public TerminalNode SemiColon() {
+            return getToken(YJSParser.SemiColon, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_importStmt;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterImportStmt(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitImportStmt(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitImportStmt(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ExportStmtContext extends ParserRuleContext {
+        public ExportStmtContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode Export() {
+            return getToken(YJSParser.Export, 0);
+        }
+
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        public VersionNameContext versionName() {
+            return getRuleContext(VersionNameContext.class, 0);
+        }
+
+        public TerminalNode SemiColon() {
+            return getToken(YJSParser.SemiColon, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_exportStmt;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterExportStmt(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitExportStmt(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitExportStmt(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class VersionNameContext extends ParserRuleContext {
+        public VersionNameContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public List<TerminalNode> DecimalLiteral() {
+            return getTokens(YJSParser.DecimalLiteral);
+        }
+
+        public TerminalNode DecimalLiteral(int i) {
+            return getToken(YJSParser.DecimalLiteral, i);
+        }
+
+        public List<TerminalNode> Dot() {
+            return getTokens(YJSParser.Dot);
+        }
+
+        public TerminalNode Dot(int i) {
+            return getToken(YJSParser.Dot, i);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_versionName;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterVersionName(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitVersionName(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitVersionName(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class StatementContext extends ParserRuleContext {
+        public StatementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public BlockContext block() {
+            return getRuleContext(BlockContext.class, 0);
+        }
+
+        public VariableStatementContext variableStatement() {
+            return getRuleContext(VariableStatementContext.class, 0);
+        }
+
+        public EmptyStatementContext emptyStatement() {
+            return getRuleContext(EmptyStatementContext.class, 0);
+        }
+
+        public ExpressionStatementContext expressionStatement() {
+            return getRuleContext(ExpressionStatementContext.class, 0);
+        }
+
+        public IfStatementContext ifStatement() {
+            return getRuleContext(IfStatementContext.class, 0);
+        }
+
+        public IterationStatementContext iterationStatement() {
+            return getRuleContext(IterationStatementContext.class, 0);
+        }
+
+        public ContinueStatementContext continueStatement() {
+            return getRuleContext(ContinueStatementContext.class, 0);
+        }
+
+        public BreakStatementContext breakStatement() {
+            return getRuleContext(BreakStatementContext.class, 0);
+        }
+
+        public ReturnStatementContext returnStatement() {
+            return getRuleContext(ReturnStatementContext.class, 0);
+        }
+
+        public SwitchStatementContext switchStatement() {
+            return getRuleContext(SwitchStatementContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_statement;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterStatement(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitStatement(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitStatement(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class BlockContext extends ParserRuleContext {
+        public BlockContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode OpenBrace() {
+            return getToken(YJSParser.OpenBrace, 0);
+        }
+
+        public TerminalNode CloseBrace() {
+            return getToken(YJSParser.CloseBrace, 0);
+        }
+
+        public StatementListContext statementList() {
+            return getRuleContext(StatementListContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_block;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterBlock(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitBlock(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor) return ((YJSParserVisitor<? extends T>) visitor).visitBlock(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class StatementListContext extends ParserRuleContext {
+        public StatementListContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public List<StatementContext> statement() {
+            return getRuleContexts(StatementContext.class);
+        }
+
+        public StatementContext statement(int i) {
+            return getRuleContext(StatementContext.class, i);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_statementList;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterStatementList(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitStatementList(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitStatementList(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class VariableStatementContext extends ParserRuleContext {
+        public VariableStatementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public VarModifierContext varModifier() {
+            return getRuleContext(VarModifierContext.class, 0);
+        }
+
+        public VariableDeclarationListContext variableDeclarationList() {
+            return getRuleContext(VariableDeclarationListContext.class, 0);
+        }
+
+        public EosContext eos() {
+            return getRuleContext(EosContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_variableStatement;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterVariableStatement(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitVariableStatement(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitVariableStatement(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class VariableDeclarationListContext extends ParserRuleContext {
+        public VariableDeclarationListContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public List<VariableDeclarationContext> variableDeclaration() {
+            return getRuleContexts(VariableDeclarationContext.class);
+        }
+
+        public VariableDeclarationContext variableDeclaration(int i) {
+            return getRuleContext(VariableDeclarationContext.class, i);
+        }
+
+        public List<TerminalNode> Comma() {
+            return getTokens(YJSParser.Comma);
+        }
+
+        public TerminalNode Comma(int i) {
+            return getToken(YJSParser.Comma, i);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_variableDeclarationList;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener)
+                ((YJSParserListener) listener).enterVariableDeclarationList(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitVariableDeclarationList(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitVariableDeclarationList(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class VariableDeclarationContext extends ParserRuleContext {
+        public VariableDeclarationContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        public TerminalNode Assign() {
+            return getToken(YJSParser.Assign, 0);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_variableDeclaration;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterVariableDeclaration(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitVariableDeclaration(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitVariableDeclaration(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class EmptyStatementContext extends ParserRuleContext {
+        public EmptyStatementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode SemiColon() {
+            return getToken(YJSParser.SemiColon, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_emptyStatement;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterEmptyStatement(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitEmptyStatement(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitEmptyStatement(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ExpressionStatementContext extends ParserRuleContext {
+        public ExpressionStatementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public ExpressionSequenceContext expressionSequence() {
+            return getRuleContext(ExpressionSequenceContext.class, 0);
+        }
+
+        public EosContext eos() {
+            return getRuleContext(EosContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_expressionStatement;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterExpressionStatement(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitExpressionStatement(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitExpressionStatement(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class IfStatementContext extends ParserRuleContext {
+        public IfStatementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode If() {
+            return getToken(YJSParser.If, 0);
+        }
+
+        public TerminalNode OpenParen() {
+            return getToken(YJSParser.OpenParen, 0);
+        }
+
+        public ExpressionSequenceContext expressionSequence() {
+            return getRuleContext(ExpressionSequenceContext.class, 0);
+        }
+
+        public TerminalNode CloseParen() {
+            return getToken(YJSParser.CloseParen, 0);
+        }
+
+        public List<StatementContext> statement() {
+            return getRuleContexts(StatementContext.class);
+        }
+
+        public StatementContext statement(int i) {
+            return getRuleContext(StatementContext.class, i);
+        }
+
+        public TerminalNode Else() {
+            return getToken(YJSParser.Else, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_ifStatement;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterIfStatement(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitIfStatement(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitIfStatement(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class IterationStatementContext extends ParserRuleContext {
+        public IterationStatementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public IterationStatementContext() {
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_iterationStatement;
+        }
+
+        public void copyFrom(IterationStatementContext ctx) {
+            super.copyFrom(ctx);
+        }
+    }
+
+    public static class DoStatementContext extends IterationStatementContext {
+        public DoStatementContext(IterationStatementContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public TerminalNode Do() {
+            return getToken(YJSParser.Do, 0);
+        }
+
+        public StatementContext statement() {
+            return getRuleContext(StatementContext.class, 0);
+        }
+
+        public TerminalNode While() {
+            return getToken(YJSParser.While, 0);
+        }
+
+        public TerminalNode OpenParen() {
+            return getToken(YJSParser.OpenParen, 0);
+        }
+
+        public ExpressionSequenceContext expressionSequence() {
+            return getRuleContext(ExpressionSequenceContext.class, 0);
+        }
+
+        public TerminalNode CloseParen() {
+            return getToken(YJSParser.CloseParen, 0);
+        }
+
+        public EosContext eos() {
+            return getRuleContext(EosContext.class, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterDoStatement(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitDoStatement(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitDoStatement(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ForVarStatementContext extends IterationStatementContext {
+        public ForVarStatementContext(IterationStatementContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public TerminalNode For() {
+            return getToken(YJSParser.For, 0);
+        }
+
+        public TerminalNode OpenParen() {
+            return getToken(YJSParser.OpenParen, 0);
+        }
+
+        public VarModifierContext varModifier() {
+            return getRuleContext(VarModifierContext.class, 0);
+        }
+
+        public VariableDeclarationListContext variableDeclarationList() {
+            return getRuleContext(VariableDeclarationListContext.class, 0);
+        }
+
+        public List<TerminalNode> SemiColon() {
+            return getTokens(YJSParser.SemiColon);
+        }
+
+        public TerminalNode SemiColon(int i) {
+            return getToken(YJSParser.SemiColon, i);
+        }
+
+        public TerminalNode CloseParen() {
+            return getToken(YJSParser.CloseParen, 0);
+        }
+
+        public StatementContext statement() {
+            return getRuleContext(StatementContext.class, 0);
+        }
+
+        public List<ExpressionSequenceContext> expressionSequence() {
+            return getRuleContexts(ExpressionSequenceContext.class);
+        }
+
+        public ExpressionSequenceContext expressionSequence(int i) {
+            return getRuleContext(ExpressionSequenceContext.class, i);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterForVarStatement(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitForVarStatement(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitForVarStatement(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ForVarInStatementContext extends IterationStatementContext {
+        public ForVarInStatementContext(IterationStatementContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public TerminalNode For() {
+            return getToken(YJSParser.For, 0);
+        }
+
+        public TerminalNode OpenParen() {
+            return getToken(YJSParser.OpenParen, 0);
+        }
+
+        public VarModifierContext varModifier() {
+            return getRuleContext(VarModifierContext.class, 0);
+        }
+
+        public VariableDeclarationContext variableDeclaration() {
+            return getRuleContext(VariableDeclarationContext.class, 0);
+        }
+
+        public ExpressionSequenceContext expressionSequence() {
+            return getRuleContext(ExpressionSequenceContext.class, 0);
+        }
+
+        public TerminalNode CloseParen() {
+            return getToken(YJSParser.CloseParen, 0);
+        }
+
+        public StatementContext statement() {
+            return getRuleContext(StatementContext.class, 0);
+        }
+
+        public TerminalNode In() {
+            return getToken(YJSParser.In, 0);
+        }
+
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterForVarInStatement(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitForVarInStatement(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitForVarInStatement(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class WhileStatementContext extends IterationStatementContext {
+        public WhileStatementContext(IterationStatementContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public TerminalNode While() {
+            return getToken(YJSParser.While, 0);
+        }
+
+        public TerminalNode OpenParen() {
+            return getToken(YJSParser.OpenParen, 0);
+        }
+
+        public ExpressionSequenceContext expressionSequence() {
+            return getRuleContext(ExpressionSequenceContext.class, 0);
+        }
+
+        public TerminalNode CloseParen() {
+            return getToken(YJSParser.CloseParen, 0);
+        }
+
+        public StatementContext statement() {
+            return getRuleContext(StatementContext.class, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterWhileStatement(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitWhileStatement(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitWhileStatement(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ForStatementContext extends IterationStatementContext {
+        public ForStatementContext(IterationStatementContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public TerminalNode For() {
+            return getToken(YJSParser.For, 0);
+        }
+
+        public TerminalNode OpenParen() {
+            return getToken(YJSParser.OpenParen, 0);
+        }
+
+        public List<TerminalNode> SemiColon() {
+            return getTokens(YJSParser.SemiColon);
+        }
+
+        public TerminalNode SemiColon(int i) {
+            return getToken(YJSParser.SemiColon, i);
+        }
+
+        public TerminalNode CloseParen() {
+            return getToken(YJSParser.CloseParen, 0);
+        }
+
+        public StatementContext statement() {
+            return getRuleContext(StatementContext.class, 0);
+        }
+
+        public List<ExpressionSequenceContext> expressionSequence() {
+            return getRuleContexts(ExpressionSequenceContext.class);
+        }
+
+        public ExpressionSequenceContext expressionSequence(int i) {
+            return getRuleContext(ExpressionSequenceContext.class, i);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterForStatement(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitForStatement(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitForStatement(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ForInStatementContext extends IterationStatementContext {
+        public ForInStatementContext(IterationStatementContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public TerminalNode For() {
+            return getToken(YJSParser.For, 0);
+        }
+
+        public TerminalNode OpenParen() {
+            return getToken(YJSParser.OpenParen, 0);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        public ExpressionSequenceContext expressionSequence() {
+            return getRuleContext(ExpressionSequenceContext.class, 0);
+        }
+
+        public TerminalNode CloseParen() {
+            return getToken(YJSParser.CloseParen, 0);
+        }
+
+        public StatementContext statement() {
+            return getRuleContext(StatementContext.class, 0);
+        }
+
+        public TerminalNode In() {
+            return getToken(YJSParser.In, 0);
+        }
+
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterForInStatement(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitForInStatement(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitForInStatement(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class VarModifierContext extends ParserRuleContext {
+        public VarModifierContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode Var() {
+            return getToken(YJSParser.Var, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_varModifier;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterVarModifier(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitVarModifier(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitVarModifier(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ContinueStatementContext extends ParserRuleContext {
+        public ContinueStatementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode Continue() {
+            return getToken(YJSParser.Continue, 0);
+        }
+
+        public EosContext eos() {
+            return getRuleContext(EosContext.class, 0);
+        }
+
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_continueStatement;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterContinueStatement(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitContinueStatement(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitContinueStatement(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class BreakStatementContext extends ParserRuleContext {
+        public BreakStatementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode Break() {
+            return getToken(YJSParser.Break, 0);
+        }
+
+        public EosContext eos() {
+            return getRuleContext(EosContext.class, 0);
+        }
+
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_breakStatement;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterBreakStatement(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitBreakStatement(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitBreakStatement(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ReturnStatementContext extends ParserRuleContext {
+        public ReturnStatementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode Return() {
+            return getToken(YJSParser.Return, 0);
+        }
+
+        public EosContext eos() {
+            return getRuleContext(EosContext.class, 0);
+        }
+
+        public ExpressionSequenceContext expressionSequence() {
+            return getRuleContext(ExpressionSequenceContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_returnStatement;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterReturnStatement(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitReturnStatement(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitReturnStatement(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class WithStatementContext extends ParserRuleContext {
+        public WithStatementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode With() {
+            return getToken(YJSParser.With, 0);
+        }
+
+        public TerminalNode OpenParen() {
+            return getToken(YJSParser.OpenParen, 0);
+        }
+
+        public ExpressionSequenceContext expressionSequence() {
+            return getRuleContext(ExpressionSequenceContext.class, 0);
+        }
+
+        public TerminalNode CloseParen() {
+            return getToken(YJSParser.CloseParen, 0);
+        }
+
+        public StatementContext statement() {
+            return getRuleContext(StatementContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_withStatement;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterWithStatement(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitWithStatement(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitWithStatement(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class SwitchStatementContext extends ParserRuleContext {
+        public SwitchStatementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode Switch() {
+            return getToken(YJSParser.Switch, 0);
+        }
+
+        public TerminalNode OpenParen() {
+            return getToken(YJSParser.OpenParen, 0);
+        }
+
+        public ExpressionSequenceContext expressionSequence() {
+            return getRuleContext(ExpressionSequenceContext.class, 0);
+        }
+
+        public TerminalNode CloseParen() {
+            return getToken(YJSParser.CloseParen, 0);
+        }
+
+        public CaseBlockContext caseBlock() {
+            return getRuleContext(CaseBlockContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_switchStatement;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterSwitchStatement(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitSwitchStatement(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitSwitchStatement(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class CaseBlockContext extends ParserRuleContext {
+        public CaseBlockContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode OpenBrace() {
+            return getToken(YJSParser.OpenBrace, 0);
+        }
+
+        public TerminalNode CloseBrace() {
+            return getToken(YJSParser.CloseBrace, 0);
+        }
+
+        public List<CaseClausesContext> caseClauses() {
+            return getRuleContexts(CaseClausesContext.class);
+        }
+
+        public CaseClausesContext caseClauses(int i) {
+            return getRuleContext(CaseClausesContext.class, i);
+        }
+
+        public DefaultClauseContext defaultClause() {
+            return getRuleContext(DefaultClauseContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_caseBlock;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterCaseBlock(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitCaseBlock(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitCaseBlock(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class CaseClausesContext extends ParserRuleContext {
+        public CaseClausesContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public List<CaseClauseContext> caseClause() {
+            return getRuleContexts(CaseClauseContext.class);
+        }
+
+        public CaseClauseContext caseClause(int i) {
+            return getRuleContext(CaseClauseContext.class, i);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_caseClauses;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterCaseClauses(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitCaseClauses(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitCaseClauses(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class CaseClauseContext extends ParserRuleContext {
+        public CaseClauseContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode Case() {
+            return getToken(YJSParser.Case, 0);
+        }
+
+        public ExpressionSequenceContext expressionSequence() {
+            return getRuleContext(ExpressionSequenceContext.class, 0);
+        }
+
+        public TerminalNode Colon() {
+            return getToken(YJSParser.Colon, 0);
+        }
+
+        public StatementListContext statementList() {
+            return getRuleContext(StatementListContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_caseClause;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterCaseClause(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitCaseClause(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitCaseClause(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class DefaultClauseContext extends ParserRuleContext {
+        public DefaultClauseContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode Default() {
+            return getToken(YJSParser.Default, 0);
+        }
+
+        public TerminalNode Colon() {
+            return getToken(YJSParser.Colon, 0);
+        }
+
+        public StatementListContext statementList() {
+            return getRuleContext(StatementListContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_defaultClause;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterDefaultClause(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitDefaultClause(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitDefaultClause(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ThrowStatementContext extends ParserRuleContext {
+        public ThrowStatementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode Throw() {
+            return getToken(YJSParser.Throw, 0);
+        }
+
+        public ExpressionSequenceContext expressionSequence() {
+            return getRuleContext(ExpressionSequenceContext.class, 0);
+        }
+
+        public EosContext eos() {
+            return getRuleContext(EosContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_throwStatement;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterThrowStatement(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitThrowStatement(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitThrowStatement(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class TryStatementContext extends ParserRuleContext {
+        public TryStatementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode Try() {
+            return getToken(YJSParser.Try, 0);
+        }
+
+        public BlockContext block() {
+            return getRuleContext(BlockContext.class, 0);
+        }
+
+        public CatchProductionContext catchProduction() {
+            return getRuleContext(CatchProductionContext.class, 0);
+        }
+
+        public FinallyProductionContext finallyProduction() {
+            return getRuleContext(FinallyProductionContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_tryStatement;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterTryStatement(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitTryStatement(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitTryStatement(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class CatchProductionContext extends ParserRuleContext {
+        public CatchProductionContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode Catch() {
+            return getToken(YJSParser.Catch, 0);
+        }
+
+        public TerminalNode OpenParen() {
+            return getToken(YJSParser.OpenParen, 0);
+        }
+
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        public TerminalNode CloseParen() {
+            return getToken(YJSParser.CloseParen, 0);
+        }
+
+        public BlockContext block() {
+            return getRuleContext(BlockContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_catchProduction;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterCatchProduction(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitCatchProduction(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitCatchProduction(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class FinallyProductionContext extends ParserRuleContext {
+        public FinallyProductionContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode Finally() {
+            return getToken(YJSParser.Finally, 0);
+        }
+
+        public BlockContext block() {
+            return getRuleContext(BlockContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_finallyProduction;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterFinallyProduction(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitFinallyProduction(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitFinallyProduction(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class DebuggerStatementContext extends ParserRuleContext {
+        public DebuggerStatementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode Debugger() {
+            return getToken(YJSParser.Debugger, 0);
+        }
+
+        public EosContext eos() {
+            return getRuleContext(EosContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_debuggerStatement;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterDebuggerStatement(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitDebuggerStatement(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitDebuggerStatement(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class FunctionDeclarationContext extends ParserRuleContext {
+        public FunctionDeclarationContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode Function() {
+            return getToken(YJSParser.Function, 0);
+        }
+
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        public TerminalNode OpenParen() {
+            return getToken(YJSParser.OpenParen, 0);
+        }
+
+        public TerminalNode CloseParen() {
+            return getToken(YJSParser.CloseParen, 0);
+        }
+
+        public TerminalNode OpenBrace() {
+            return getToken(YJSParser.OpenBrace, 0);
+        }
+
+        public FunctionBodyContext functionBody() {
+            return getRuleContext(FunctionBodyContext.class, 0);
+        }
+
+        public TerminalNode CloseBrace() {
+            return getToken(YJSParser.CloseBrace, 0);
+        }
+
+        public AnnotationsContext annotations() {
+            return getRuleContext(AnnotationsContext.class, 0);
+        }
+
+        public TerminalNode Export() {
+            return getToken(YJSParser.Export, 0);
+        }
+
+        public FormalParameterListContext formalParameterList() {
+            return getRuleContext(FormalParameterListContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_functionDeclaration;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterFunctionDeclaration(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitFunctionDeclaration(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitFunctionDeclaration(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ClassDeclarationContext extends ParserRuleContext {
+        public ClassDeclarationContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode Class() {
+            return getToken(YJSParser.Class, 0);
+        }
+
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        public ClassTailContext classTail() {
+            return getRuleContext(ClassTailContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_classDeclaration;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterClassDeclaration(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitClassDeclaration(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitClassDeclaration(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ClassTailContext extends ParserRuleContext {
+        public ClassTailContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode OpenBrace() {
+            return getToken(YJSParser.OpenBrace, 0);
+        }
+
+        public TerminalNode CloseBrace() {
+            return getToken(YJSParser.CloseBrace, 0);
+        }
+
+        public TerminalNode Extends() {
+            return getToken(YJSParser.Extends, 0);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        public List<ClassElementContext> classElement() {
+            return getRuleContexts(ClassElementContext.class);
+        }
+
+        public ClassElementContext classElement(int i) {
+            return getRuleContext(ClassElementContext.class, i);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_classTail;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterClassTail(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitClassTail(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitClassTail(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ClassElementContext extends ParserRuleContext {
+        public ClassElementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public MethodDefinitionContext methodDefinition() {
+            return getRuleContext(MethodDefinitionContext.class, 0);
+        }
+
+        public TerminalNode Static() {
+            return getToken(YJSParser.Static, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_classElement;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterClassElement(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitClassElement(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitClassElement(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class MethodDefinitionContext extends ParserRuleContext {
+        public MethodDefinitionContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public PropertyNameContext propertyName() {
+            return getRuleContext(PropertyNameContext.class, 0);
+        }
+
+        public TerminalNode OpenParen() {
+            return getToken(YJSParser.OpenParen, 0);
+        }
+
+        public TerminalNode CloseParen() {
+            return getToken(YJSParser.CloseParen, 0);
+        }
+
+        public TerminalNode OpenBrace() {
+            return getToken(YJSParser.OpenBrace, 0);
+        }
+
+        public FunctionBodyContext functionBody() {
+            return getRuleContext(FunctionBodyContext.class, 0);
+        }
+
+        public TerminalNode CloseBrace() {
+            return getToken(YJSParser.CloseBrace, 0);
+        }
+
+        public FormalParameterListContext formalParameterList() {
+            return getRuleContext(FormalParameterListContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_methodDefinition;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterMethodDefinition(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitMethodDefinition(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitMethodDefinition(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class FormalParameterListContext extends ParserRuleContext {
+        public FormalParameterListContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public List<FormalParameterArgContext> formalParameterArg() {
+            return getRuleContexts(FormalParameterArgContext.class);
+        }
+
+        public FormalParameterArgContext formalParameterArg(int i) {
+            return getRuleContext(FormalParameterArgContext.class, i);
+        }
+
+        public List<TerminalNode> Comma() {
+            return getTokens(YJSParser.Comma);
+        }
+
+        public TerminalNode Comma(int i) {
+            return getToken(YJSParser.Comma, i);
+        }
+
+        public LastFormalParameterArgContext lastFormalParameterArg() {
+            return getRuleContext(LastFormalParameterArgContext.class, 0);
+        }
+
+        public ArrayLiteralContext arrayLiteral() {
+            return getRuleContext(ArrayLiteralContext.class, 0);
+        }
+
+        public ObjectLiteralContext objectLiteral() {
+            return getRuleContext(ObjectLiteralContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_formalParameterList;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterFormalParameterList(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitFormalParameterList(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitFormalParameterList(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class FormalParameterArgContext extends ParserRuleContext {
+        public FormalParameterArgContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        public TerminalNode Assign() {
+            return getToken(YJSParser.Assign, 0);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_formalParameterArg;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterFormalParameterArg(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitFormalParameterArg(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitFormalParameterArg(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class LastFormalParameterArgContext extends ParserRuleContext {
+        public LastFormalParameterArgContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode Ellipsis() {
+            return getToken(YJSParser.Ellipsis, 0);
+        }
+
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_lastFormalParameterArg;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterLastFormalParameterArg(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitLastFormalParameterArg(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitLastFormalParameterArg(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class FunctionBodyContext extends ParserRuleContext {
+        public FunctionBodyContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public SourceElementsContext sourceElements() {
+            return getRuleContext(SourceElementsContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_functionBody;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterFunctionBody(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitFunctionBody(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitFunctionBody(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class SourceElementsContext extends ParserRuleContext {
+        public SourceElementsContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public List<SourceElementContext> sourceElement() {
+            return getRuleContexts(SourceElementContext.class);
+        }
+
+        public SourceElementContext sourceElement(int i) {
+            return getRuleContext(SourceElementContext.class, i);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_sourceElements;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterSourceElements(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitSourceElements(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitSourceElements(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ArrayLiteralContext extends ParserRuleContext {
+        public ArrayLiteralContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode OpenBracket() {
+            return getToken(YJSParser.OpenBracket, 0);
+        }
+
+        public TerminalNode CloseBracket() {
+            return getToken(YJSParser.CloseBracket, 0);
+        }
+
+        public List<TerminalNode> Comma() {
+            return getTokens(YJSParser.Comma);
+        }
+
+        public TerminalNode Comma(int i) {
+            return getToken(YJSParser.Comma, i);
+        }
+
+        public ElementListContext elementList() {
+            return getRuleContext(ElementListContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_arrayLiteral;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterArrayLiteral(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitArrayLiteral(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitArrayLiteral(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ElementListContext extends ParserRuleContext {
+        public ElementListContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public List<SingleExpressionContext> singleExpression() {
+            return getRuleContexts(SingleExpressionContext.class);
+        }
+
+        public SingleExpressionContext singleExpression(int i) {
+            return getRuleContext(SingleExpressionContext.class, i);
+        }
+
+        public LastElementContext lastElement() {
+            return getRuleContext(LastElementContext.class, 0);
+        }
+
+        public List<TerminalNode> Comma() {
+            return getTokens(YJSParser.Comma);
+        }
+
+        public TerminalNode Comma(int i) {
+            return getToken(YJSParser.Comma, i);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_elementList;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterElementList(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitElementList(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitElementList(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class LastElementContext extends ParserRuleContext {
+        public LastElementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode Ellipsis() {
+            return getToken(YJSParser.Ellipsis, 0);
+        }
+
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_lastElement;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterLastElement(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitLastElement(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitLastElement(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ObjectLiteralContext extends ParserRuleContext {
+        public ObjectLiteralContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode OpenBrace() {
+            return getToken(YJSParser.OpenBrace, 0);
+        }
+
+        public TerminalNode CloseBrace() {
+            return getToken(YJSParser.CloseBrace, 0);
+        }
+
+        public List<PropertyAssignmentContext> propertyAssignment() {
+            return getRuleContexts(PropertyAssignmentContext.class);
+        }
+
+        public PropertyAssignmentContext propertyAssignment(int i) {
+            return getRuleContext(PropertyAssignmentContext.class, i);
+        }
+
+        public List<TerminalNode> Comma() {
+            return getTokens(YJSParser.Comma);
+        }
+
+        public TerminalNode Comma(int i) {
+            return getToken(YJSParser.Comma, i);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_objectLiteral;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterObjectLiteral(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitObjectLiteral(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitObjectLiteral(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class PropertyAssignmentContext extends ParserRuleContext {
+        public PropertyAssignmentContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public PropertyAssignmentContext() {
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_propertyAssignment;
+        }
+
+        public void copyFrom(PropertyAssignmentContext ctx) {
+            super.copyFrom(ctx);
+        }
+    }
+
+    public static class PropertyExpressionAssignmentContext extends PropertyAssignmentContext {
+        public PropertyExpressionAssignmentContext(PropertyAssignmentContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public PropertyNameContext propertyName() {
+            return getRuleContext(PropertyNameContext.class, 0);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        public TerminalNode Colon() {
+            return getToken(YJSParser.Colon, 0);
+        }
+
+        public TerminalNode Assign() {
+            return getToken(YJSParser.Assign, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener)
+                ((YJSParserListener) listener).enterPropertyExpressionAssignment(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener)
+                ((YJSParserListener) listener).exitPropertyExpressionAssignment(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitPropertyExpressionAssignment(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ComputedPropertyExpressionAssignmentContext extends PropertyAssignmentContext {
+        public ComputedPropertyExpressionAssignmentContext(PropertyAssignmentContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public TerminalNode OpenBracket() {
+            return getToken(YJSParser.OpenBracket, 0);
+        }
+
+        public List<SingleExpressionContext> singleExpression() {
+            return getRuleContexts(SingleExpressionContext.class);
+        }
+
+        public SingleExpressionContext singleExpression(int i) {
+            return getRuleContext(SingleExpressionContext.class, i);
+        }
+
+        public TerminalNode CloseBracket() {
+            return getToken(YJSParser.CloseBracket, 0);
+        }
+
+        public TerminalNode Colon() {
+            return getToken(YJSParser.Colon, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener)
+                ((YJSParserListener) listener).enterComputedPropertyExpressionAssignment(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener)
+                ((YJSParserListener) listener).exitComputedPropertyExpressionAssignment(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitComputedPropertyExpressionAssignment(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class PropertyShorthandContext extends PropertyAssignmentContext {
+        public PropertyShorthandContext(PropertyAssignmentContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterPropertyShorthand(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitPropertyShorthand(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitPropertyShorthand(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class PropertyNameContext extends ParserRuleContext {
+        public PropertyNameContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public IdentifierNameContext identifierName() {
+            return getRuleContext(IdentifierNameContext.class, 0);
+        }
+
+        public TerminalNode StringLiteral() {
+            return getToken(YJSParser.StringLiteral, 0);
+        }
+
+        public NumericLiteralContext numericLiteral() {
+            return getRuleContext(NumericLiteralContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_propertyName;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterPropertyName(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitPropertyName(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitPropertyName(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ArgumentsContext extends ParserRuleContext {
+        public ArgumentsContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode OpenParen() {
+            return getToken(YJSParser.OpenParen, 0);
+        }
+
+        public TerminalNode CloseParen() {
+            return getToken(YJSParser.CloseParen, 0);
+        }
+
+        public List<SingleExpressionContext> singleExpression() {
+            return getRuleContexts(SingleExpressionContext.class);
+        }
+
+        public SingleExpressionContext singleExpression(int i) {
+            return getRuleContext(SingleExpressionContext.class, i);
+        }
+
+        public LastArgumentContext lastArgument() {
+            return getRuleContext(LastArgumentContext.class, 0);
+        }
+
+        public List<TerminalNode> Comma() {
+            return getTokens(YJSParser.Comma);
+        }
+
+        public TerminalNode Comma(int i) {
+            return getToken(YJSParser.Comma, i);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_arguments;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterArguments(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitArguments(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitArguments(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class LastArgumentContext extends ParserRuleContext {
+        public LastArgumentContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode Ellipsis() {
+            return getToken(YJSParser.Ellipsis, 0);
+        }
+
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_lastArgument;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterLastArgument(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitLastArgument(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitLastArgument(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ExpressionSequenceContext extends ParserRuleContext {
+        public ExpressionSequenceContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public List<SingleExpressionContext> singleExpression() {
+            return getRuleContexts(SingleExpressionContext.class);
+        }
+
+        public SingleExpressionContext singleExpression(int i) {
+            return getRuleContext(SingleExpressionContext.class, i);
+        }
+
+        public List<TerminalNode> Comma() {
+            return getTokens(YJSParser.Comma);
+        }
+
+        public TerminalNode Comma(int i) {
+            return getToken(YJSParser.Comma, i);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_expressionSequence;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterExpressionSequence(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitExpressionSequence(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitExpressionSequence(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class SingleExpressionContext extends ParserRuleContext {
+        public SingleExpressionContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public SingleExpressionContext() {
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_singleExpression;
+        }
+
+        public void copyFrom(SingleExpressionContext ctx) {
+            super.copyFrom(ctx);
+        }
+    }
+
+    public static class TemplateStringExpressionContext extends SingleExpressionContext {
+        public TemplateStringExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        public TerminalNode TemplateStringLiteral() {
+            return getToken(YJSParser.TemplateStringLiteral, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener)
+                ((YJSParserListener) listener).enterTemplateStringExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener)
+                ((YJSParserListener) listener).exitTemplateStringExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitTemplateStringExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class TernaryExpressionContext extends SingleExpressionContext {
+        public TernaryExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public List<SingleExpressionContext> singleExpression() {
+            return getRuleContexts(SingleExpressionContext.class);
+        }
+
+        public SingleExpressionContext singleExpression(int i) {
+            return getRuleContext(SingleExpressionContext.class, i);
+        }
+
+        public TerminalNode QuestionMark() {
+            return getToken(YJSParser.QuestionMark, 0);
+        }
+
+        public TerminalNode Colon() {
+            return getToken(YJSParser.Colon, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterTernaryExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitTernaryExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitTernaryExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class LogicalAndExpressionContext extends SingleExpressionContext {
+        public LogicalAndExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public List<SingleExpressionContext> singleExpression() {
+            return getRuleContexts(SingleExpressionContext.class);
+        }
+
+        public SingleExpressionContext singleExpression(int i) {
+            return getRuleContext(SingleExpressionContext.class, i);
+        }
+
+        public TerminalNode And() {
+            return getToken(YJSParser.And, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterLogicalAndExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitLogicalAndExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitLogicalAndExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class PreIncrementExpressionContext extends SingleExpressionContext {
+        public PreIncrementExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public TerminalNode PlusPlus() {
+            return getToken(YJSParser.PlusPlus, 0);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterPreIncrementExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitPreIncrementExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitPreIncrementExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ObjectLiteralExpressionContext extends SingleExpressionContext {
+        public ObjectLiteralExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public ObjectLiteralContext objectLiteral() {
+            return getRuleContext(ObjectLiteralContext.class, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener)
+                ((YJSParserListener) listener).enterObjectLiteralExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitObjectLiteralExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitObjectLiteralExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class InExpressionContext extends SingleExpressionContext {
+        public InExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public List<SingleExpressionContext> singleExpression() {
+            return getRuleContexts(SingleExpressionContext.class);
+        }
+
+        public SingleExpressionContext singleExpression(int i) {
+            return getRuleContext(SingleExpressionContext.class, i);
+        }
+
+        public TerminalNode In() {
+            return getToken(YJSParser.In, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterInExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitInExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitInExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class LogicalOrExpressionContext extends SingleExpressionContext {
+        public LogicalOrExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public List<SingleExpressionContext> singleExpression() {
+            return getRuleContexts(SingleExpressionContext.class);
+        }
+
+        public SingleExpressionContext singleExpression(int i) {
+            return getRuleContext(SingleExpressionContext.class, i);
+        }
+
+        public TerminalNode Or() {
+            return getToken(YJSParser.Or, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterLogicalOrExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitLogicalOrExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitLogicalOrExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class NotExpressionContext extends SingleExpressionContext {
+        public NotExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public TerminalNode Not() {
+            return getToken(YJSParser.Not, 0);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterNotExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitNotExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitNotExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class PreDecreaseExpressionContext extends SingleExpressionContext {
+        public PreDecreaseExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public TerminalNode MinusMinus() {
+            return getToken(YJSParser.MinusMinus, 0);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterPreDecreaseExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitPreDecreaseExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitPreDecreaseExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ArgumentsExpressionContext extends SingleExpressionContext {
+        public ArgumentsExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        public ArgumentsContext arguments() {
+            return getRuleContext(ArgumentsContext.class, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterArgumentsExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitArgumentsExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitArgumentsExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ThisExpressionContext extends SingleExpressionContext {
+        public ThisExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public TerminalNode This() {
+            return getToken(YJSParser.This, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterThisExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitThisExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitThisExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class UnaryMinusExpressionContext extends SingleExpressionContext {
+        public UnaryMinusExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public TerminalNode Minus() {
+            return getToken(YJSParser.Minus, 0);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterUnaryMinusExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitUnaryMinusExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitUnaryMinusExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class AssignmentExpressionContext extends SingleExpressionContext {
+        public AssignmentExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public List<SingleExpressionContext> singleExpression() {
+            return getRuleContexts(SingleExpressionContext.class);
+        }
+
+        public SingleExpressionContext singleExpression(int i) {
+            return getRuleContext(SingleExpressionContext.class, i);
+        }
+
+        public TerminalNode Assign() {
+            return getToken(YJSParser.Assign, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterAssignmentExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitAssignmentExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitAssignmentExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class PostDecreaseExpressionContext extends SingleExpressionContext {
+        public PostDecreaseExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        public TerminalNode MinusMinus() {
+            return getToken(YJSParser.MinusMinus, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterPostDecreaseExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitPostDecreaseExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitPostDecreaseExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class TypeofExpressionContext extends SingleExpressionContext {
+        public TypeofExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public TerminalNode Typeof() {
+            return getToken(YJSParser.Typeof, 0);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterTypeofExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitTypeofExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitTypeofExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class InstanceofExpressionContext extends SingleExpressionContext {
+        public InstanceofExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public List<SingleExpressionContext> singleExpression() {
+            return getRuleContexts(SingleExpressionContext.class);
+        }
+
+        public SingleExpressionContext singleExpression(int i) {
+            return getRuleContext(SingleExpressionContext.class, i);
+        }
+
+        public TerminalNode Instanceof() {
+            return getToken(YJSParser.Instanceof, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterInstanceofExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitInstanceofExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitInstanceofExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class UnaryPlusExpressionContext extends SingleExpressionContext {
+        public UnaryPlusExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public TerminalNode Plus() {
+            return getToken(YJSParser.Plus, 0);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterUnaryPlusExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitUnaryPlusExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitUnaryPlusExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ArrowFunctionExpressionContext extends SingleExpressionContext {
+        public ArrowFunctionExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public ArrowFunctionParametersContext arrowFunctionParameters() {
+            return getRuleContext(ArrowFunctionParametersContext.class, 0);
+        }
+
+        public TerminalNode ARROW() {
+            return getToken(YJSParser.ARROW, 0);
+        }
+
+        public ArrowFunctionBodyContext arrowFunctionBody() {
+            return getRuleContext(ArrowFunctionBodyContext.class, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener)
+                ((YJSParserListener) listener).enterArrowFunctionExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitArrowFunctionExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitArrowFunctionExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class EqualityExpressionContext extends SingleExpressionContext {
+        public EqualityExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public List<SingleExpressionContext> singleExpression() {
+            return getRuleContexts(SingleExpressionContext.class);
+        }
+
+        public SingleExpressionContext singleExpression(int i) {
+            return getRuleContext(SingleExpressionContext.class, i);
+        }
+
+        public TerminalNode Equals_() {
+            return getToken(YJSParser.Equals_, 0);
+        }
+
+        public TerminalNode NotEquals() {
+            return getToken(YJSParser.NotEquals, 0);
+        }
+
+        public TerminalNode IdentityEquals() {
+            return getToken(YJSParser.IdentityEquals, 0);
+        }
+
+        public TerminalNode IdentityNotEquals() {
+            return getToken(YJSParser.IdentityNotEquals, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterEqualityExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitEqualityExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitEqualityExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class BitXOrExpressionContext extends SingleExpressionContext {
+        public BitXOrExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public List<SingleExpressionContext> singleExpression() {
+            return getRuleContexts(SingleExpressionContext.class);
+        }
+
+        public SingleExpressionContext singleExpression(int i) {
+            return getRuleContext(SingleExpressionContext.class, i);
+        }
+
+        public TerminalNode BitXOr() {
+            return getToken(YJSParser.BitXOr, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterBitXOrExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitBitXOrExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitBitXOrExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class SuperExpressionContext extends SingleExpressionContext {
+        public SuperExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public TerminalNode Super() {
+            return getToken(YJSParser.Super, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterSuperExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitSuperExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitSuperExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class MultiplicativeExpressionContext extends SingleExpressionContext {
+        public MultiplicativeExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public List<SingleExpressionContext> singleExpression() {
+            return getRuleContexts(SingleExpressionContext.class);
+        }
+
+        public SingleExpressionContext singleExpression(int i) {
+            return getRuleContext(SingleExpressionContext.class, i);
+        }
+
+        public TerminalNode Multiply() {
+            return getToken(YJSParser.Multiply, 0);
+        }
+
+        public TerminalNode Divide() {
+            return getToken(YJSParser.Divide, 0);
+        }
+
+        public TerminalNode Modulus() {
+            return getToken(YJSParser.Modulus, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener)
+                ((YJSParserListener) listener).enterMultiplicativeExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener)
+                ((YJSParserListener) listener).exitMultiplicativeExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitMultiplicativeExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class BitShiftExpressionContext extends SingleExpressionContext {
+        public BitShiftExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public List<SingleExpressionContext> singleExpression() {
+            return getRuleContexts(SingleExpressionContext.class);
+        }
+
+        public SingleExpressionContext singleExpression(int i) {
+            return getRuleContext(SingleExpressionContext.class, i);
+        }
+
+        public TerminalNode LeftShiftArithmetic() {
+            return getToken(YJSParser.LeftShiftArithmetic, 0);
+        }
+
+        public TerminalNode RightShiftArithmetic() {
+            return getToken(YJSParser.RightShiftArithmetic, 0);
+        }
+
+        public TerminalNode RightShiftLogical() {
+            return getToken(YJSParser.RightShiftLogical, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterBitShiftExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitBitShiftExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitBitShiftExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ParenthesizedExpressionContext extends SingleExpressionContext {
+        public ParenthesizedExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public TerminalNode OpenParen() {
+            return getToken(YJSParser.OpenParen, 0);
+        }
+
+        public ExpressionSequenceContext expressionSequence() {
+            return getRuleContext(ExpressionSequenceContext.class, 0);
+        }
+
+        public TerminalNode CloseParen() {
+            return getToken(YJSParser.CloseParen, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener)
+                ((YJSParserListener) listener).enterParenthesizedExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitParenthesizedExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitParenthesizedExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class AdditiveExpressionContext extends SingleExpressionContext {
+        public AdditiveExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public List<SingleExpressionContext> singleExpression() {
+            return getRuleContexts(SingleExpressionContext.class);
+        }
+
+        public SingleExpressionContext singleExpression(int i) {
+            return getRuleContext(SingleExpressionContext.class, i);
+        }
+
+        public TerminalNode Plus() {
+            return getToken(YJSParser.Plus, 0);
+        }
+
+        public TerminalNode Minus() {
+            return getToken(YJSParser.Minus, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterAdditiveExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitAdditiveExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitAdditiveExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class RelationalExpressionContext extends SingleExpressionContext {
+        public RelationalExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public List<SingleExpressionContext> singleExpression() {
+            return getRuleContexts(SingleExpressionContext.class);
+        }
+
+        public SingleExpressionContext singleExpression(int i) {
+            return getRuleContext(SingleExpressionContext.class, i);
+        }
+
+        public TerminalNode LessThan() {
+            return getToken(YJSParser.LessThan, 0);
+        }
+
+        public TerminalNode MoreThan() {
+            return getToken(YJSParser.MoreThan, 0);
+        }
+
+        public TerminalNode LessThanEquals() {
+            return getToken(YJSParser.LessThanEquals, 0);
+        }
+
+        public TerminalNode GreaterThanEquals() {
+            return getToken(YJSParser.GreaterThanEquals, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterRelationalExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitRelationalExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitRelationalExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class PostIncrementExpressionContext extends SingleExpressionContext {
+        public PostIncrementExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        public TerminalNode PlusPlus() {
+            return getToken(YJSParser.PlusPlus, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener)
+                ((YJSParserListener) listener).enterPostIncrementExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitPostIncrementExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitPostIncrementExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class BitNotExpressionContext extends SingleExpressionContext {
+        public BitNotExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public TerminalNode BitNot() {
+            return getToken(YJSParser.BitNot, 0);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterBitNotExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitBitNotExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitBitNotExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class NewExpressionContext extends SingleExpressionContext {
+        public NewExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public TerminalNode New() {
+            return getToken(YJSParser.New, 0);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        public ArgumentsContext arguments() {
+            return getRuleContext(ArgumentsContext.class, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterNewExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitNewExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitNewExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class LiteralExpressionContext extends SingleExpressionContext {
+        public LiteralExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public LiteralContext literal() {
+            return getRuleContext(LiteralContext.class, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterLiteralExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitLiteralExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitLiteralExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ArrayLiteralExpressionContext extends SingleExpressionContext {
+        public ArrayLiteralExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public ArrayLiteralContext arrayLiteral() {
+            return getRuleContext(ArrayLiteralContext.class, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterArrayLiteralExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitArrayLiteralExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitArrayLiteralExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class MemberDotExpressionContext extends SingleExpressionContext {
+        public MemberDotExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        public TerminalNode Dot() {
+            return getToken(YJSParser.Dot, 0);
+        }
+
+        public IdentifierNameContext identifierName() {
+            return getRuleContext(IdentifierNameContext.class, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterMemberDotExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitMemberDotExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitMemberDotExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class MemberIndexExpressionContext extends SingleExpressionContext {
+        public MemberIndexExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        public TerminalNode OpenBracket() {
+            return getToken(YJSParser.OpenBracket, 0);
+        }
+
+        public ExpressionSequenceContext expressionSequence() {
+            return getRuleContext(ExpressionSequenceContext.class, 0);
+        }
+
+        public TerminalNode CloseBracket() {
+            return getToken(YJSParser.CloseBracket, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterMemberIndexExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitMemberIndexExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitMemberIndexExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class IdentifierExpressionContext extends SingleExpressionContext {
+        public IdentifierExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterIdentifierExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitIdentifierExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitIdentifierExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class BitAndExpressionContext extends SingleExpressionContext {
+        public BitAndExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public List<SingleExpressionContext> singleExpression() {
+            return getRuleContexts(SingleExpressionContext.class);
+        }
+
+        public SingleExpressionContext singleExpression(int i) {
+            return getRuleContext(SingleExpressionContext.class, i);
+        }
+
+        public TerminalNode BitAnd() {
+            return getToken(YJSParser.BitAnd, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterBitAndExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitBitAndExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitBitAndExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class BitOrExpressionContext extends SingleExpressionContext {
+        public BitOrExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public List<SingleExpressionContext> singleExpression() {
+            return getRuleContexts(SingleExpressionContext.class);
+        }
+
+        public SingleExpressionContext singleExpression(int i) {
+            return getRuleContext(SingleExpressionContext.class, i);
+        }
+
+        public TerminalNode BitOr() {
+            return getToken(YJSParser.BitOr, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterBitOrExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitBitOrExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitBitOrExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class AssignmentOperatorExpressionContext extends SingleExpressionContext {
+        public AssignmentOperatorExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        public List<SingleExpressionContext> singleExpression() {
+            return getRuleContexts(SingleExpressionContext.class);
+        }
+
+        public SingleExpressionContext singleExpression(int i) {
+            return getRuleContext(SingleExpressionContext.class, i);
+        }
+
+        public AssignmentOperatorContext assignmentOperator() {
+            return getRuleContext(AssignmentOperatorContext.class, 0);
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener)
+                ((YJSParserListener) listener).enterAssignmentOperatorExpression(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener)
+                ((YJSParserListener) listener).exitAssignmentOperatorExpression(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitAssignmentOperatorExpression(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ArrowFunctionParametersContext extends ParserRuleContext {
+        public ArrowFunctionParametersContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        public TerminalNode OpenParen() {
+            return getToken(YJSParser.OpenParen, 0);
+        }
+
+        public TerminalNode CloseParen() {
+            return getToken(YJSParser.CloseParen, 0);
+        }
+
+        public FormalParameterListContext formalParameterList() {
+            return getRuleContext(FormalParameterListContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_arrowFunctionParameters;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener)
+                ((YJSParserListener) listener).enterArrowFunctionParameters(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitArrowFunctionParameters(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitArrowFunctionParameters(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ArrowFunctionBodyContext extends ParserRuleContext {
+        public ArrowFunctionBodyContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        public TerminalNode OpenBrace() {
+            return getToken(YJSParser.OpenBrace, 0);
+        }
+
+        public FunctionBodyContext functionBody() {
+            return getRuleContext(FunctionBodyContext.class, 0);
+        }
+
+        public TerminalNode CloseBrace() {
+            return getToken(YJSParser.CloseBrace, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_arrowFunctionBody;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterArrowFunctionBody(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitArrowFunctionBody(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitArrowFunctionBody(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class AssignmentOperatorContext extends ParserRuleContext {
+        public AssignmentOperatorContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode MultiplyAssign() {
+            return getToken(YJSParser.MultiplyAssign, 0);
+        }
+
+        public TerminalNode DivideAssign() {
+            return getToken(YJSParser.DivideAssign, 0);
+        }
+
+        public TerminalNode ModulusAssign() {
+            return getToken(YJSParser.ModulusAssign, 0);
+        }
+
+        public TerminalNode PlusAssign() {
+            return getToken(YJSParser.PlusAssign, 0);
+        }
+
+        public TerminalNode MinusAssign() {
+            return getToken(YJSParser.MinusAssign, 0);
+        }
+
+        public TerminalNode LeftShiftArithmeticAssign() {
+            return getToken(YJSParser.LeftShiftArithmeticAssign, 0);
+        }
+
+        public TerminalNode RightShiftArithmeticAssign() {
+            return getToken(YJSParser.RightShiftArithmeticAssign, 0);
+        }
+
+        public TerminalNode RightShiftLogicalAssign() {
+            return getToken(YJSParser.RightShiftLogicalAssign, 0);
+        }
+
+        public TerminalNode BitAndAssign() {
+            return getToken(YJSParser.BitAndAssign, 0);
+        }
+
+        public TerminalNode BitXorAssign() {
+            return getToken(YJSParser.BitXorAssign, 0);
+        }
+
+        public TerminalNode BitOrAssign() {
+            return getToken(YJSParser.BitOrAssign, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_assignmentOperator;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterAssignmentOperator(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitAssignmentOperator(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitAssignmentOperator(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class LiteralContext extends ParserRuleContext {
+        public LiteralContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode NullLiteral() {
+            return getToken(YJSParser.NullLiteral, 0);
+        }
+
+        public TerminalNode BooleanLiteral() {
+            return getToken(YJSParser.BooleanLiteral, 0);
+        }
+
+        public TerminalNode StringLiteral() {
+            return getToken(YJSParser.StringLiteral, 0);
+        }
+
+        public TerminalNode TemplateStringLiteral() {
+            return getToken(YJSParser.TemplateStringLiteral, 0);
+        }
+
+        public TerminalNode RegularExpressionLiteral() {
+            return getToken(YJSParser.RegularExpressionLiteral, 0);
+        }
+
+        public NumericLiteralContext numericLiteral() {
+            return getRuleContext(NumericLiteralContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_literal;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterLiteral(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitLiteral(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitLiteral(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class NumericLiteralContext extends ParserRuleContext {
+        public NumericLiteralContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode DecimalLiteral() {
+            return getToken(YJSParser.DecimalLiteral, 0);
+        }
+
+        public TerminalNode HexIntegerLiteral() {
+            return getToken(YJSParser.HexIntegerLiteral, 0);
+        }
+
+        public TerminalNode OctalIntegerLiteral() {
+            return getToken(YJSParser.OctalIntegerLiteral, 0);
+        }
+
+        public TerminalNode OctalIntegerLiteral2() {
+            return getToken(YJSParser.OctalIntegerLiteral2, 0);
+        }
+
+        public TerminalNode BinaryIntegerLiteral() {
+            return getToken(YJSParser.BinaryIntegerLiteral, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_numericLiteral;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterNumericLiteral(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitNumericLiteral(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitNumericLiteral(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class IdentifierNameContext extends ParserRuleContext {
+        public IdentifierNameContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        public ReservedWordContext reservedWord() {
+            return getRuleContext(ReservedWordContext.class, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_identifierName;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterIdentifierName(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitIdentifierName(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitIdentifierName(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class ReservedWordContext extends ParserRuleContext {
+        public ReservedWordContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public KeywordContext keyword() {
+            return getRuleContext(KeywordContext.class, 0);
+        }
+
+        public TerminalNode NullLiteral() {
+            return getToken(YJSParser.NullLiteral, 0);
+        }
+
+        public TerminalNode BooleanLiteral() {
+            return getToken(YJSParser.BooleanLiteral, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_reservedWord;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterReservedWord(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitReservedWord(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitReservedWord(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class KeywordContext extends ParserRuleContext {
+        public KeywordContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode Break() {
+            return getToken(YJSParser.Break, 0);
+        }
+
+        public TerminalNode Do() {
+            return getToken(YJSParser.Do, 0);
+        }
+
+        public TerminalNode Instanceof() {
+            return getToken(YJSParser.Instanceof, 0);
+        }
+
+        public TerminalNode Typeof() {
+            return getToken(YJSParser.Typeof, 0);
+        }
+
+        public TerminalNode Case() {
+            return getToken(YJSParser.Case, 0);
+        }
+
+        public TerminalNode Else() {
+            return getToken(YJSParser.Else, 0);
+        }
+
+        public TerminalNode New() {
+            return getToken(YJSParser.New, 0);
+        }
+
+        public TerminalNode Var() {
+            return getToken(YJSParser.Var, 0);
+        }
+
+        public TerminalNode Catch() {
+            return getToken(YJSParser.Catch, 0);
+        }
+
+        public TerminalNode Finally() {
+            return getToken(YJSParser.Finally, 0);
+        }
+
+        public TerminalNode Return() {
+            return getToken(YJSParser.Return, 0);
+        }
+
+        public TerminalNode Void() {
+            return getToken(YJSParser.Void, 0);
+        }
+
+        public TerminalNode Continue() {
+            return getToken(YJSParser.Continue, 0);
+        }
+
+        public TerminalNode For() {
+            return getToken(YJSParser.For, 0);
+        }
+
+        public TerminalNode Switch() {
+            return getToken(YJSParser.Switch, 0);
+        }
+
+        public TerminalNode While() {
+            return getToken(YJSParser.While, 0);
+        }
+
+        public TerminalNode Debugger() {
+            return getToken(YJSParser.Debugger, 0);
+        }
+
+        public TerminalNode Function() {
+            return getToken(YJSParser.Function, 0);
+        }
+
+        public TerminalNode This() {
+            return getToken(YJSParser.This, 0);
+        }
+
+        public TerminalNode With() {
+            return getToken(YJSParser.With, 0);
+        }
+
+        public TerminalNode Default() {
+            return getToken(YJSParser.Default, 0);
+        }
+
+        public TerminalNode If() {
+            return getToken(YJSParser.If, 0);
+        }
+
+        public TerminalNode Throw() {
+            return getToken(YJSParser.Throw, 0);
+        }
+
+        public TerminalNode Delete() {
+            return getToken(YJSParser.Delete, 0);
+        }
+
+        public TerminalNode In() {
+            return getToken(YJSParser.In, 0);
+        }
+
+        public TerminalNode Try() {
+            return getToken(YJSParser.Try, 0);
+        }
+
+        public TerminalNode Class() {
+            return getToken(YJSParser.Class, 0);
+        }
+
+        public TerminalNode Enum() {
+            return getToken(YJSParser.Enum, 0);
+        }
+
+        public TerminalNode Extends() {
+            return getToken(YJSParser.Extends, 0);
+        }
+
+        public TerminalNode Super() {
+            return getToken(YJSParser.Super, 0);
+        }
+
+        public TerminalNode Const() {
+            return getToken(YJSParser.Const, 0);
+        }
+
+        public TerminalNode Export() {
+            return getToken(YJSParser.Export, 0);
+        }
+
+        public TerminalNode Import() {
+            return getToken(YJSParser.Import, 0);
+        }
+
+        public TerminalNode Implements() {
+            return getToken(YJSParser.Implements, 0);
+        }
+
+        public TerminalNode Let() {
+            return getToken(YJSParser.Let, 0);
+        }
+
+        public TerminalNode Private() {
+            return getToken(YJSParser.Private, 0);
+        }
+
+        public TerminalNode Public() {
+            return getToken(YJSParser.Public, 0);
+        }
+
+        public TerminalNode Interface() {
+            return getToken(YJSParser.Interface, 0);
+        }
+
+        public TerminalNode Package() {
+            return getToken(YJSParser.Package, 0);
+        }
+
+        public TerminalNode Protected() {
+            return getToken(YJSParser.Protected, 0);
+        }
+
+        public TerminalNode Static() {
+            return getToken(YJSParser.Static, 0);
+        }
+
+        public TerminalNode Yield() {
+            return getToken(YJSParser.Yield, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_keyword;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterKeyword(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitKeyword(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitKeyword(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+
+    public static class EosContext extends ParserRuleContext {
+        public EosContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        public TerminalNode SemiColon() {
+            return getToken(YJSParser.SemiColon, 0);
+        }
+
+        public TerminalNode EOF() {
+            return getToken(YJSParser.EOF, 0);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_eos;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).enterEos(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener) ((YJSParserListener) listener).exitEos(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor) return ((YJSParserVisitor<? extends T>) visitor).visitEos(this);
+            else return visitor.visitChildren(this);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/gen/org/bdware/sc/parser/YJSParser.tokens b/src/main/gen/org/bdware/sc/parser/YJSParser.tokens
new file mode 100644
index 0000000..1161986
--- /dev/null
+++ b/src/main/gen/org/bdware/sc/parser/YJSParser.tokens
@@ -0,0 +1,219 @@
+MultiLineComment=1
+SingleLineComment=2
+RegularExpressionLiteral=3
+OpenBracket=4
+CloseBracket=5
+OpenParen=6
+CloseParen=7
+OpenBrace=8
+CloseBrace=9
+SemiColon=10
+Comma=11
+Assign=12
+QuestionMark=13
+Colon=14
+Ellipsis=15
+Dot=16
+PlusPlus=17
+MinusMinus=18
+Plus=19
+Minus=20
+BitNot=21
+Not=22
+Multiply=23
+Divide=24
+Modulus=25
+RightShiftArithmetic=26
+LeftShiftArithmetic=27
+RightShiftLogical=28
+LessThan=29
+MoreThan=30
+LessThanEquals=31
+GreaterThanEquals=32
+Equals_=33
+NotEquals=34
+IdentityEquals=35
+IdentityNotEquals=36
+BitAnd=37
+BitXOr=38
+BitOr=39
+And=40
+Or=41
+MultiplyAssign=42
+DivideAssign=43
+ModulusAssign=44
+PlusAssign=45
+MinusAssign=46
+LeftShiftArithmeticAssign=47
+RightShiftArithmeticAssign=48
+RightShiftLogicalAssign=49
+BitAndAssign=50
+BitXorAssign=51
+BitOrAssign=52
+ARROW=53
+NullLiteral=54
+BooleanLiteral=55
+DecimalLiteral=56
+HexIntegerLiteral=57
+OctalIntegerLiteral=58
+OctalIntegerLiteral2=59
+BinaryIntegerLiteral=60
+Break=61
+Do=62
+Instanceof=63
+Typeof=64
+Case=65
+Else=66
+New=67
+Var=68
+Catch=69
+Finally=70
+Return=71
+Void=72
+Continue=73
+For=74
+Switch=75
+While=76
+Debugger=77
+Function=78
+This=79
+With=80
+Default=81
+If=82
+Throw=83
+Delete=84
+In=85
+Try=86
+Event=87
+AtToken=88
+AtLeastOnce=89
+AtMostOnce=90
+OnlyOnce=91
+Class=92
+Enum=93
+Extends=94
+Super=95
+Const=96
+Export=97
+Import=98
+Contract=99
+Module=100
+Oracle=101
+Implements=102
+Let=103
+Private=104
+Public=105
+Interface=106
+Package=107
+Protected=108
+Static=109
+Yield=110
+Identifier=111
+StringLiteral=112
+TemplateStringLiteral=113
+WhiteSpaces=114
+LineTerminator=115
+HtmlComment=116
+CDataComment=117
+UnexpectedCharacter=118
+'['=4
+']'=5
+'('=6
+')'=7
+'{'=8
+'}'=9
+';'=10
+','=11
+'='=12
+'?'=13
+':'=14
+'...'=15
+'.'=16
+'++'=17
+'--'=18
+'+'=19
+'-'=20
+'~'=21
+'!'=22
+'*'=23
+'/'=24
+'%'=25
+'>>'=26
+'<<'=27
+'>>>'=28
+'<'=29
+'>'=30
+'<='=31
+'>='=32
+'=='=33
+'!='=34
+'==='=35
+'!=='=36
+'&'=37
+'^'=38
+'|'=39
+'&&'=40
+'||'=41
+'*='=42
+'/='=43
+'%='=44
+'+='=45
+'-='=46
+'<<='=47
+'>>='=48
+'>>>='=49
+'&='=50
+'^='=51
+'|='=52
+'=>'=53
+'null'=54
+'break'=61
+'do'=62
+'instanceof'=63
+'typeof'=64
+'case'=65
+'else'=66
+'new'=67
+'var'=68
+'catch'=69
+'finally'=70
+'return'=71
+'void'=72
+'continue'=73
+'for'=74
+'switch'=75
+'while'=76
+'debugger'=77
+'function'=78
+'this'=79
+'with'=80
+'default'=81
+'if'=82
+'throw'=83
+'delete'=84
+'in'=85
+'try'=86
+'event'=87
+'@'=88
+'AT_LEAST_ONCE'=89
+'AT_MOST_ONCE'=90
+'ONLY_ONCE'=91
+'class'=92
+'enum'=93
+'extends'=94
+'super'=95
+'const'=96
+'export'=97
+'import'=98
+'contract'=99
+'module'=100
+'oracle'=101
+'implements'=102
+'let'=103
+'private'=104
+'public'=105
+'interface'=106
+'package'=107
+'protected'=108
+'static'=109
+'yield'=110
diff --git a/src/main/gen/org/bdware/sc/parser/YJSParserBaseListener.java b/src/main/gen/org/bdware/sc/parser/YJSParserBaseListener.java
new file mode 100644
index 0000000..26c67e7
--- /dev/null
+++ b/src/main/gen/org/bdware/sc/parser/YJSParserBaseListener.java
@@ -0,0 +1,2046 @@
+package org.bdware.sc.parser;// Generated from /Users/frankrwu/Workspace/JetBrains/Idea/BDContract/genparser/input/YJSParser.g4 by ANTLR 4.9.1
+
+import org.antlr.v4.runtime.ParserRuleContext;
+import org.antlr.v4.runtime.tree.ErrorNode;
+import org.antlr.v4.runtime.tree.TerminalNode;
+
+/**
+ * This class provides an empty implementation of {@link YJSParserListener},
+ * which can be extended to create a listener which only needs to handle a subset
+ * of the available methods.
+ */
+public class YJSParserBaseListener implements YJSParserListener {
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterProgram(YJSParser.ProgramContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitProgram(YJSParser.ProgramContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterContractDeclar(YJSParser.ContractDeclarContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitContractDeclar(YJSParser.ContractDeclarContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterAnnotations(YJSParser.AnnotationsContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitAnnotations(YJSParser.AnnotationsContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterAnnotation(YJSParser.AnnotationContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitAnnotation(YJSParser.AnnotationContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterAnnotationArgs(YJSParser.AnnotationArgsContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitAnnotationArgs(YJSParser.AnnotationArgsContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterAnnotationLiteral(YJSParser.AnnotationLiteralContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitAnnotationLiteral(YJSParser.AnnotationLiteralContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterClzOrFunctionDeclaration(YJSParser.ClzOrFunctionDeclarationContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitClzOrFunctionDeclaration(YJSParser.ClzOrFunctionDeclarationContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterEventSemantics(YJSParser.EventSemanticsContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitEventSemantics(YJSParser.EventSemanticsContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterEventDeclaration(YJSParser.EventDeclarationContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitEventDeclaration(YJSParser.EventDeclarationContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterSourceElement(YJSParser.SourceElementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitSourceElement(YJSParser.SourceElementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterImportStmts(YJSParser.ImportStmtsContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitImportStmts(YJSParser.ImportStmtsContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterImportStmt(YJSParser.ImportStmtContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitImportStmt(YJSParser.ImportStmtContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterExportStmt(YJSParser.ExportStmtContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitExportStmt(YJSParser.ExportStmtContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterVersionName(YJSParser.VersionNameContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitVersionName(YJSParser.VersionNameContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterStatement(YJSParser.StatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitStatement(YJSParser.StatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterBlock(YJSParser.BlockContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitBlock(YJSParser.BlockContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterStatementList(YJSParser.StatementListContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitStatementList(YJSParser.StatementListContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterVariableStatement(YJSParser.VariableStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitVariableStatement(YJSParser.VariableStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterVariableDeclarationList(YJSParser.VariableDeclarationListContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitVariableDeclarationList(YJSParser.VariableDeclarationListContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterVariableDeclaration(YJSParser.VariableDeclarationContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitVariableDeclaration(YJSParser.VariableDeclarationContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterEmptyStatement(YJSParser.EmptyStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitEmptyStatement(YJSParser.EmptyStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterExpressionStatement(YJSParser.ExpressionStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitExpressionStatement(YJSParser.ExpressionStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterIfStatement(YJSParser.IfStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitIfStatement(YJSParser.IfStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterDoStatement(YJSParser.DoStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitDoStatement(YJSParser.DoStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterWhileStatement(YJSParser.WhileStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitWhileStatement(YJSParser.WhileStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterForStatement(YJSParser.ForStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitForStatement(YJSParser.ForStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterForVarStatement(YJSParser.ForVarStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitForVarStatement(YJSParser.ForVarStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterForInStatement(YJSParser.ForInStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitForInStatement(YJSParser.ForInStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterForVarInStatement(YJSParser.ForVarInStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitForVarInStatement(YJSParser.ForVarInStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterVarModifier(YJSParser.VarModifierContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitVarModifier(YJSParser.VarModifierContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterContinueStatement(YJSParser.ContinueStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitContinueStatement(YJSParser.ContinueStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterBreakStatement(YJSParser.BreakStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitBreakStatement(YJSParser.BreakStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterReturnStatement(YJSParser.ReturnStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitReturnStatement(YJSParser.ReturnStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterWithStatement(YJSParser.WithStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitWithStatement(YJSParser.WithStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterSwitchStatement(YJSParser.SwitchStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitSwitchStatement(YJSParser.SwitchStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterCaseBlock(YJSParser.CaseBlockContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitCaseBlock(YJSParser.CaseBlockContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterCaseClauses(YJSParser.CaseClausesContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitCaseClauses(YJSParser.CaseClausesContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterCaseClause(YJSParser.CaseClauseContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitCaseClause(YJSParser.CaseClauseContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterDefaultClause(YJSParser.DefaultClauseContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitDefaultClause(YJSParser.DefaultClauseContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterThrowStatement(YJSParser.ThrowStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitThrowStatement(YJSParser.ThrowStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterTryStatement(YJSParser.TryStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitTryStatement(YJSParser.TryStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterCatchProduction(YJSParser.CatchProductionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitCatchProduction(YJSParser.CatchProductionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterFinallyProduction(YJSParser.FinallyProductionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitFinallyProduction(YJSParser.FinallyProductionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterDebuggerStatement(YJSParser.DebuggerStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitDebuggerStatement(YJSParser.DebuggerStatementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterFunctionDeclaration(YJSParser.FunctionDeclarationContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitFunctionDeclaration(YJSParser.FunctionDeclarationContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterClassDeclaration(YJSParser.ClassDeclarationContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitClassDeclaration(YJSParser.ClassDeclarationContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterClassTail(YJSParser.ClassTailContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitClassTail(YJSParser.ClassTailContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterClassElement(YJSParser.ClassElementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitClassElement(YJSParser.ClassElementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterMethodDefinition(YJSParser.MethodDefinitionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitMethodDefinition(YJSParser.MethodDefinitionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterFormalParameterList(YJSParser.FormalParameterListContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitFormalParameterList(YJSParser.FormalParameterListContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterFormalParameterArg(YJSParser.FormalParameterArgContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitFormalParameterArg(YJSParser.FormalParameterArgContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterLastFormalParameterArg(YJSParser.LastFormalParameterArgContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitLastFormalParameterArg(YJSParser.LastFormalParameterArgContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterFunctionBody(YJSParser.FunctionBodyContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitFunctionBody(YJSParser.FunctionBodyContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterSourceElements(YJSParser.SourceElementsContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitSourceElements(YJSParser.SourceElementsContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterArrayLiteral(YJSParser.ArrayLiteralContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitArrayLiteral(YJSParser.ArrayLiteralContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterElementList(YJSParser.ElementListContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitElementList(YJSParser.ElementListContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterLastElement(YJSParser.LastElementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitLastElement(YJSParser.LastElementContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterObjectLiteral(YJSParser.ObjectLiteralContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitObjectLiteral(YJSParser.ObjectLiteralContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterPropertyExpressionAssignment(YJSParser.PropertyExpressionAssignmentContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitPropertyExpressionAssignment(YJSParser.PropertyExpressionAssignmentContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterComputedPropertyExpressionAssignment(YJSParser.ComputedPropertyExpressionAssignmentContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitComputedPropertyExpressionAssignment(YJSParser.ComputedPropertyExpressionAssignmentContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterPropertyShorthand(YJSParser.PropertyShorthandContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitPropertyShorthand(YJSParser.PropertyShorthandContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterPropertyName(YJSParser.PropertyNameContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitPropertyName(YJSParser.PropertyNameContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterArguments(YJSParser.ArgumentsContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitArguments(YJSParser.ArgumentsContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterLastArgument(YJSParser.LastArgumentContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitLastArgument(YJSParser.LastArgumentContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterExpressionSequence(YJSParser.ExpressionSequenceContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitExpressionSequence(YJSParser.ExpressionSequenceContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterTemplateStringExpression(YJSParser.TemplateStringExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitTemplateStringExpression(YJSParser.TemplateStringExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterTernaryExpression(YJSParser.TernaryExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitTernaryExpression(YJSParser.TernaryExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterLogicalAndExpression(YJSParser.LogicalAndExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitLogicalAndExpression(YJSParser.LogicalAndExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterPreIncrementExpression(YJSParser.PreIncrementExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitPreIncrementExpression(YJSParser.PreIncrementExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterObjectLiteralExpression(YJSParser.ObjectLiteralExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitObjectLiteralExpression(YJSParser.ObjectLiteralExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterInExpression(YJSParser.InExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitInExpression(YJSParser.InExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterLogicalOrExpression(YJSParser.LogicalOrExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitLogicalOrExpression(YJSParser.LogicalOrExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterNotExpression(YJSParser.NotExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitNotExpression(YJSParser.NotExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterPreDecreaseExpression(YJSParser.PreDecreaseExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitPreDecreaseExpression(YJSParser.PreDecreaseExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterArgumentsExpression(YJSParser.ArgumentsExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitArgumentsExpression(YJSParser.ArgumentsExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterThisExpression(YJSParser.ThisExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitThisExpression(YJSParser.ThisExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterUnaryMinusExpression(YJSParser.UnaryMinusExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitUnaryMinusExpression(YJSParser.UnaryMinusExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterAssignmentExpression(YJSParser.AssignmentExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitAssignmentExpression(YJSParser.AssignmentExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterPostDecreaseExpression(YJSParser.PostDecreaseExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitPostDecreaseExpression(YJSParser.PostDecreaseExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterTypeofExpression(YJSParser.TypeofExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitTypeofExpression(YJSParser.TypeofExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterInstanceofExpression(YJSParser.InstanceofExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitInstanceofExpression(YJSParser.InstanceofExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterUnaryPlusExpression(YJSParser.UnaryPlusExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitUnaryPlusExpression(YJSParser.UnaryPlusExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterArrowFunctionExpression(YJSParser.ArrowFunctionExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitArrowFunctionExpression(YJSParser.ArrowFunctionExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterEqualityExpression(YJSParser.EqualityExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitEqualityExpression(YJSParser.EqualityExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterBitXOrExpression(YJSParser.BitXOrExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitBitXOrExpression(YJSParser.BitXOrExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterSuperExpression(YJSParser.SuperExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitSuperExpression(YJSParser.SuperExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterMultiplicativeExpression(YJSParser.MultiplicativeExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitMultiplicativeExpression(YJSParser.MultiplicativeExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterBitShiftExpression(YJSParser.BitShiftExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitBitShiftExpression(YJSParser.BitShiftExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterParenthesizedExpression(YJSParser.ParenthesizedExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitParenthesizedExpression(YJSParser.ParenthesizedExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterAdditiveExpression(YJSParser.AdditiveExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitAdditiveExpression(YJSParser.AdditiveExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterRelationalExpression(YJSParser.RelationalExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitRelationalExpression(YJSParser.RelationalExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterPostIncrementExpression(YJSParser.PostIncrementExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitPostIncrementExpression(YJSParser.PostIncrementExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterBitNotExpression(YJSParser.BitNotExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitBitNotExpression(YJSParser.BitNotExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterNewExpression(YJSParser.NewExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitNewExpression(YJSParser.NewExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterLiteralExpression(YJSParser.LiteralExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitLiteralExpression(YJSParser.LiteralExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterArrayLiteralExpression(YJSParser.ArrayLiteralExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitArrayLiteralExpression(YJSParser.ArrayLiteralExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterMemberDotExpression(YJSParser.MemberDotExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitMemberDotExpression(YJSParser.MemberDotExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterMemberIndexExpression(YJSParser.MemberIndexExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitMemberIndexExpression(YJSParser.MemberIndexExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterIdentifierExpression(YJSParser.IdentifierExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitIdentifierExpression(YJSParser.IdentifierExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterBitAndExpression(YJSParser.BitAndExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitBitAndExpression(YJSParser.BitAndExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterBitOrExpression(YJSParser.BitOrExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitBitOrExpression(YJSParser.BitOrExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterAssignmentOperatorExpression(YJSParser.AssignmentOperatorExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitAssignmentOperatorExpression(YJSParser.AssignmentOperatorExpressionContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterArrowFunctionParameters(YJSParser.ArrowFunctionParametersContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitArrowFunctionParameters(YJSParser.ArrowFunctionParametersContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterArrowFunctionBody(YJSParser.ArrowFunctionBodyContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitArrowFunctionBody(YJSParser.ArrowFunctionBodyContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterAssignmentOperator(YJSParser.AssignmentOperatorContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitAssignmentOperator(YJSParser.AssignmentOperatorContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterLiteral(YJSParser.LiteralContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitLiteral(YJSParser.LiteralContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterNumericLiteral(YJSParser.NumericLiteralContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitNumericLiteral(YJSParser.NumericLiteralContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterIdentifierName(YJSParser.IdentifierNameContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitIdentifierName(YJSParser.IdentifierNameContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterReservedWord(YJSParser.ReservedWordContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitReservedWord(YJSParser.ReservedWordContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterKeyword(YJSParser.KeywordContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitKeyword(YJSParser.KeywordContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterEos(YJSParser.EosContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitEos(YJSParser.EosContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void enterEveryRule(ParserRuleContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void exitEveryRule(ParserRuleContext ctx) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void visitTerminal(TerminalNode node) {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation does nothing.</p>
+     */
+    @Override
+    public void visitErrorNode(ErrorNode node) {
+    }
+}
\ No newline at end of file
diff --git a/src/main/gen/org/bdware/sc/parser/YJSParserBaseVisitor.java b/src/main/gen/org/bdware/sc/parser/YJSParserBaseVisitor.java
new file mode 100644
index 0000000..fe6a1ce
--- /dev/null
+++ b/src/main/gen/org/bdware/sc/parser/YJSParserBaseVisitor.java
@@ -0,0 +1,1234 @@
+package org.bdware.sc.parser;// Generated from /Users/frankrwu/Workspace/JetBrains/Idea/BDContract/genparser/input/YJSParser.g4 by ANTLR 4.9.1
+
+import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
+
+/**
+ * This class provides an empty implementation of {@link YJSParserVisitor},
+ * which can be extended to create a visitor which only needs to handle a subset
+ * of the available methods.
+ *
+ * @param <T> The return type of the visit operation. Use {@link Void} for
+ *            operations with no return type.
+ */
+public class YJSParserBaseVisitor<T> extends AbstractParseTreeVisitor<T> implements YJSParserVisitor<T> {
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitProgram(YJSParser.ProgramContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitContractDeclar(YJSParser.ContractDeclarContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitAnnotations(YJSParser.AnnotationsContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitAnnotation(YJSParser.AnnotationContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitAnnotationArgs(YJSParser.AnnotationArgsContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitAnnotationLiteral(YJSParser.AnnotationLiteralContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitClzOrFunctionDeclaration(YJSParser.ClzOrFunctionDeclarationContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitEventSemantics(YJSParser.EventSemanticsContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitEventDeclaration(YJSParser.EventDeclarationContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitSourceElement(YJSParser.SourceElementContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitImportStmts(YJSParser.ImportStmtsContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitImportStmt(YJSParser.ImportStmtContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitExportStmt(YJSParser.ExportStmtContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitVersionName(YJSParser.VersionNameContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitStatement(YJSParser.StatementContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitBlock(YJSParser.BlockContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitStatementList(YJSParser.StatementListContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitVariableStatement(YJSParser.VariableStatementContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitVariableDeclarationList(YJSParser.VariableDeclarationListContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitVariableDeclaration(YJSParser.VariableDeclarationContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitEmptyStatement(YJSParser.EmptyStatementContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitExpressionStatement(YJSParser.ExpressionStatementContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitIfStatement(YJSParser.IfStatementContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitDoStatement(YJSParser.DoStatementContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitWhileStatement(YJSParser.WhileStatementContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitForStatement(YJSParser.ForStatementContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitForVarStatement(YJSParser.ForVarStatementContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitForInStatement(YJSParser.ForInStatementContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitForVarInStatement(YJSParser.ForVarInStatementContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitVarModifier(YJSParser.VarModifierContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitContinueStatement(YJSParser.ContinueStatementContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitBreakStatement(YJSParser.BreakStatementContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitReturnStatement(YJSParser.ReturnStatementContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitWithStatement(YJSParser.WithStatementContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitSwitchStatement(YJSParser.SwitchStatementContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitCaseBlock(YJSParser.CaseBlockContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitCaseClauses(YJSParser.CaseClausesContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitCaseClause(YJSParser.CaseClauseContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitDefaultClause(YJSParser.DefaultClauseContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitThrowStatement(YJSParser.ThrowStatementContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitTryStatement(YJSParser.TryStatementContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitCatchProduction(YJSParser.CatchProductionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitFinallyProduction(YJSParser.FinallyProductionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitDebuggerStatement(YJSParser.DebuggerStatementContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitFunctionDeclaration(YJSParser.FunctionDeclarationContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitClassDeclaration(YJSParser.ClassDeclarationContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitClassTail(YJSParser.ClassTailContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitClassElement(YJSParser.ClassElementContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitMethodDefinition(YJSParser.MethodDefinitionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitFormalParameterList(YJSParser.FormalParameterListContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitFormalParameterArg(YJSParser.FormalParameterArgContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitLastFormalParameterArg(YJSParser.LastFormalParameterArgContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitFunctionBody(YJSParser.FunctionBodyContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitSourceElements(YJSParser.SourceElementsContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitArrayLiteral(YJSParser.ArrayLiteralContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitElementList(YJSParser.ElementListContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitLastElement(YJSParser.LastElementContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitObjectLiteral(YJSParser.ObjectLiteralContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitPropertyExpressionAssignment(YJSParser.PropertyExpressionAssignmentContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitComputedPropertyExpressionAssignment(YJSParser.ComputedPropertyExpressionAssignmentContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitPropertyShorthand(YJSParser.PropertyShorthandContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitPropertyName(YJSParser.PropertyNameContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitArguments(YJSParser.ArgumentsContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitLastArgument(YJSParser.LastArgumentContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitExpressionSequence(YJSParser.ExpressionSequenceContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitTemplateStringExpression(YJSParser.TemplateStringExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitTernaryExpression(YJSParser.TernaryExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitLogicalAndExpression(YJSParser.LogicalAndExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitPreIncrementExpression(YJSParser.PreIncrementExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitObjectLiteralExpression(YJSParser.ObjectLiteralExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitInExpression(YJSParser.InExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitLogicalOrExpression(YJSParser.LogicalOrExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitNotExpression(YJSParser.NotExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitPreDecreaseExpression(YJSParser.PreDecreaseExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitArgumentsExpression(YJSParser.ArgumentsExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitThisExpression(YJSParser.ThisExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitUnaryMinusExpression(YJSParser.UnaryMinusExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitAssignmentExpression(YJSParser.AssignmentExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitPostDecreaseExpression(YJSParser.PostDecreaseExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitTypeofExpression(YJSParser.TypeofExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitInstanceofExpression(YJSParser.InstanceofExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitUnaryPlusExpression(YJSParser.UnaryPlusExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitArrowFunctionExpression(YJSParser.ArrowFunctionExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitEqualityExpression(YJSParser.EqualityExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitBitXOrExpression(YJSParser.BitXOrExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitSuperExpression(YJSParser.SuperExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitMultiplicativeExpression(YJSParser.MultiplicativeExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitBitShiftExpression(YJSParser.BitShiftExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitParenthesizedExpression(YJSParser.ParenthesizedExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitAdditiveExpression(YJSParser.AdditiveExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitRelationalExpression(YJSParser.RelationalExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitPostIncrementExpression(YJSParser.PostIncrementExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitBitNotExpression(YJSParser.BitNotExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitNewExpression(YJSParser.NewExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitLiteralExpression(YJSParser.LiteralExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitArrayLiteralExpression(YJSParser.ArrayLiteralExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitMemberDotExpression(YJSParser.MemberDotExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitMemberIndexExpression(YJSParser.MemberIndexExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitIdentifierExpression(YJSParser.IdentifierExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitBitAndExpression(YJSParser.BitAndExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitBitOrExpression(YJSParser.BitOrExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitAssignmentOperatorExpression(YJSParser.AssignmentOperatorExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitArrowFunctionParameters(YJSParser.ArrowFunctionParametersContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitArrowFunctionBody(YJSParser.ArrowFunctionBodyContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitAssignmentOperator(YJSParser.AssignmentOperatorContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitLiteral(YJSParser.LiteralContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitNumericLiteral(YJSParser.NumericLiteralContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitIdentifierName(YJSParser.IdentifierNameContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitReservedWord(YJSParser.ReservedWordContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitKeyword(YJSParser.KeywordContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override
+    public T visitEos(YJSParser.EosContext ctx) {
+        return visitChildren(ctx);
+    }
+}
\ No newline at end of file
diff --git a/src/main/gen/org/bdware/sc/parser/YJSParserListener.java b/src/main/gen/org/bdware/sc/parser/YJSParserListener.java
new file mode 100644
index 0000000..103f240
--- /dev/null
+++ b/src/main/gen/org/bdware/sc/parser/YJSParserListener.java
@@ -0,0 +1,1655 @@
+package org.bdware.sc.parser;// Generated from /Users/frankrwu/Workspace/JetBrains/Idea/BDContract/genparser/input/YJSParser.g4 by ANTLR 4.9.1
+
+import org.antlr.v4.runtime.tree.ParseTreeListener;
+
+/**
+ * This interface defines a complete listener for a parse tree produced by
+ * {@link YJSParser}.
+ */
+public interface YJSParserListener extends ParseTreeListener {
+    /**
+     * Enter a parse tree produced by {@link YJSParser#program}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterProgram(YJSParser.ProgramContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#program}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitProgram(YJSParser.ProgramContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#contractDeclar}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterContractDeclar(YJSParser.ContractDeclarContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#contractDeclar}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitContractDeclar(YJSParser.ContractDeclarContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#annotations}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterAnnotations(YJSParser.AnnotationsContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#annotations}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitAnnotations(YJSParser.AnnotationsContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#annotation}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterAnnotation(YJSParser.AnnotationContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#annotation}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitAnnotation(YJSParser.AnnotationContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#annotationArgs}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterAnnotationArgs(YJSParser.AnnotationArgsContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#annotationArgs}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitAnnotationArgs(YJSParser.AnnotationArgsContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#annotationLiteral}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterAnnotationLiteral(YJSParser.AnnotationLiteralContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#annotationLiteral}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitAnnotationLiteral(YJSParser.AnnotationLiteralContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#clzOrFunctionDeclaration}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterClzOrFunctionDeclaration(YJSParser.ClzOrFunctionDeclarationContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#clzOrFunctionDeclaration}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitClzOrFunctionDeclaration(YJSParser.ClzOrFunctionDeclarationContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#eventSemantics}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterEventSemantics(YJSParser.EventSemanticsContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#eventSemantics}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitEventSemantics(YJSParser.EventSemanticsContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#eventDeclaration}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterEventDeclaration(YJSParser.EventDeclarationContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#eventDeclaration}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitEventDeclaration(YJSParser.EventDeclarationContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#sourceElement}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterSourceElement(YJSParser.SourceElementContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#sourceElement}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitSourceElement(YJSParser.SourceElementContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#importStmts}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterImportStmts(YJSParser.ImportStmtsContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#importStmts}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitImportStmts(YJSParser.ImportStmtsContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#importStmt}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterImportStmt(YJSParser.ImportStmtContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#importStmt}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitImportStmt(YJSParser.ImportStmtContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#exportStmt}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterExportStmt(YJSParser.ExportStmtContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#exportStmt}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitExportStmt(YJSParser.ExportStmtContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#versionName}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterVersionName(YJSParser.VersionNameContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#versionName}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitVersionName(YJSParser.VersionNameContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#statement}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterStatement(YJSParser.StatementContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#statement}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitStatement(YJSParser.StatementContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#block}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterBlock(YJSParser.BlockContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#block}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitBlock(YJSParser.BlockContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#statementList}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterStatementList(YJSParser.StatementListContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#statementList}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitStatementList(YJSParser.StatementListContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#variableStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterVariableStatement(YJSParser.VariableStatementContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#variableStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitVariableStatement(YJSParser.VariableStatementContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#variableDeclarationList}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterVariableDeclarationList(YJSParser.VariableDeclarationListContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#variableDeclarationList}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitVariableDeclarationList(YJSParser.VariableDeclarationListContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#variableDeclaration}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterVariableDeclaration(YJSParser.VariableDeclarationContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#variableDeclaration}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitVariableDeclaration(YJSParser.VariableDeclarationContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#emptyStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterEmptyStatement(YJSParser.EmptyStatementContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#emptyStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitEmptyStatement(YJSParser.EmptyStatementContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#expressionStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterExpressionStatement(YJSParser.ExpressionStatementContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#expressionStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitExpressionStatement(YJSParser.ExpressionStatementContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#ifStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterIfStatement(YJSParser.IfStatementContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#ifStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitIfStatement(YJSParser.IfStatementContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code DoStatement}
+     * labeled alternative in {@link YJSParser#iterationStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterDoStatement(YJSParser.DoStatementContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code DoStatement}
+     * labeled alternative in {@link YJSParser#iterationStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitDoStatement(YJSParser.DoStatementContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code WhileStatement}
+     * labeled alternative in {@link YJSParser#iterationStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterWhileStatement(YJSParser.WhileStatementContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code WhileStatement}
+     * labeled alternative in {@link YJSParser#iterationStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitWhileStatement(YJSParser.WhileStatementContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code ForStatement}
+     * labeled alternative in {@link YJSParser#iterationStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterForStatement(YJSParser.ForStatementContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code ForStatement}
+     * labeled alternative in {@link YJSParser#iterationStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitForStatement(YJSParser.ForStatementContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code ForVarStatement}
+     * labeled alternative in {@link YJSParser#iterationStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterForVarStatement(YJSParser.ForVarStatementContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code ForVarStatement}
+     * labeled alternative in {@link YJSParser#iterationStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitForVarStatement(YJSParser.ForVarStatementContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code ForInStatement}
+     * labeled alternative in {@link YJSParser#iterationStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterForInStatement(YJSParser.ForInStatementContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code ForInStatement}
+     * labeled alternative in {@link YJSParser#iterationStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitForInStatement(YJSParser.ForInStatementContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code ForVarInStatement}
+     * labeled alternative in {@link YJSParser#iterationStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterForVarInStatement(YJSParser.ForVarInStatementContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code ForVarInStatement}
+     * labeled alternative in {@link YJSParser#iterationStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitForVarInStatement(YJSParser.ForVarInStatementContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#varModifier}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterVarModifier(YJSParser.VarModifierContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#varModifier}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitVarModifier(YJSParser.VarModifierContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#continueStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterContinueStatement(YJSParser.ContinueStatementContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#continueStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitContinueStatement(YJSParser.ContinueStatementContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#breakStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterBreakStatement(YJSParser.BreakStatementContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#breakStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitBreakStatement(YJSParser.BreakStatementContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#returnStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterReturnStatement(YJSParser.ReturnStatementContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#returnStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitReturnStatement(YJSParser.ReturnStatementContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#withStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterWithStatement(YJSParser.WithStatementContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#withStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitWithStatement(YJSParser.WithStatementContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#switchStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterSwitchStatement(YJSParser.SwitchStatementContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#switchStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitSwitchStatement(YJSParser.SwitchStatementContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#caseBlock}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterCaseBlock(YJSParser.CaseBlockContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#caseBlock}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitCaseBlock(YJSParser.CaseBlockContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#caseClauses}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterCaseClauses(YJSParser.CaseClausesContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#caseClauses}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitCaseClauses(YJSParser.CaseClausesContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#caseClause}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterCaseClause(YJSParser.CaseClauseContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#caseClause}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitCaseClause(YJSParser.CaseClauseContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#defaultClause}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterDefaultClause(YJSParser.DefaultClauseContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#defaultClause}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitDefaultClause(YJSParser.DefaultClauseContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#throwStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterThrowStatement(YJSParser.ThrowStatementContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#throwStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitThrowStatement(YJSParser.ThrowStatementContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#tryStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterTryStatement(YJSParser.TryStatementContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#tryStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitTryStatement(YJSParser.TryStatementContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#catchProduction}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterCatchProduction(YJSParser.CatchProductionContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#catchProduction}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitCatchProduction(YJSParser.CatchProductionContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#finallyProduction}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterFinallyProduction(YJSParser.FinallyProductionContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#finallyProduction}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitFinallyProduction(YJSParser.FinallyProductionContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#debuggerStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterDebuggerStatement(YJSParser.DebuggerStatementContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#debuggerStatement}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitDebuggerStatement(YJSParser.DebuggerStatementContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#functionDeclaration}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterFunctionDeclaration(YJSParser.FunctionDeclarationContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#functionDeclaration}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitFunctionDeclaration(YJSParser.FunctionDeclarationContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#classDeclaration}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterClassDeclaration(YJSParser.ClassDeclarationContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#classDeclaration}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitClassDeclaration(YJSParser.ClassDeclarationContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#classTail}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterClassTail(YJSParser.ClassTailContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#classTail}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitClassTail(YJSParser.ClassTailContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#classElement}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterClassElement(YJSParser.ClassElementContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#classElement}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitClassElement(YJSParser.ClassElementContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#methodDefinition}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterMethodDefinition(YJSParser.MethodDefinitionContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#methodDefinition}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitMethodDefinition(YJSParser.MethodDefinitionContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#formalParameterList}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterFormalParameterList(YJSParser.FormalParameterListContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#formalParameterList}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitFormalParameterList(YJSParser.FormalParameterListContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#formalParameterArg}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterFormalParameterArg(YJSParser.FormalParameterArgContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#formalParameterArg}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitFormalParameterArg(YJSParser.FormalParameterArgContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#lastFormalParameterArg}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterLastFormalParameterArg(YJSParser.LastFormalParameterArgContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#lastFormalParameterArg}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitLastFormalParameterArg(YJSParser.LastFormalParameterArgContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#functionBody}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterFunctionBody(YJSParser.FunctionBodyContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#functionBody}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitFunctionBody(YJSParser.FunctionBodyContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#sourceElements}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterSourceElements(YJSParser.SourceElementsContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#sourceElements}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitSourceElements(YJSParser.SourceElementsContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#arrayLiteral}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterArrayLiteral(YJSParser.ArrayLiteralContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#arrayLiteral}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitArrayLiteral(YJSParser.ArrayLiteralContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#elementList}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterElementList(YJSParser.ElementListContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#elementList}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitElementList(YJSParser.ElementListContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#lastElement}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterLastElement(YJSParser.LastElementContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#lastElement}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitLastElement(YJSParser.LastElementContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#objectLiteral}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterObjectLiteral(YJSParser.ObjectLiteralContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#objectLiteral}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitObjectLiteral(YJSParser.ObjectLiteralContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code PropertyExpressionAssignment}
+     * labeled alternative in {@link YJSParser#propertyAssignment}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterPropertyExpressionAssignment(YJSParser.PropertyExpressionAssignmentContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code PropertyExpressionAssignment}
+     * labeled alternative in {@link YJSParser#propertyAssignment}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitPropertyExpressionAssignment(YJSParser.PropertyExpressionAssignmentContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code ComputedPropertyExpressionAssignment}
+     * labeled alternative in {@link YJSParser#propertyAssignment}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterComputedPropertyExpressionAssignment(YJSParser.ComputedPropertyExpressionAssignmentContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code ComputedPropertyExpressionAssignment}
+     * labeled alternative in {@link YJSParser#propertyAssignment}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitComputedPropertyExpressionAssignment(YJSParser.ComputedPropertyExpressionAssignmentContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code PropertyShorthand}
+     * labeled alternative in {@link YJSParser#propertyAssignment}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterPropertyShorthand(YJSParser.PropertyShorthandContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code PropertyShorthand}
+     * labeled alternative in {@link YJSParser#propertyAssignment}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitPropertyShorthand(YJSParser.PropertyShorthandContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#propertyName}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterPropertyName(YJSParser.PropertyNameContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#propertyName}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitPropertyName(YJSParser.PropertyNameContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#arguments}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterArguments(YJSParser.ArgumentsContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#arguments}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitArguments(YJSParser.ArgumentsContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#lastArgument}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterLastArgument(YJSParser.LastArgumentContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#lastArgument}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitLastArgument(YJSParser.LastArgumentContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#expressionSequence}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterExpressionSequence(YJSParser.ExpressionSequenceContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#expressionSequence}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitExpressionSequence(YJSParser.ExpressionSequenceContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code TemplateStringExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterTemplateStringExpression(YJSParser.TemplateStringExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code TemplateStringExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitTemplateStringExpression(YJSParser.TemplateStringExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code TernaryExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterTernaryExpression(YJSParser.TernaryExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code TernaryExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitTernaryExpression(YJSParser.TernaryExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code LogicalAndExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterLogicalAndExpression(YJSParser.LogicalAndExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code LogicalAndExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitLogicalAndExpression(YJSParser.LogicalAndExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code PreIncrementExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterPreIncrementExpression(YJSParser.PreIncrementExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code PreIncrementExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitPreIncrementExpression(YJSParser.PreIncrementExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code ObjectLiteralExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterObjectLiteralExpression(YJSParser.ObjectLiteralExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code ObjectLiteralExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitObjectLiteralExpression(YJSParser.ObjectLiteralExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code InExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterInExpression(YJSParser.InExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code InExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitInExpression(YJSParser.InExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code LogicalOrExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterLogicalOrExpression(YJSParser.LogicalOrExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code LogicalOrExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitLogicalOrExpression(YJSParser.LogicalOrExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code NotExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterNotExpression(YJSParser.NotExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code NotExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitNotExpression(YJSParser.NotExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code PreDecreaseExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterPreDecreaseExpression(YJSParser.PreDecreaseExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code PreDecreaseExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitPreDecreaseExpression(YJSParser.PreDecreaseExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code ArgumentsExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterArgumentsExpression(YJSParser.ArgumentsExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code ArgumentsExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitArgumentsExpression(YJSParser.ArgumentsExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code ThisExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterThisExpression(YJSParser.ThisExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code ThisExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitThisExpression(YJSParser.ThisExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code UnaryMinusExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterUnaryMinusExpression(YJSParser.UnaryMinusExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code UnaryMinusExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitUnaryMinusExpression(YJSParser.UnaryMinusExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code AssignmentExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterAssignmentExpression(YJSParser.AssignmentExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code AssignmentExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitAssignmentExpression(YJSParser.AssignmentExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code PostDecreaseExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterPostDecreaseExpression(YJSParser.PostDecreaseExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code PostDecreaseExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitPostDecreaseExpression(YJSParser.PostDecreaseExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code TypeofExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterTypeofExpression(YJSParser.TypeofExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code TypeofExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitTypeofExpression(YJSParser.TypeofExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code InstanceofExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterInstanceofExpression(YJSParser.InstanceofExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code InstanceofExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitInstanceofExpression(YJSParser.InstanceofExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code UnaryPlusExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterUnaryPlusExpression(YJSParser.UnaryPlusExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code UnaryPlusExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitUnaryPlusExpression(YJSParser.UnaryPlusExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code ArrowFunctionExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterArrowFunctionExpression(YJSParser.ArrowFunctionExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code ArrowFunctionExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitArrowFunctionExpression(YJSParser.ArrowFunctionExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code EqualityExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterEqualityExpression(YJSParser.EqualityExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code EqualityExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitEqualityExpression(YJSParser.EqualityExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code BitXOrExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterBitXOrExpression(YJSParser.BitXOrExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code BitXOrExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitBitXOrExpression(YJSParser.BitXOrExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code SuperExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterSuperExpression(YJSParser.SuperExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code SuperExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitSuperExpression(YJSParser.SuperExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code MultiplicativeExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterMultiplicativeExpression(YJSParser.MultiplicativeExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code MultiplicativeExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitMultiplicativeExpression(YJSParser.MultiplicativeExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code BitShiftExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterBitShiftExpression(YJSParser.BitShiftExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code BitShiftExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitBitShiftExpression(YJSParser.BitShiftExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code ParenthesizedExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterParenthesizedExpression(YJSParser.ParenthesizedExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code ParenthesizedExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitParenthesizedExpression(YJSParser.ParenthesizedExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code AdditiveExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterAdditiveExpression(YJSParser.AdditiveExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code AdditiveExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitAdditiveExpression(YJSParser.AdditiveExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code RelationalExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterRelationalExpression(YJSParser.RelationalExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code RelationalExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitRelationalExpression(YJSParser.RelationalExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code PostIncrementExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterPostIncrementExpression(YJSParser.PostIncrementExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code PostIncrementExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitPostIncrementExpression(YJSParser.PostIncrementExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code BitNotExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterBitNotExpression(YJSParser.BitNotExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code BitNotExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitBitNotExpression(YJSParser.BitNotExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code NewExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterNewExpression(YJSParser.NewExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code NewExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitNewExpression(YJSParser.NewExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code LiteralExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterLiteralExpression(YJSParser.LiteralExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code LiteralExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitLiteralExpression(YJSParser.LiteralExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code ArrayLiteralExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterArrayLiteralExpression(YJSParser.ArrayLiteralExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code ArrayLiteralExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitArrayLiteralExpression(YJSParser.ArrayLiteralExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code MemberDotExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterMemberDotExpression(YJSParser.MemberDotExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code MemberDotExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitMemberDotExpression(YJSParser.MemberDotExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code MemberIndexExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterMemberIndexExpression(YJSParser.MemberIndexExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code MemberIndexExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitMemberIndexExpression(YJSParser.MemberIndexExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code IdentifierExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterIdentifierExpression(YJSParser.IdentifierExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code IdentifierExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitIdentifierExpression(YJSParser.IdentifierExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code BitAndExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterBitAndExpression(YJSParser.BitAndExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code BitAndExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitBitAndExpression(YJSParser.BitAndExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code BitOrExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterBitOrExpression(YJSParser.BitOrExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code BitOrExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitBitOrExpression(YJSParser.BitOrExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by the {@code AssignmentOperatorExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterAssignmentOperatorExpression(YJSParser.AssignmentOperatorExpressionContext ctx);
+
+    /**
+     * Exit a parse tree produced by the {@code AssignmentOperatorExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitAssignmentOperatorExpression(YJSParser.AssignmentOperatorExpressionContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#arrowFunctionParameters}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterArrowFunctionParameters(YJSParser.ArrowFunctionParametersContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#arrowFunctionParameters}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitArrowFunctionParameters(YJSParser.ArrowFunctionParametersContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#arrowFunctionBody}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterArrowFunctionBody(YJSParser.ArrowFunctionBodyContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#arrowFunctionBody}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitArrowFunctionBody(YJSParser.ArrowFunctionBodyContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#assignmentOperator}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterAssignmentOperator(YJSParser.AssignmentOperatorContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#assignmentOperator}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitAssignmentOperator(YJSParser.AssignmentOperatorContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#literal}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterLiteral(YJSParser.LiteralContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#literal}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitLiteral(YJSParser.LiteralContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#numericLiteral}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterNumericLiteral(YJSParser.NumericLiteralContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#numericLiteral}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitNumericLiteral(YJSParser.NumericLiteralContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#identifierName}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterIdentifierName(YJSParser.IdentifierNameContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#identifierName}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitIdentifierName(YJSParser.IdentifierNameContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#reservedWord}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterReservedWord(YJSParser.ReservedWordContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#reservedWord}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitReservedWord(YJSParser.ReservedWordContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#keyword}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterKeyword(YJSParser.KeywordContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#keyword}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitKeyword(YJSParser.KeywordContext ctx);
+
+    /**
+     * Enter a parse tree produced by {@link YJSParser#eos}.
+     *
+     * @param ctx the parse tree
+     */
+    void enterEos(YJSParser.EosContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#eos}.
+     *
+     * @param ctx the parse tree
+     */
+    void exitEos(YJSParser.EosContext ctx);
+}
\ No newline at end of file
diff --git a/src/main/gen/org/bdware/sc/parser/YJSParserVisitor.java b/src/main/gen/org/bdware/sc/parser/YJSParserVisitor.java
new file mode 100644
index 0000000..4914556
--- /dev/null
+++ b/src/main/gen/org/bdware/sc/parser/YJSParserVisitor.java
@@ -0,0 +1,946 @@
+package org.bdware.sc.parser;// Generated from /Users/frankrwu/Workspace/JetBrains/Idea/BDContract/genparser/input/YJSParser.g4 by ANTLR 4.9.1
+
+import org.antlr.v4.runtime.tree.ParseTreeVisitor;
+
+/**
+ * This interface defines a complete generic visitor for a parse tree produced
+ * by {@link YJSParser}.
+ *
+ * @param <T> The return type of the visit operation. Use {@link Void} for
+ *            operations with no return type.
+ */
+public interface YJSParserVisitor<T> extends ParseTreeVisitor<T> {
+    /**
+     * Visit a parse tree produced by {@link YJSParser#program}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitProgram(YJSParser.ProgramContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#contractDeclar}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitContractDeclar(YJSParser.ContractDeclarContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#annotations}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitAnnotations(YJSParser.AnnotationsContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#annotation}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitAnnotation(YJSParser.AnnotationContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#annotationArgs}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitAnnotationArgs(YJSParser.AnnotationArgsContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#annotationLiteral}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitAnnotationLiteral(YJSParser.AnnotationLiteralContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#clzOrFunctionDeclaration}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitClzOrFunctionDeclaration(YJSParser.ClzOrFunctionDeclarationContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#eventSemantics}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitEventSemantics(YJSParser.EventSemanticsContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#eventDeclaration}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitEventDeclaration(YJSParser.EventDeclarationContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#sourceElement}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitSourceElement(YJSParser.SourceElementContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#importStmts}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitImportStmts(YJSParser.ImportStmtsContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#importStmt}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitImportStmt(YJSParser.ImportStmtContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#exportStmt}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitExportStmt(YJSParser.ExportStmtContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#versionName}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitVersionName(YJSParser.VersionNameContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#statement}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitStatement(YJSParser.StatementContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#block}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitBlock(YJSParser.BlockContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#statementList}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitStatementList(YJSParser.StatementListContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#variableStatement}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitVariableStatement(YJSParser.VariableStatementContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#variableDeclarationList}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitVariableDeclarationList(YJSParser.VariableDeclarationListContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#variableDeclaration}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitVariableDeclaration(YJSParser.VariableDeclarationContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#emptyStatement}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitEmptyStatement(YJSParser.EmptyStatementContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#expressionStatement}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitExpressionStatement(YJSParser.ExpressionStatementContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#ifStatement}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitIfStatement(YJSParser.IfStatementContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code DoStatement}
+     * labeled alternative in {@link YJSParser#iterationStatement}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitDoStatement(YJSParser.DoStatementContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code WhileStatement}
+     * labeled alternative in {@link YJSParser#iterationStatement}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitWhileStatement(YJSParser.WhileStatementContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code ForStatement}
+     * labeled alternative in {@link YJSParser#iterationStatement}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitForStatement(YJSParser.ForStatementContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code ForVarStatement}
+     * labeled alternative in {@link YJSParser#iterationStatement}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitForVarStatement(YJSParser.ForVarStatementContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code ForInStatement}
+     * labeled alternative in {@link YJSParser#iterationStatement}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitForInStatement(YJSParser.ForInStatementContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code ForVarInStatement}
+     * labeled alternative in {@link YJSParser#iterationStatement}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitForVarInStatement(YJSParser.ForVarInStatementContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#varModifier}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitVarModifier(YJSParser.VarModifierContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#continueStatement}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitContinueStatement(YJSParser.ContinueStatementContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#breakStatement}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitBreakStatement(YJSParser.BreakStatementContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#returnStatement}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitReturnStatement(YJSParser.ReturnStatementContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#withStatement}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitWithStatement(YJSParser.WithStatementContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#switchStatement}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitSwitchStatement(YJSParser.SwitchStatementContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#caseBlock}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitCaseBlock(YJSParser.CaseBlockContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#caseClauses}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitCaseClauses(YJSParser.CaseClausesContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#caseClause}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitCaseClause(YJSParser.CaseClauseContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#defaultClause}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitDefaultClause(YJSParser.DefaultClauseContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#throwStatement}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitThrowStatement(YJSParser.ThrowStatementContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#tryStatement}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitTryStatement(YJSParser.TryStatementContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#catchProduction}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitCatchProduction(YJSParser.CatchProductionContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#finallyProduction}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitFinallyProduction(YJSParser.FinallyProductionContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#debuggerStatement}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitDebuggerStatement(YJSParser.DebuggerStatementContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#functionDeclaration}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitFunctionDeclaration(YJSParser.FunctionDeclarationContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#classDeclaration}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitClassDeclaration(YJSParser.ClassDeclarationContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#classTail}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitClassTail(YJSParser.ClassTailContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#classElement}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitClassElement(YJSParser.ClassElementContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#methodDefinition}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitMethodDefinition(YJSParser.MethodDefinitionContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#formalParameterList}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitFormalParameterList(YJSParser.FormalParameterListContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#formalParameterArg}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitFormalParameterArg(YJSParser.FormalParameterArgContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#lastFormalParameterArg}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitLastFormalParameterArg(YJSParser.LastFormalParameterArgContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#functionBody}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitFunctionBody(YJSParser.FunctionBodyContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#sourceElements}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitSourceElements(YJSParser.SourceElementsContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#arrayLiteral}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitArrayLiteral(YJSParser.ArrayLiteralContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#elementList}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitElementList(YJSParser.ElementListContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#lastElement}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitLastElement(YJSParser.LastElementContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#objectLiteral}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitObjectLiteral(YJSParser.ObjectLiteralContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code PropertyExpressionAssignment}
+     * labeled alternative in {@link YJSParser#propertyAssignment}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitPropertyExpressionAssignment(YJSParser.PropertyExpressionAssignmentContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code ComputedPropertyExpressionAssignment}
+     * labeled alternative in {@link YJSParser#propertyAssignment}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitComputedPropertyExpressionAssignment(YJSParser.ComputedPropertyExpressionAssignmentContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code PropertyShorthand}
+     * labeled alternative in {@link YJSParser#propertyAssignment}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitPropertyShorthand(YJSParser.PropertyShorthandContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#propertyName}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitPropertyName(YJSParser.PropertyNameContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#arguments}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitArguments(YJSParser.ArgumentsContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#lastArgument}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitLastArgument(YJSParser.LastArgumentContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#expressionSequence}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitExpressionSequence(YJSParser.ExpressionSequenceContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code TemplateStringExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitTemplateStringExpression(YJSParser.TemplateStringExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code TernaryExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitTernaryExpression(YJSParser.TernaryExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code LogicalAndExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitLogicalAndExpression(YJSParser.LogicalAndExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code PreIncrementExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitPreIncrementExpression(YJSParser.PreIncrementExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code ObjectLiteralExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitObjectLiteralExpression(YJSParser.ObjectLiteralExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code InExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitInExpression(YJSParser.InExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code LogicalOrExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitLogicalOrExpression(YJSParser.LogicalOrExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code NotExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitNotExpression(YJSParser.NotExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code PreDecreaseExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitPreDecreaseExpression(YJSParser.PreDecreaseExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code ArgumentsExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitArgumentsExpression(YJSParser.ArgumentsExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code ThisExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitThisExpression(YJSParser.ThisExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code UnaryMinusExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitUnaryMinusExpression(YJSParser.UnaryMinusExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code AssignmentExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitAssignmentExpression(YJSParser.AssignmentExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code PostDecreaseExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitPostDecreaseExpression(YJSParser.PostDecreaseExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code TypeofExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitTypeofExpression(YJSParser.TypeofExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code InstanceofExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitInstanceofExpression(YJSParser.InstanceofExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code UnaryPlusExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitUnaryPlusExpression(YJSParser.UnaryPlusExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code ArrowFunctionExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitArrowFunctionExpression(YJSParser.ArrowFunctionExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code EqualityExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitEqualityExpression(YJSParser.EqualityExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code BitXOrExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitBitXOrExpression(YJSParser.BitXOrExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code SuperExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitSuperExpression(YJSParser.SuperExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code MultiplicativeExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitMultiplicativeExpression(YJSParser.MultiplicativeExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code BitShiftExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitBitShiftExpression(YJSParser.BitShiftExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code ParenthesizedExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitParenthesizedExpression(YJSParser.ParenthesizedExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code AdditiveExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitAdditiveExpression(YJSParser.AdditiveExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code RelationalExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitRelationalExpression(YJSParser.RelationalExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code PostIncrementExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitPostIncrementExpression(YJSParser.PostIncrementExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code BitNotExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitBitNotExpression(YJSParser.BitNotExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code NewExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitNewExpression(YJSParser.NewExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code LiteralExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitLiteralExpression(YJSParser.LiteralExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code ArrayLiteralExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitArrayLiteralExpression(YJSParser.ArrayLiteralExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code MemberDotExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitMemberDotExpression(YJSParser.MemberDotExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code MemberIndexExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitMemberIndexExpression(YJSParser.MemberIndexExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code IdentifierExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitIdentifierExpression(YJSParser.IdentifierExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code BitAndExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitBitAndExpression(YJSParser.BitAndExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code BitOrExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitBitOrExpression(YJSParser.BitOrExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code AssignmentOperatorExpression}
+     * labeled alternative in {@link YJSParser#singleExpression}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitAssignmentOperatorExpression(YJSParser.AssignmentOperatorExpressionContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#arrowFunctionParameters}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitArrowFunctionParameters(YJSParser.ArrowFunctionParametersContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#arrowFunctionBody}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitArrowFunctionBody(YJSParser.ArrowFunctionBodyContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#assignmentOperator}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitAssignmentOperator(YJSParser.AssignmentOperatorContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#literal}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitLiteral(YJSParser.LiteralContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#numericLiteral}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitNumericLiteral(YJSParser.NumericLiteralContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#identifierName}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitIdentifierName(YJSParser.IdentifierNameContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#reservedWord}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitReservedWord(YJSParser.ReservedWordContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#keyword}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitKeyword(YJSParser.KeywordContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link YJSParser#eos}.
+     *
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitEos(YJSParser.EosContext ctx);
+}
\ No newline at end of file
diff --git a/src/main/pythongen/org/bdware/sc/commParser/BDLedger/Block.java b/src/main/pythongen/org/bdware/sc/commParser/BDLedger/Block.java
new file mode 100644
index 0000000..c28973c
--- /dev/null
+++ b/src/main/pythongen/org/bdware/sc/commParser/BDLedger/Block.java
@@ -0,0 +1,105 @@
+package org.bdware.sc.commParser.BDLedger;
+
+import org.bdware.sc.util.HashUtil;
+import org.bdware.sc.util.JsonUtil;
+
+import java.io.*;
+import java.util.HashMap;
+import java.util.Map;
+
+public class Block {
+    public BlockHeader blockheader;
+    public BlockBody blockbody;
+
+    public Block(BlockHeader blockheader, BlockBody blockbody) {
+        super();
+        this.blockheader = blockheader;
+        this.blockbody = blockbody;
+        System.out.println(this.blockbody);
+    }
+
+    public byte[] toByteArray() {
+        try {
+            ByteArrayOutputStream bo = new ByteArrayOutputStream();
+            DataOutputStream dd = new DataOutputStream(bo);
+            dd.writeInt(blockheader.index);
+            dd.write(blockheader.hash);
+            dd.writeInt(blockheader.timestamp);
+            dd.writeInt(blockheader.version);
+            dd.write(blockheader.prevblockID);
+            dd.write(blockheader.merkleroot);
+            dd.write(blockheader.creatorID);
+            byte[] bytearr = blockbody.toByteArray();
+            dd.writeInt(bytearr.length);
+            dd.write(bytearr);
+            return bo.toByteArray();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    //	public static Block fromByteArray(byte[] block) {
+//		BlockHeader header = new BlockHeader();
+//		BlockBody body = new BlockBody();
+//		try {
+//			ByteArrayInputStream bi = new ByteArrayInputStream(block);
+//			DataInputStream dd = new DataInputStream(bi);
+//			header.index = dd.readInt();
+//			header.hash = new byte[20];
+//			dd.read(header.hash);
+//			header.timestamp = dd.readInt();
+//			header.version = dd.readInt();
+//			header.prevblockID = new byte[20];
+//			header.merkleroot = new byte[20];
+//			header.creatorID = new byte[20];
+//			dd.read(header.prevblockID);
+//			dd.read(header.merkleroot);
+//			dd.read(header.creatorID);
+//			int bodysize = dd.readInt();
+//			byte[] bodyarr = new byte[bodysize];
+//			dd.read(bodyarr);
+//			body = BlockBody.fromBytes(bodyarr);
+//			Block genblock = new Block(header,body);
+//			return genblock;
+//		} catch (IOException e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		}
+//		return null;
+//	}
+    private String[] getPrevBlockID(byte[] frombytes) {
+        DataInputStream in = new DataInputStream(new ByteArrayInputStream(frombytes));
+        String[] prevBlockID = new String[3];
+        byte[] b1 = new byte[20];
+        byte[] b2 = new byte[20];
+        byte[] b3 = new byte[20];
+        try {
+            in.read(b1);
+            in.read(b2);
+            in.read(b3);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        prevBlockID[0] = HashUtil.byteArray2Str(b1);
+        prevBlockID[1] = HashUtil.byteArray2Str(b2);
+        prevBlockID[2] = HashUtil.byteArray2Str(b3);
+        return prevBlockID;
+
+    }
+
+    public String toJson() {
+        Map<String, String> ret = new HashMap<>();
+        ret.put("Index", String.valueOf(blockheader.index));
+        ret.put("hash", HashUtil.byteArray2Str(blockheader.hash));
+        ret.put("timestamp", String.valueOf(blockheader.timestamp));
+        ret.put("version", String.valueOf(blockheader.version));
+        String[] prevBlockID = getPrevBlockID(blockheader.prevblockID);
+        ret.put("prevblockID", prevBlockID[0] + "," + prevBlockID[1] + "," + prevBlockID[2]);
+        ret.put("merkleroot", HashUtil.byteArray2Str(blockheader.merkleroot));
+        ret.put("creatorID", HashUtil.byteArray2Str(blockheader.creatorID));
+        return JsonUtil.toJson(ret);
+    }
+
+}
diff --git a/src/main/pythongen/org/bdware/sc/commParser/BDLedger/BlockBody.java b/src/main/pythongen/org/bdware/sc/commParser/BDLedger/BlockBody.java
new file mode 100644
index 0000000..1cf0d7b
--- /dev/null
+++ b/src/main/pythongen/org/bdware/sc/commParser/BDLedger/BlockBody.java
@@ -0,0 +1,63 @@
+package org.bdware.sc.commParser.BDLedger;
+
+import org.bdware.sc.util.HashUtil;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+public class BlockBody {
+    public List<Transaction> trans = new ArrayList<>();
+
+    public static BlockBody fromBytes(byte[] input) {
+        try {
+            DataInputStream bin = new DataInputStream(new ByteArrayInputStream(input));
+            int size = bin.readInt();
+            size = HashUtil.toLittleEndian(size);
+            BlockBody ret = new BlockBody();
+            for (int i = 0; i < size; i++) {
+                Transaction trans = new Transaction();
+                ret.trans.add(trans);
+                trans.srcID = new byte[20];
+                trans.dstID = new byte[20];
+                bin.read(trans.srcID);
+                bin.read(trans.dstID);
+                trans.nonce = HashUtil.toLittleEndian(bin.readLong());
+                trans.type = HashUtil.toLittleEndian(bin.readInt());
+                int len = HashUtil.toLittleEndian(bin.readInt());
+                trans.data = new byte[len];
+                bin.read(trans.data);
+            }
+            return ret;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return new BlockBody();
+    }
+
+    public byte[] toByteArray() {
+        byte[] arr = new byte[1];
+        try {
+            ByteArrayOutputStream bo = new ByteArrayOutputStream();
+            DataOutputStream bin = new DataOutputStream(bo);
+            bin.writeInt(trans.size());
+            for (int i = 0; i < trans.size(); i++) {
+                Transaction tran = trans.get(i);
+                bin.write(tran.srcID);
+                bin.write(tran.dstID);
+                bin.writeLong(tran.nonce);
+                bin.writeInt(tran.type);
+                int len = tran.data.length;
+                bin.writeInt(len);
+                bin.write(tran.data);
+            }
+            return bo.toByteArray();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return arr;
+    }
+}
diff --git a/src/main/pythongen/org/bdware/sc/commParser/BDLedger/BlockHeader.java b/src/main/pythongen/org/bdware/sc/commParser/BDLedger/BlockHeader.java
new file mode 100644
index 0000000..9ac39b6
--- /dev/null
+++ b/src/main/pythongen/org/bdware/sc/commParser/BDLedger/BlockHeader.java
@@ -0,0 +1,11 @@
+package org.bdware.sc.commParser.BDLedger;
+
+public class BlockHeader {
+    public int index;
+    public byte[] hash;
+    public int version;
+    public int timestamp;
+    public byte[] prevblockID;
+    public byte[] merkleroot;
+    public byte[] creatorID;
+}
diff --git a/src/main/pythongen/org/bdware/sc/commParser/BDLedger/Transaction.java b/src/main/pythongen/org/bdware/sc/commParser/BDLedger/Transaction.java
new file mode 100644
index 0000000..428cc58
--- /dev/null
+++ b/src/main/pythongen/org/bdware/sc/commParser/BDLedger/Transaction.java
@@ -0,0 +1,100 @@
+package org.bdware.sc.commParser.BDLedger;
+
+import org.bdware.sc.util.HashUtil;
+import org.bdware.sc.util.JsonUtil;
+
+import java.io.*;
+import java.security.MessageDigest;
+import java.util.HashMap;
+import java.util.Map;
+
+public class Transaction {
+    public byte[] srcID;
+    public byte[] dstID;
+    public long nonce;
+    public int type;
+    public byte[] data;
+    //扩展字段
+    public int timestamp;
+    public byte[] hash;
+
+    public static Transaction fromBytes(byte[] bytes) {
+        try {
+            Transaction trans = new Transaction();
+            DataInputStream bin = new DataInputStream(new ByteArrayInputStream(bytes));
+            trans.srcID = new byte[20];
+            trans.dstID = new byte[20];
+            bin.read(trans.srcID);
+            bin.read(trans.dstID);
+            trans.nonce = bin.readLong();
+            trans.type = bin.readInt();
+            int len = bin.readInt();
+            trans.data = new byte[len];
+            bin.read(trans.data);
+            return trans;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public byte[] getTransactionHash() {
+        try {
+            MessageDigest md = MessageDigest.getInstance("SHA-256");
+            byte[] encoded = md.digest(toHashByteArray());
+            byte[] truned = HashUtil.truncation(encoded, 20);
+            System.out.println("[Transaction] encoded:" + HashUtil.byteArray2Str(encoded) + " ==> "
+                    + HashUtil.byteArray2Str(truned));
+            return truned;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public String toJson() {
+        Map<String, String> ret = new HashMap<>();
+        ret.put("SrcID", HashUtil.byteArray2Str(srcID));
+        ret.put("dstID", HashUtil.byteArray2Str(dstID));
+        ret.put("nonce", String.valueOf(nonce));
+        ret.put("type", String.valueOf(type));
+        ret.put("data", HashUtil.byteArray2Str(data));
+        return JsonUtil.toJson(ret);
+
+    }
+
+    public byte[] toByteArray() {
+        try {
+            ByteArrayOutputStream bo = new ByteArrayOutputStream();
+            DataOutputStream dd = new DataOutputStream(bo);
+            dd.write(srcID);
+            dd.write(dstID);
+            dd.writeLong(nonce);
+            dd.writeInt(type);
+            dd.writeInt(data.length);
+            dd.write(data);
+            return bo.toByteArray();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public byte[] toHashByteArray() {
+        try {
+            ByteArrayOutputStream bo = new ByteArrayOutputStream();
+            DataOutputStream dd = new DataOutputStream(bo);
+            dd.write(srcID);
+            dd.write(dstID);
+            dd.writeLong(HashUtil.toLittleEndian(nonce));
+            dd.writeInt(HashUtil.toLittleEndian(type));
+            dd.write(data);
+            return bo.toByteArray();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/src/main/pythongen/org/bdware/sc/commParser/BDLedgerAdapter.java b/src/main/pythongen/org/bdware/sc/commParser/BDLedgerAdapter.java
new file mode 100644
index 0000000..5d1f882
--- /dev/null
+++ b/src/main/pythongen/org/bdware/sc/commParser/BDLedgerAdapter.java
@@ -0,0 +1,15 @@
+package org.bdware.sc.commParser;
+
+public class BDLedgerAdapter {
+    public Transaction tx;
+    public org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction ledgerChain;
+
+    public BDLedgerAdapter(org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction chaintrans) {
+        super();
+        this.ledgerChain = chaintrans;
+        this.tx = new Transaction();
+        this.tx.Data = chaintrans.getData().toStringUtf8().getBytes();
+        this.tx.SrcID = chaintrans.getFrom().toByteArray();  //本地库中SrcID可以是key
+        this.tx.Txid = chaintrans.getHash().toByteArray();
+    }
+}
diff --git a/src/main/pythongen/org/bdware/sc/commParser/BlockAdapter.java b/src/main/pythongen/org/bdware/sc/commParser/BlockAdapter.java
new file mode 100644
index 0000000..5d3da02
--- /dev/null
+++ b/src/main/pythongen/org/bdware/sc/commParser/BlockAdapter.java
@@ -0,0 +1,5 @@
+package org.bdware.sc.commParser;
+
+public interface BlockAdapter<T> {
+    Transaction convert(T t);
+}
diff --git a/src/main/pythongen/org/bdware/sc/commParser/BlockBody.java b/src/main/pythongen/org/bdware/sc/commParser/BlockBody.java
new file mode 100644
index 0000000..d6e367b
--- /dev/null
+++ b/src/main/pythongen/org/bdware/sc/commParser/BlockBody.java
@@ -0,0 +1,38 @@
+package org.bdware.sc.commParser;
+
+import org.bdware.sc.util.HashUtil;
+
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+public class BlockBody {
+    public List<Transaction_bak> trans = new ArrayList<>();
+
+    public static BlockBody fromBytes(byte[] input) {
+        try {
+            DataInputStream bin = new DataInputStream(new ByteArrayInputStream(input));
+            int size = bin.readInt();
+            size = HashUtil.toLittleEndian(size);
+            BlockBody ret = new BlockBody();
+            for (int i = 0; i < size; i++) {
+                Transaction_bak trans = new Transaction_bak();
+                ret.trans.add(trans);
+                trans.srcID = new byte[20];
+                trans.dstID = new byte[20];
+                bin.read(trans.srcID);
+                bin.read(trans.dstID);
+                trans.nonce = HashUtil.toLittleEndian(bin.readLong());
+                trans.type = HashUtil.toLittleEndian(bin.readInt());
+                int len = HashUtil.toLittleEndian(bin.readInt());
+                trans.data = new byte[len];
+                bin.read(trans.data);
+            }
+            return ret;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return new BlockBody();
+    }
+}
diff --git a/src/main/pythongen/org/bdware/sc/commParser/LocalLogAdapter.java b/src/main/pythongen/org/bdware/sc/commParser/LocalLogAdapter.java
new file mode 100644
index 0000000..1ae6955
--- /dev/null
+++ b/src/main/pythongen/org/bdware/sc/commParser/LocalLogAdapter.java
@@ -0,0 +1,22 @@
+package org.bdware.sc.commParser;
+
+public class LocalLogAdapter {
+    public Transaction trans;
+    public org.bdware.sc.common.Transaction chaintran;
+
+    public LocalLogAdapter(org.bdware.sc.common.Transaction chaintrans) {
+        super();
+        this.chaintran = chaintrans;
+        this.trans = new Transaction();
+
+
+        this.trans.Data = chaintrans.getData().getBytes();
+        this.trans.SrcID = chaintrans.getKey().getBytes();
+        this.trans.Txid = chaintrans.getData().getBytes();   //交易id对应本地日志库中什么字段呢
+
+
+        //this.trans.Data = chaintrans.getData().toStringUtf8().getBytes();
+        //this.trans.SrcID = chaintrans.getFrom().toByteArray();  //本地库中SrcID可以是key
+        //this.trans.Txid = chaintrans.getHash().toByteArray();
+    }
+}
diff --git a/src/main/pythongen/org/bdware/sc/commParser/Transaction.java b/src/main/pythongen/org/bdware/sc/commParser/Transaction.java
new file mode 100644
index 0000000..151991b
--- /dev/null
+++ b/src/main/pythongen/org/bdware/sc/commParser/Transaction.java
@@ -0,0 +1,10 @@
+package org.bdware.sc.commParser;
+
+public class Transaction {
+    public byte[] Txid;
+    public byte[] SrcID;
+    public byte[] DstID;
+    public byte[] Data;
+    public int Timestamp;
+    public long Nonce;
+}
diff --git a/src/main/pythongen/org/bdware/sc/commParser/Transaction_bak.java b/src/main/pythongen/org/bdware/sc/commParser/Transaction_bak.java
new file mode 100644
index 0000000..ae3e3f9
--- /dev/null
+++ b/src/main/pythongen/org/bdware/sc/commParser/Transaction_bak.java
@@ -0,0 +1,98 @@
+package org.bdware.sc.commParser;
+
+import org.bdware.sc.util.HashUtil;
+import org.bdware.sc.util.JsonUtil;
+
+import java.io.*;
+import java.security.MessageDigest;
+import java.util.HashMap;
+import java.util.Map;
+
+public class Transaction_bak {
+    byte[] srcID;
+    byte[] dstID;
+    long nonce;
+    int type;
+    byte[] data;
+
+    public static Transaction_bak fromBytes(byte[] bytes) {
+        try {
+            Transaction_bak trans = new Transaction_bak();
+            DataInputStream bin = new DataInputStream(new ByteArrayInputStream(bytes));
+            trans.srcID = new byte[20];
+            trans.dstID = new byte[20];
+            bin.read(trans.srcID);
+            bin.read(trans.dstID);
+            trans.nonce = bin.readLong();
+            trans.type = bin.readInt();
+            int len = bin.readInt();
+            trans.data = new byte[len];
+            bin.read(trans.data);
+            return trans;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public byte[] getTransactionHash() {
+        try {
+            MessageDigest md = MessageDigest.getInstance("SHA-256");
+            System.out.println("[Transaction]: getTransactionHash-->" + HashUtil.byteArray2Str(toHashByteArray()));
+            byte[] encoded = md.digest(toHashByteArray());
+            byte[] truned = HashUtil.truncation(encoded, 20);
+            System.out.println("[Transaction] encoded:" + HashUtil.byteArray2Str(encoded) + " ==> "
+                    + HashUtil.byteArray2Str(truned));
+            return truned;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public String toJson() {
+        Map<String, String> ret = new HashMap<>();
+        ret.put("SrcID", HashUtil.byteArray2Str(srcID));
+        ret.put("dstID", HashUtil.byteArray2Str(dstID));
+        ret.put("nonce", nonce + "");
+        ret.put("type", type + "");
+        ret.put("data", HashUtil.byteArray2Str(data));
+        return JsonUtil.toJson(ret);
+
+    }
+
+    public byte[] toByteArray() {
+        try {
+            ByteArrayOutputStream bo = new ByteArrayOutputStream();
+            DataOutputStream dd = new DataOutputStream(bo);
+            dd.write(srcID);
+            dd.write(dstID);
+            dd.writeLong(nonce);
+            dd.writeInt(type);
+            dd.writeInt(data.length);
+            dd.write(data);
+            return bo.toByteArray();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public byte[] toHashByteArray() {
+        try {
+            ByteArrayOutputStream bo = new ByteArrayOutputStream();
+            DataOutputStream dd = new DataOutputStream(bo);
+            dd.write(srcID);
+            dd.write(dstID);
+            dd.writeLong(HashUtil.toLittleEndian(nonce));
+            dd.writeInt(HashUtil.toLittleEndian(type));
+            dd.write(data);
+            return bo.toByteArray();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/src/main/pythongen/org/bdware/sc/commParser/XuperChainAdapter.java b/src/main/pythongen/org/bdware/sc/commParser/XuperChainAdapter.java
new file mode 100644
index 0000000..bb8f3e9
--- /dev/null
+++ b/src/main/pythongen/org/bdware/sc/commParser/XuperChainAdapter.java
@@ -0,0 +1,17 @@
+package org.bdware.sc.commParser;
+
+public class XuperChainAdapter {
+//	public Transaction trans;
+//	public com.baidu.xuperunion.pb.XchainOuterClass.Transaction chaintran;
+//	public TransAdapter(com.baidu.xuperunion.pb.XchainOuterClass.Transaction chaintrans) {
+//		super();
+//		this.chaintran = chaintrans;
+//		this.trans = new Transaction();
+//		this.trans.Data = chaintrans.getDesc().toStringUtf8().getBytes();
+//		this.trans.Timestamp = (int) (chaintrans.getTimestamp()/1000000000);
+//		this.trans.Txid = chaintrans.getTxid().toByteArray();
+//		if (chaintrans.getTxInputsCount()>0) {
+//			this.trans.SrcID = 	chaintrans.getTxInputs(0).getFromAddr().toByteArray();
+//		}
+//	}
+}
diff --git a/src/main/pythongen/org/bdware/sc/common/Transaction.java b/src/main/pythongen/org/bdware/sc/common/Transaction.java
new file mode 100644
index 0000000..73be876
--- /dev/null
+++ b/src/main/pythongen/org/bdware/sc/common/Transaction.java
@@ -0,0 +1,24 @@
+package org.bdware.sc.common;
+
+/*
+ * Local Log DB
+ */
+public class Transaction {
+    String key;
+    String from;  //pubKey
+    String to;  //action
+    String data;
+    String requestID;  //date
+
+    public String getKey() {
+        return this.key;
+    }
+
+    public String getFrom() {
+        return this.from;
+    }
+
+    public String getData() {
+        return this.data;
+    }
+}
diff --git a/src/main/pythongen/org/bdware/sc/contractGen/ContractGenerator.java b/src/main/pythongen/org/bdware/sc/contractGen/ContractGenerator.java
new file mode 100644
index 0000000..73ec291
--- /dev/null
+++ b/src/main/pythongen/org/bdware/sc/contractGen/ContractGenerator.java
@@ -0,0 +1,69 @@
+package org.bdware.sc.contractGen;
+
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.runtime.RuntimeConstants;
+import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
+import org.bdware.sc.util.JsonUtil;
+
+import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ContractGenerator {
+    static VelocityEngine ve = init();
+
+    public static String generateAPIContract(Map<String, String> arg) {
+        VelocityContext ctx = new VelocityContext();
+        Template script = ve.getTemplate("org/bdware/sc/sc/contractGen/timeindexcontract.vm");
+        ctx.put("indexData", arg.get("indexData"));
+        ctx.put("datalen", arg.get("datalen"));
+        ctx.put("sdkpath", arg.get("sdkpath"));
+        ctx.put("syncbyheight", arg.get("syncbyheight"));
+        StringWriter writer = new StringWriter();
+        script.merge(ctx, writer);
+        return writer.toString();
+    }
+
+    public static String generateIndexContract(long availableDate, String url, String method, Map<String, String> header,
+                                               Map<String, String> arg) {
+        VelocityContext ctx = new VelocityContext();
+
+        Template script = ve.getTemplate("com/yancloud/sc/indexcontract.vm");
+        String onblock = "var hash = com.yancloud.sc.util.HashUtil.str16ToBytes(args);\n print(hash)";
+        ctx.put("onBlock", onblock);
+        StringWriter writer = new StringWriter();
+        script.merge(ctx, writer);
+        return writer.toString();
+    }
+
+    private static VelocityEngine init() {
+        VelocityEngine ve = new VelocityEngine();
+        ve.setProperty(RuntimeConstants.RESOURCE_LOADER, "classpath");
+        ve.setProperty("classpath.resource.loader.class", ClasspathResourceLoader.class.getName());
+        ve.init();
+        return ve;
+    }
+
+    public static String generateFTPContract(long availableDate) {
+        VelocityContext ctx = new VelocityContext();
+        Template script = ve.getTemplate("org/bdware/sc/sc/ftpcontract.vm");
+        String[][] initList = {{"availableDate", availableDate + ""}};
+        ctx.put("initList", initList);
+        ctx.put("validate", "YancloudUtil.currentTimeMillis()>Global.availableDate");
+        StringWriter writer = new StringWriter();
+        script.merge(ctx, writer);
+        return writer.toString();
+    }
+
+    private static String stringify(String url) {
+        return JsonUtil.toJson(url);
+    }
+
+    private static String convertMap(Map<String, String> arg) {
+        if (null == arg)
+            arg = new HashMap<>();
+        return JsonUtil.toJson(arg);
+    }
+}
diff --git a/src/main/pythongen/org/bdware/sc/contractGen/ContractGeneratorUI.java b/src/main/pythongen/org/bdware/sc/contractGen/ContractGeneratorUI.java
new file mode 100644
index 0000000..d60fc56
--- /dev/null
+++ b/src/main/pythongen/org/bdware/sc/contractGen/ContractGeneratorUI.java
@@ -0,0 +1,131 @@
+package org.bdware.sc.contractGen;
+
+import org.jb2011.lnf.beautyeye.BeautyEyeLNFHelper;
+
+import javax.swing.*;
+import javax.swing.plaf.FontUIResource;
+import java.awt.*;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ContractGeneratorUI {
+    public static void main(String[] args) {
+        try {
+            BeautyEyeLNFHelper.frameBorderStyle = BeautyEyeLNFHelper.FrameBorderStyle.osLookAndFeelDecorated;
+            org.jb2011.lnf.beautyeye.BeautyEyeLNFHelper.launchBeautyEyeLNF();
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        InitGlobalFont(new Font("alias", Font.PLAIN, 15));
+
+        JFrame frame = new JFrame("索引生成");//创建Frame窗口
+        JPanel checkbox_panel;
+        final JCheckBox checkBox_time;
+        final JCheckBox checkBox_account;
+        checkbox_panel = new JPanel();//面板索引选择
+        checkBox_time = new JCheckBox("时间索引");
+        checkBox_account = new JCheckBox("账户索引");
+
+        checkbox_panel.add(checkBox_time);
+        checkbox_panel.add(checkBox_account);
+
+        final JPanel input_sdk = new JPanel();//SDK包名;
+        final JLabel sdk_label = new JLabel("SDK类名");
+        final JTextField sdk = new JTextField(10);
+        final JLabel datalen_label = new JLabel("数据长度");
+        final JTextField data_length = new JTextField(10);
+        final JCheckBox height_sync_cbox = new JCheckBox("使用高度同步");
+        input_sdk.add(sdk_label);
+        input_sdk.add(sdk);
+        input_sdk.add(datalen_label);
+        input_sdk.add(data_length);
+        input_sdk.add(height_sync_cbox);
+
+        final JTabbedPane tab = new JTabbedPane();//选项卡
+        final JPanel cards = new JPanel();    //卡片式布局的面板
+        cards.add(input_sdk);
+        cards.add(checkbox_panel);
+        cards.add(tab);
+        frame.add(cards);
+        frame.setBounds(100, 200, 800, 800);
+        frame.setVisible(true);
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        final Map<String, MainFrame> framemap = new HashMap<>();
+        checkBox_time.addActionListener(e -> {
+            System.out.println("performed");
+            if (checkBox_time.isSelected()) {
+                if (sdk.getText().length() != 0 && data_length.getText().length() != 0) {
+                    Map<String, String> map = new HashMap<>();
+                    map.put("indexData", "./RocksDB");
+                    map.put("datalen", data_length.getText());
+                    map.put("sdkpath", sdk.getText());
+                    if (height_sync_cbox.isSelected()) {
+                        map.put("syncbyheight", "true");
+                    }
+                    String res = ContractGenerator.generateAPIContract(map);
+                    MainFrame time_panel = new MainFrame();
+                    framemap.put("time", time_panel);
+                    time_panel.textfield.setText(res);
+                    tab.add(time_panel, "时间索引");
+                    try {
+                        File file = new File("./output/timeindex.yjs");
+                        file.createNewFile();
+                        FileWriter writer = new FileWriter(file);
+                        BufferedWriter out = new BufferedWriter(writer);
+                        out.write(res);
+                        out.close();
+                    } catch (IOException e1) {
+                        // TODO Auto-generated catch block
+                        e1.printStackTrace();
+                    }
+                }
+            } else {
+                tab.remove(framemap.get("time"));
+            }
+        });
+        checkBox_account.addActionListener(e -> {
+            if (checkBox_account.isSelected()) {
+                Map<String, String> map = new HashMap<>();
+                map.put("indexData", "./RocksDB");
+                String res = ContractGenerator.generateAPIContract(map);
+                MainFrame account_panel = new MainFrame();
+                framemap.put("account", account_panel);
+                account_panel.textfield.setText(res);
+                tab.add(account_panel, "账户索引");
+                try {
+                    File file = new File("./output/accountindex.yjs");
+                    file.createNewFile();
+                    FileWriter writer = new FileWriter(file);
+                    BufferedWriter out = new BufferedWriter(writer);
+                    out.write(res);
+                    out.close();
+                } catch (IOException e1) {
+                    // TODO Auto-generated catch block
+                    e1.printStackTrace();
+                }
+            } else {
+                tab.remove(framemap.get("account"));
+            }
+        });
+    }
+
+    /**
+     * 统一设置字体，父界面设置之后，所有由父界面进入的子界面都不需要再次设置字体
+     */
+    private static void InitGlobalFont(Font font) {
+        FontUIResource fontRes = new FontUIResource(font);
+        for (Enumeration<Object> keys = UIManager.getDefaults().keys(); keys.hasMoreElements(); ) {
+            Object key = keys.nextElement();
+            Object value = UIManager.get(key);
+            if (value instanceof FontUIResource) {
+                UIManager.put(key, fontRes);
+            }
+        }
+    }
+}
diff --git a/src/main/pythongen/org/bdware/sc/contractGen/MainFrame.java b/src/main/pythongen/org/bdware/sc/contractGen/MainFrame.java
new file mode 100644
index 0000000..20bea05
--- /dev/null
+++ b/src/main/pythongen/org/bdware/sc/contractGen/MainFrame.java
@@ -0,0 +1,55 @@
+package org.bdware.sc.contractGen;
+
+import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
+import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
+
+import javax.swing.*;
+import java.util.HashMap;
+import java.util.Map;
+
+public class MainFrame extends JPanel {
+    final RSyntaxTextArea textfield;
+    JLabel sdk_label;
+    JLabel datalen_label;
+
+    JPanel p1;
+    JPanel p2;
+    JButton generate;
+    JButton reset;
+
+    public MainFrame() {
+        this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
+
+        p1 = new JPanel();//面板OnBlock
+        p2 = new JPanel();//面板OnBlock
+
+        generate = new JButton("生成合约");
+        reset = new JButton("重置内容");
+        p2.add(generate);
+        p2.add(reset);
+
+        this.textfield = new RSyntaxTextArea(30, 80);//height,width
+        textfield.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JAVASCRIPT);
+        textfield.setCodeFoldingEnabled(true);
+
+        JScrollPane scroll = new JScrollPane(textfield);
+        scroll.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+        scroll.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
+
+        p1.add(scroll);
+        this.add(p1);
+        this.add(p2);
+
+        reset.addActionListener(arg0 -> {
+            // TODO Auto-generated method stub
+            textfield.setText("");
+        });
+        generate.addActionListener(e -> {
+            // TODO Auto-generated method stub
+            // use new file to generate yjs
+            Map<String, String> map = new HashMap<>();
+            map.put("indexData", "./RocksDB");
+            String res = ContractGenerator.generateAPIContract(map);
+        });
+    }
+}
diff --git a/src/main/pythongen/org/bdware/sc/contractGen/accountindexcontract.vm b/src/main/pythongen/org/bdware/sc/contractGen/accountindexcontract.vm
new file mode 100644
index 0000000..8e5f09c
--- /dev/null
+++ b/src/main/pythongen/org/bdware/sc/contractGen/accountindexcontract.vm
@@ -0,0 +1,60 @@
+contract TimeIndex {
+	function onCreate(arg){
+	  Global.db = com.yancloud.sc.db.RocksDBUtil.loadDB(${indexData},"false");
+	  return "success";
+	}
+	export function getDBStatus(arg){
+      return JSON.stringify(Global.db);
+    }
+    export function onBlock(args){
+      YancloudUtil.setTimeOut(onBlockInternal,1,args);
+      return "success";
+    }
+    export function onTransaction(args){
+      var chainblock = Global.dbs[args.ledgerName].queryBlock(prehash);
+      var chaintrans = chainblock.getTransactionsList();
+      for (var i = 0; i < chaintrans.size(); i++) {
+        var chaintran = chaintrans.get(i);
+        var tranadapter = new com.yancloud.sc.commParser.TransAdapter(chaintran);
+        var tran = tranadapter.trans;
+        var transhash = tran.hash;
+        var frombytes = undefined;
+        //if (chaintran.getTxInputsCount() == 0) {
+        //    continue;
+        //}
+        var frombytes = tran.srcID;
+        var from = com.yancloud.sc.util.HashUtil.byteArray2Str(frombytes);
+        argg = {};
+        argg.account = from;
+        argg.file = "account";
+        if (Global.rocksdb.get(frombytes) == undefined) {
+            print("undefined account :" + from);
+            argg.dataLength = 32;
+            var acindex = com.yancloud.sc.boundry.TimeIndex.createIndex();
+            var res = acindex.createFile(argg);
+            print(JSON.stringify(res));
+            Global.rocksdb.put(frombytes, frombytes);
+        }
+        argg = {};
+        argg.account = from;
+        argg.file = "account";
+        argg.date = tran.timestamp;
+        argg.content = com.yancloud.sc.util.HashUtil.byteArray2Str(transhash);
+        var acindex = com.yancloud.sc.boundry.TimeIndex.createIndex();
+        var res = acindex.manullyIndex(argg);
+    }
+    export function onQuery(args){
+		//request by from
+        argg = {};
+        var pars = JSON.parse(arg);
+        argg.account = pars.from;
+        print(argg.account);
+        argg.file = pars.type;
+        print(argg.file);
+        argg.startTime = pars.start;
+        argg.endTime = pars.end;
+        var acindex = com.yancloud.sc.boundry.AccountIndex.createIndex();
+        var ss = acindex.requestByTime(argg);
+        print(JSON.stringify(ss));
+    }
+}
\ No newline at end of file
diff --git a/src/main/pythongen/org/bdware/sc/contractGen/timeindexcontract.vm b/src/main/pythongen/org/bdware/sc/contractGen/timeindexcontract.vm
new file mode 100644
index 0000000..ba1926e
--- /dev/null
+++ b/src/main/pythongen/org/bdware/sc/contractGen/timeindexcontract.vm
@@ -0,0 +1,64 @@
+contract TimeIndex {
+	function onCreate(arg){
+	  Global.db = com.yancloud.sc.db.RocksDBUtil.loadDB("${indexData}","false");
+	  var sdk = new ${sdkpath}();
+	  Global.sdk = sdk;
+	  return "success";
+	}
+	function saveckpt(args){
+	  var height = Global.height;
+	}
+	export function getDBStatus(arg){
+      return JSON.stringify(Global.db);
+    }
+    export function onBlock(args){
+      YancloudUtil.setTimeOut(onBlockInternal,1,args);
+      return "success";
+    }
+    export function onTransaction(args){
+      var chainblock = Global.sdk.queryBlock(prehash);//改为对应sdk中的方法
+      var chaintrans = chainblock.getTransactionsList();
+      for (var i = 0; i < chaintrans.size(); i++) {
+        var chaintran = chaintrans.get(i);
+        var tranadapter = new com.yancloud.sc.commParser.TransAdapter(chaintran);
+        var tran = tranadapter.trans;
+        var transhash = tran.hash;
+        var frombytes = undefined;
+        if (chaintran.getTxInputsCount() == 0) {
+            continue;
+        }
+        var frombytes = tran.srcID;
+        var from = com.yancloud.sc.util.HashUtil.byteArray2Str(frombytes);
+        argg = {};
+        argg.account = from;
+        argg.file = "account";
+        if (Global.rocksdb.get(frombytes) == undefined) {
+            print("undefined account :" + from);
+            argg.dataLength = ${datalen};
+            var acindex = com.yancloud.sc.boundry.TimeIndex.createIndex();
+            var res = acindex.createFile(argg);
+            print(JSON.stringify(res));
+            Global.rocksdb.put(frombytes, frombytes);
+        }
+        argg = {};
+        argg.account = from;
+        argg.file = "account";
+        argg.date = tran.timestamp;
+        argg.content = com.yancloud.sc.util.HashUtil.byteArray2Str(transhash);
+        var acindex = com.yancloud.sc.boundry.TimeIndex.createIndex();
+        var res = acindex.manullyIndex(argg);
+    }
+    export function onQuery(args){
+		//request by from
+        argg = {};
+        var pars = JSON.parse(arg);
+        argg.account = pars.from;
+        print(argg.account);
+        argg.file = pars.type;
+        print(argg.file);
+        argg.startTime = pars.start;
+        argg.endTime = pars.end;
+        var acindex = com.yancloud.sc.boundry.AccountIndex.createIndex() var ss = acindex.requestByTime(argg);
+        print(JSON.stringify(ss));
+    }
+}
\ No newline at end of file
diff --git a/src/main/pythongen/org/bdware/sc/contractGen/timeindexcontract_height.vm b/src/main/pythongen/org/bdware/sc/contractGen/timeindexcontract_height.vm
new file mode 100644
index 0000000..0105791
--- /dev/null
+++ b/src/main/pythongen/org/bdware/sc/contractGen/timeindexcontract_height.vm
@@ -0,0 +1,64 @@
+contract TimeIndex {
+	function onCreate(arg){
+	  Global.rocksdb = com.yancloud.sc.db.RocksDBUtil.loadDB(${indexData},"false");
+	  Global.height = com.yancloud.sc.util.HashUtil.byteArrayToInt(rocksdb.get("height".getBytes()));
+	  return "success";
+	}
+	function saveckpt(args){
+	  var height = Global.height;
+	  #if($syncbyheight)
+	    Global.rocksdb.put("height".getBytes(),com.yancloud.sc.util.HashUtil.intToByteArray(height));
+	} 
+	export function getDBStatus(arg){
+      return JSON.stringify(Global.db);
+    }
+    export function onBlock(args){
+      YancloudUtil.setTimeOut(onBlockInternal,1,args);
+      return "success";
+    }
+    export function onTransaction(args){
+      var chainblock = Global.dbs[args.ledgerName].queryBlock(prehash);
+      var chaintrans = chainblock.getTransactionsList();
+      for (var i = 0; i < chaintrans.size(); i++) {
+        var chaintran = chaintrans.get(i);
+        var tranadapter = new com.yancloud.sc.commParser.TransAdapter(chaintran);
+        var tran = tranadapter.trans;
+        var transhash = tran.hash;
+        var frombytes = undefined;
+        if (chaintran.getTxInputsCount() == 0) {
+            continue;
+        }
+        var frombytes = tran.srcID;
+        var from = com.yancloud.sc.util.HashUtil.byteArray2Str(frombytes);
+        argg = {};
+        argg.file = "account";
+        if (Global.rocksdb.get(frombytes) == undefined) {
+            print("undefined account :" + from);
+            argg.dataLength = 32;
+            var acindex = com.yancloud.sc.boundry.TimeIndex.createIndex();
+            var res = acindex.createFile(argg);
+            print(JSON.stringify(res));
+            Global.rocksdb.put(frombytes, frombytes);
+        }
+        argg = {};
+        argg.file = "time";
+        argg.date = tran.timestamp;
+        argg.content = com.yancloud.sc.util.HashUtil.byteArray2Str(transhash);
+        var acindex = com.yancloud.sc.boundry.TimeIndex.createIndex();
+        var res = acindex.manullyIndex(argg);
+        saveckpt({})
+        
+    }
+    export function onQuery(args){
+        //request by time
+        argg = {};
+        var pars = JSON.parse(args);
+        argg.file = pars.type;
+        print(argg.file);
+        argg.startTime = pars.start;
+        argg.endTime = pars.end;
+        var acindex = com.yancloud.sc.boundry.AccountIndex.createIndex() var ss = acindex.requestByTime(argg);
+        print(JSON.stringify(ss));
+        return "success";
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
new file mode 100644
index 0000000..054c705
--- /dev/null
+++ b/src/main/resources/log4j.properties
@@ -0,0 +1,7 @@
+### 设置###
+log4j.rootLogger=info,stdout
+### 输出信息到控制台 ###
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%-5p] %d{HH:mm:ss.SSS} %m (%F:%L)[%M]%n
\ No newline at end of file
diff --git a/src/test/java/org/bdware/analysis/dynamic/test/FieldSensitiveDynamicTaintAnalysisTest.java b/src/test/java/org/bdware/analysis/dynamic/test/FieldSensitiveDynamicTaintAnalysisTest.java
new file mode 100644
index 0000000..ad987da
--- /dev/null
+++ b/src/test/java/org/bdware/analysis/dynamic/test/FieldSensitiveDynamicTaintAnalysisTest.java
@@ -0,0 +1,35 @@
+package org.bdware.analysis.dynamic.test;
+
+import org.bdware.analysis.dynamic.FieldSensitiveDynamicTaintAnalysis;
+import org.bdware.analysis.dynamic.TracedFile;
+import org.bdware.analysis.taint.TaintCFG;
+import org.bdware.analysis.taint.TaintResult;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.MethodNode;
+
+import java.io.FileInputStream;
+
+public class FieldSensitiveDynamicTaintAnalysisTest {
+    public static void main(String[] args) throws Exception {
+        String clzPath = "./output/traceTest/wrp/jdk/nashorn/internal/scripts/Script$Recompilation$7$23A$contract_main_yjs7.class";
+        String tracePath = "/Users/hulingxuan/git/SmartContract/output/traceTest/t_1554113218925.trace";
+        // "/Users/damei/Documents/Project/DataContract/SmartContract/output/traceTest/wrp/jdk/nashorn/internal/scripts/Script$Recompilation$5$23A$contract_main_yjs5.class";
+        ClassReader cr = new ClassReader(new FileInputStream(clzPath));
+        ClassNode cn = new ClassNode();
+        TaintResult.nLocals = 15;
+        TaintResult.nStack = 5;
+        cr.accept(cn, ClassReader.EXPAND_FRAMES);
+        for (MethodNode mn : cn.methods) {
+            if (mn.name.equals("statAge")) {
+                System.out.println("[NaiveTaintAnalysis] Matched Method:" + mn.name + mn.desc);
+                TaintCFG cfg = new TaintCFG(mn);
+                TracedFile tf = new TracedFile(new FileInputStream(tracePath));
+                TaintResult.printer.setLabelOrder(cfg.getLabelOrder());
+                FieldSensitiveDynamicTaintAnalysis analysis = new FieldSensitiveDynamicTaintAnalysis(cfg, tf);
+                analysis.analysis();
+                cfg.printSelf();
+            }
+        }
+    }
+}
diff --git a/src/test/java/org/bdware/analysis/dynamic/test/ProgramPointTest.java b/src/test/java/org/bdware/analysis/dynamic/test/ProgramPointTest.java
new file mode 100644
index 0000000..0e72867
--- /dev/null
+++ b/src/test/java/org/bdware/analysis/dynamic/test/ProgramPointTest.java
@@ -0,0 +1,17 @@
+package org.bdware.analysis.dynamic.test;
+
+import org.bdware.analysis.dynamic.ProgramPoint;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+
+public class ProgramPointTest {
+    public static void main(String[] args) throws FileNotFoundException {
+        String tracefile =
+                "/Users/hulingxuan/git/SmartContract/contractExamples/traceTest/mainTrace.trace";
+        InputStream in = new FileInputStream(tracefile);
+        ProgramPoint tf = new ProgramPoint(in);
+        // tf.trans.add(Transaction);
+    }
+}
diff --git a/src/test/java/org/bdware/analysis/dynamic/test/TracedFileTest.java b/src/test/java/org/bdware/analysis/dynamic/test/TracedFileTest.java
new file mode 100644
index 0000000..26b238d
--- /dev/null
+++ b/src/test/java/org/bdware/analysis/dynamic/test/TracedFileTest.java
@@ -0,0 +1,16 @@
+package org.bdware.analysis.dynamic.test;
+
+import org.bdware.analysis.dynamic.TracedFile;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+
+public class TracedFileTest {
+    public static void main(String[] args) throws FileNotFoundException {
+        String traceFile = "/Users/hulingxuan/git/SmartContract/output/main.trace";
+        InputStream in = new FileInputStream(traceFile);
+        TracedFile tf = new TracedFile(in);
+//	    tf.trans.add(Transaction);
+    }
+}
diff --git a/src/test/java/org/bdware/analysis/example/test/FieldSensitiveTaintAnalysisTest.java b/src/test/java/org/bdware/analysis/example/test/FieldSensitiveTaintAnalysisTest.java
new file mode 100644
index 0000000..9aac1b7
--- /dev/null
+++ b/src/test/java/org/bdware/analysis/example/test/FieldSensitiveTaintAnalysisTest.java
@@ -0,0 +1,36 @@
+package org.bdware.analysis.example.test;
+
+import org.bdware.analysis.example.FieldSensitiveTaintAnalysis;
+import org.bdware.analysis.taint.TaintCFG;
+import org.bdware.analysis.taint.TaintResult;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.MethodNode;
+
+import java.io.FileInputStream;
+
+public class FieldSensitiveTaintAnalysisTest {
+    public static void main(String[] args) throws Exception {
+        String clzPath = "./output/traceTest/wrp/jdk/nashorn/internal/scripts/Script$Recompilation$7$23A$contract_main_yjs7.class";
+        // String clzPath =
+        // "/Users/damei/Documents/Project/DataContract/SmartContract/output/traceTest/wrp/jdk/nashorn/internal/scripts/Script$Recompilation$5$23A$contract_main_yjs5.class";
+        ClassReader cr = new ClassReader(new FileInputStream(clzPath));
+        ClassNode cn = new ClassNode();
+        TaintResult.nLocals = 15; // ���þֲ�������Ĵ�С
+        TaintResult.nStack = 5; // ���ò�����ջ�Ĵ�С
+        cr.accept(cn, ClassReader.EXPAND_FRAMES);
+        for (MethodNode mn : cn.methods) {
+            if (mn.name.equals("statAge")) {
+                System.out.println("Matched Method:" + mn.name + mn.desc);
+                TaintCFG cfg = new TaintCFG(mn);
+                TaintResult.printer.setLabelOrder(cfg.getLabelOrder());
+                // ���ù��캯��ʵ���������࣬��ʼ��preResult����ʱanalysis����Ϊһ�����б��洢B0
+                FieldSensitiveTaintAnalysis analysis = new FieldSensitiveTaintAnalysis(cfg);
+                // ����BreadthFirstSearch��ķ�����������ʱ���е�toAnalysis�Ѿ���analysis����
+                analysis.analysis();
+                // ��getLocal(i)����getStack(i)Ϊnull�����ӡ0-
+                cfg.printSelf();
+            }
+        }
+    }
+}
diff --git a/src/test/java/org/bdware/analysis/test/CFGraphTest.java b/src/test/java/org/bdware/analysis/test/CFGraphTest.java
new file mode 100644
index 0000000..ae1e85a
--- /dev/null
+++ b/src/test/java/org/bdware/analysis/test/CFGraphTest.java
@@ -0,0 +1,33 @@
+package org.bdware.analysis.test;
+
+import org.bdware.analysis.BasicBlock;
+import org.bdware.analysis.CFGraph;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.MethodNode;
+
+import java.io.FileInputStream;
+
+public class CFGraphTest {
+    public static void main(String[] args) throws Exception {
+        // String clzFile =
+        // "./input/dumpedClz/wrp/jdk/nashorn/internal/scripts/Script$Recompilation$3$20A$contract_main_yjs3.class";
+        String clzFile = "/Users/hulingxuan/git/SmartContract/output/traceTest/wrp/jdk/nashorn/internal/scripts/Script$Recompilation$7$23A$contract_main_yjs7.class";
+        // String clzFile =
+        // "/Users/huaqiancai/java_workspace/SmartContract/output/traceTest_1552663123542/wrp/jdk/nashorn/internal/scripts/Script$Recompilation$5$23A$contract_main_yjs5.class";
+        ClassNode cn = new ClassNode();
+        ClassReader cr = new ClassReader(new FileInputStream(clzFile));
+        cr.accept(cn, ClassReader.EXPAND_FRAMES);
+        for (MethodNode method : cn.methods) {
+            if (!method.name.equals("statAge"))
+                continue;
+            CFGraph cf = new CFGraph(method) {
+                @Override
+                public BasicBlock getBasicBlock(int id) {
+                    return new BasicBlock(id);
+                }
+            };
+            cf.printSelf();
+        }
+    }
+}
diff --git a/src/test/java/org/bdware/sc/AvatarHelperTest.java b/src/test/java/org/bdware/sc/AvatarHelperTest.java
new file mode 100644
index 0000000..0069814
--- /dev/null
+++ b/src/test/java/org/bdware/sc/AvatarHelperTest.java
@@ -0,0 +1,18 @@
+package org.bdware.sc;
+
+import org.apache.commons.io.FileUtils;
+import org.bdware.sc.packer.AvatarHelper;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.IOException;
+
+public class AvatarHelperTest {
+    @Test
+    public void test() throws IOException {
+        String random = "absadlkjdsalfkjdsalfd;fkldsajfas";
+        FileUtils.writeByteArrayToFile(
+                new File("./build/llllogo.png"), AvatarHelper.create(random));
+        System.out.println("DONE:" + new File("./build/llllogo.png").getAbsolutePath());
+    }
+}
diff --git a/src/test/java/org/bdware/sc/LedgerUtilTest.java b/src/test/java/org/bdware/sc/LedgerUtilTest.java
new file mode 100644
index 0000000..d82fdb3
--- /dev/null
+++ b/src/test/java/org/bdware/sc/LedgerUtilTest.java
@@ -0,0 +1,24 @@
+package org.bdware.sc;
+
+import org.bdware.bdledger.api.grpc.Client;
+//import org.bdware.bdledger.api.grpc.pb.QueryOuterClass;
+import org.bdware.bdledger.api.grpc.pb.QueryProto;
+import org.junit.Test;
+
+public class LedgerUtilTest {
+
+    @Test
+    public void query(){
+        String str = "0828c62576606e27ef8d079dea60cadd6eb03351";
+        Client c = new Client("022.node.internetapi.cn",21121);
+        QueryProto.GetTransactionByHashResponse syncResult = c.getTransactionByHashSync("default", "5c79fb8d71771615a5c8173b8089cd4841c3adfb");
+        System.out.println(new String(syncResult.getTransaction().getData().toByteArray()));
+        System.out.println(syncResult.getTransaction().getData().toByteArray().length);
+
+        // 092：47.107.94.135
+       // 093：120.79.215.187
+//        QueryOuterClass.GetTransactionByHashResponse hash = c.getTransactionByHashSync("test", str);
+//        String str2 =  hash.getTransaction().getFrom().toStringUtf8();
+//        System.out.println("===="+str2);
+    }
+}
diff --git a/src/test/java/org/bdware/sc/SockGetTest.java b/src/test/java/org/bdware/sc/SockGetTest.java
new file mode 100644
index 0000000..b2b637b
--- /dev/null
+++ b/src/test/java/org/bdware/sc/SockGetTest.java
@@ -0,0 +1,16 @@
+package org.bdware.sc;
+
+import org.bdware.sc.conn.SocketGet;
+import org.junit.Test;
+
+public class SockGetTest {
+    @Test
+    public void test(){
+        SocketGet get = new SocketGet("127.0.0.1",18000);
+        System.out.println("Start");
+        long start = System.currentTimeMillis();
+        String re = get.syncGet("", "isContractProcess", "");
+        System.out.println(re);
+        System.out.println("[Takes]"+(System.currentTimeMillis()-start));
+    }
+}
diff --git a/src/test/java/org/bdware/sc/bean/ContractRequestTest.java b/src/test/java/org/bdware/sc/bean/ContractRequestTest.java
new file mode 100644
index 0000000..17a6241
--- /dev/null
+++ b/src/test/java/org/bdware/sc/bean/ContractRequestTest.java
@@ -0,0 +1,23 @@
+package org.bdware.sc.bean;
+
+import org.bdware.sc.util.JsonUtil;
+import org.zz.gmhelper.SM2KeyPair;
+
+public class ContractRequestTest {
+    public static void main(String[] args) {
+        ContractRequest req = new ContractRequest();
+        // req.requester = rsa.toBase64Pubkey();
+        req.contractID = "123";
+        req.action = "main";
+        req.arg = "arg1";
+        String key =
+                "{\"privateKey\":\"589d94ee5688358a1c5c18430dd9c75097ddddebf769f139da36a807911d20f8\"," +
+                        "\"publicKey\":\"04d1924329f72ced148f6f333fb985ccbaa31b1e3aacf10be5f43d4a4ff5a" +
+                        "d88899a005e79e37fc06993e1d66ada8cf8b711cb36f59538bb7d3e39e70fa9360ddd\"}";
+        SM2KeyPair pair = SM2KeyPair.fromJson(key);
+        req.doSignature(pair);
+        System.out.println(req.verifySignature());
+        System.out.println(JsonUtil.toJson(req));
+        System.out.println(req.verifySignature());
+    }
+}
diff --git a/src/test/java/org/bdware/sc/bean/test/EnumDecodeTest2.java b/src/test/java/org/bdware/sc/bean/test/EnumDecodeTest2.java
new file mode 100644
index 0000000..302d137
--- /dev/null
+++ b/src/test/java/org/bdware/sc/bean/test/EnumDecodeTest2.java
@@ -0,0 +1,14 @@
+package org.bdware.sc.bean.test;
+
+import org.bdware.sc.bean.ContractExecType;
+import org.bdware.sc.node.ContractManifest;
+import org.bdware.sc.util.JsonUtil;
+
+public class EnumDecodeTest2 {
+    public static void main(String[] str) {
+        ContractManifest cm = new ContractManifest();
+        //cm.setType(Contract.Type.Algorithm);
+        cm.setType(ContractExecType.Sole);
+        System.out.println(JsonUtil.toJson(cm));
+    }
+}
diff --git a/src/test/java/org/bdware/sc/boundary/utils/SM2UtilTest.java b/src/test/java/org/bdware/sc/boundary/utils/SM2UtilTest.java
new file mode 100644
index 0000000..0d579e5
--- /dev/null
+++ b/src/test/java/org/bdware/sc/boundary/utils/SM2UtilTest.java
@@ -0,0 +1,149 @@
+package org.bdware.sc.boundary.utils;
+
+import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
+import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
+import org.bouncycastle.crypto.params.ECPublicKeyParameters;
+import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey;
+import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey;
+import org.bouncycastle.pqc.math.linearalgebra.ByteUtils;
+import org.junit.Test;
+import org.zz.gmhelper.BCECUtil;
+import org.zz.gmhelper.SM2KeyPair;
+import org.zz.gmhelper.SM2Util;
+import sun.misc.BASE64Encoder;
+
+import java.math.BigInteger;
+import java.security.KeyPair;
+
+public class SM2UtilTest {
+    String keyPairStr =
+            "{\"publicKey\":\"0442e39c0b1623e6f95ef896d37f41aa3cd98fbc3aea71250eedba4335c6c3aff51b5fa2352f920d1063b50a30738427c18375df886985a63e0f496293fdad22a8\",\"privateKey\":\"b7e504cf951792554bf4a9874be37cb1279d38939444388e2046ee9603b4f0c4\"}";
+    SM2KeyPair keyPair = SM2KeyPair.fromJson(keyPairStr);
+
+    @Test
+    public void base64() {
+        String gstr =
+                "09146332716e7767327923056946406e49570e5909146332716e7767327923056946406e49570e59";
+        byte[] bytes = ByteUtils.fromHexString(gstr);
+        String str = new BASE64Encoder().encode(bytes);
+        System.out.println(str);
+    }
+
+    @Test
+    public void genKey() throws Exception {
+        //   SM2KeyPair pair = new SM2().generateKeyPair();
+        AsymmetricCipherKeyPair keyy = SM2Util.generateKeyPairParameter();
+        KeyPair key = SM2Util.generateKeyPair(null);
+        BCECPrivateKey priKey = (BCECPrivateKey) key.getPrivate();
+        BCECPublicKey pubKey = (BCECPublicKey) key.getPublic();
+        priKey.getD();
+        pubKey.getQ();
+        System.out.println(key.getPrivate().getEncoded() + "-->" + key.getPublic().getEncoded());
+        // System.out.println(pair.toJson());
+    }
+
+    @Test
+    public void verify() throws Exception {
+        String signature =
+                "30440220694f00ae34a1d68ca3f6c54876eead4e4b830edfe5836b9910fd5b47704bab1f022020e17c5ec642e74c4a3e0845580983e771d856ad4bbd641166e0b693f7ae78b7";
+        signature =
+                "3045022053d6dbb2f79c8f018b7f2861685ca289a5e3b85d572e0b1a8db8bb2b75345839022100de5a95e0b35896df187fb5659c4237b8c87ab7c38aa29edb548c94ff2f0e0ce9";
+        String signa =
+                "66f0a2ed730f91a3f6c18d800da83e8cb21561f1a51dc649ae75fb006b6c0a4d60169ecae2b8df16a10dd55dcc93155c5d24c3f7c0667971f5d28ea650e25ecc";
+        byte[] signb = ByteUtils.fromHexString(signa);
+        signb = SM2Util.encodeSM2SignToDER(signb);
+        signature = ByteUtils.toHexString(signb);
+        signature =
+                "30450221009aa04608d432dc7865274ac02e7e92b93a8a08e07bdc9678966229b15f26ff570220244c464e2c82533e280c4003ab97347d63c90052fb18b8a917a1c9ca4ed2985a";
+
+        String toVerify =
+                "DistributeContract|DBMMerger_2020-12-23-14:01:11_Auto.ypk|04f5c7cc4b202047da7aff4b93e66204d8e04d0e26435e792afcfb8b4bf918b9b4ec8550e669fb1581203fcd7187ea993391d6c3ee6e348ee17febee3bdad783c3";
+        String keyPair =
+                "{ \"privateKey\": \"347caf3393482440cf5a79995b2c83f567644dfa9b4804755bd093141542db96\", \"publicKey\": \"04f5c7cc4b202047da7aff4b93e66204d8e04d0e26435e792afcfb8b4bf918b9b4ec8550e669fb1581203fcd7187ea993391d6c3ee6e348ee17febee3bdad783c3\" }";
+        String pubKey =
+                "04f5c7cc4b202047da7aff4b93e66204d8e04d0e26435e792afcfb8b4bf918b9b4ec8550e669fb1581203fcd7187ea993391d6c3ee6e348ee17febee3bdad783c3";
+        boolean ret = SM2Util.plainStrVerify(pubKey, toVerify, signature);
+        System.out.println("ret:" + ret);
+    }
+
+    @Test
+    public void boundrySign() throws Exception {
+        String content = "hello";
+
+        BigInteger privKey =
+                new BigInteger(
+                        "b7e504cf951792554bf4a9874be37cb1279d38939444388e2046ee9603b4f0c4", 16);
+        ECPrivateKeyParameters priKey =
+                new ECPrivateKeyParameters(privKey, org.zz.gmhelper.SM2Util.DOMAIN_PARAMS);
+        byte[] sign = org.zz.gmhelper.SM2Util.sign(priKey, content.getBytes());
+        sign = org.zz.gmhelper.SM2Util.decodeDERSM2Sign(sign);
+
+        System.out.println(ByteUtils.toHexString(sign));
+    }
+
+    @Test
+    public void boundryVerify() throws Exception {
+        String content = "e8dffc921bf41ec8b96c8a7bfc18b0530c667c23";
+        String signature =
+                "480c60524351826a080b16ffee13b84d84b55d036a31e81e11c0238c5946e2e676c7560575825a59fe76d40703ba9a309b409c6494824e1c98b0bc46f1d754bf";
+        String pubKeyStr =
+                "0428083afc0d61b10790560ed15963f7ecca5f6c0b896b5379029f8d09936bbc379efed9c1599d40a447b360e17ecbe0b18ed05cc0a1875ca1767be6952cc9c0b5";
+        byte[] sig = ByteUtils.fromHexString(signature);
+        sig = SM2Util.encodeSM2SignToDER(sig);
+        ECPublicKeyParameters pubKey =
+                BCECUtil.createECPublicKeyFromStrParameters(
+                        pubKeyStr,
+                        org.zz.gmhelper.SM2Util.CURVE,
+                        org.zz.gmhelper.SM2Util.DOMAIN_PARAMS);
+        boolean value = org.zz.gmhelper.SM2Util.verify(pubKey, content.getBytes(), sig);
+        System.out.println(value);
+    }
+
+    @Test
+    public void encrypt() throws Exception {
+        String pubkey =
+                "0417b2fd4174ca9dcc5c5fa315febc5ea2488676f746e127fafb50a3b4c31daad863994775cac6f6139f0d6400c94dbeeb11a6962eaf8176fced641d69b475d446";
+        String data = "dafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdf";
+        byte[] data2 = SM2Util.encrypt(SM2KeyPair.publicKeyStr2ECPoint(pubkey), data.getBytes());
+
+        System.out.println(ByteUtils.toHexString(data2));
+    }
+
+    @Test
+    public void decrypt() throws Exception {
+
+
+    }
+
+    // Deprecated
+    //    @Test
+    //    public void signAtServer() {
+    //        SM2 sm2 = new SM2();
+    //        SM2.Signature signature = sm2.sign("Hello".getBytes(), keyPair.getPrivateKey());
+    //        System.out.println(signature.toString());
+    //    }
+    //
+    //    @Test
+    //    public void verifyServerToServer() {
+    //        String str =
+    //
+    // "d58ca7ade729ccaf36e8d2d22990a8e2e8d7242979e92c9d80d8abcf10924566,f3888664ed5e0fc850285b1c05f8c042497893a21939b64919dc861b382776a3";
+    //        SM2 sm2 = new SM2();
+    //        boolean ret =
+    //                sm2.verify("Hello", SM2.Signature.loadFromString(str), "",
+    // keyPair.getPublicKey());
+    //        System.out.println("[VerifyServer] " + ret);
+    //    }
+    //
+    //    @Test
+    //    public void verifyClientToServer() {
+    //        String sig =
+    //
+    // "11d9c57d8ff6db5a8662dd91540f60666c3fa50a5ef47c6529fef15e64485f155d8747455b97cff636282758aa00c5245f8de92fb4cbb280e7d9d23c1907892c";
+    //        SM2 sm2 = new SM2();
+    //        boolean ret =
+    //                sm2.verify("Hello", SM2.Signature.loadFromString(sig), "",
+    // keyPair.getPublicKey());
+    //        System.out.println("[VerifyClientToServer] " + ret);
+    //    }
+}
diff --git a/src/test/java/org/bdware/sc/conn/test/SocketGetTest.java b/src/test/java/org/bdware/sc/conn/test/SocketGetTest.java
new file mode 100644
index 0000000..56dfad7
--- /dev/null
+++ b/src/test/java/org/bdware/sc/conn/test/SocketGetTest.java
@@ -0,0 +1,17 @@
+package org.bdware.sc.conn.test;
+
+import org.bdware.sc.conn.SocketGet;
+
+public class SocketGetTest {
+
+    public static void main(String[] args) {
+        System.out.println("开始测试 : ");
+        int startPort = Integer.parseInt(args[0]);
+        int endPort = Integer.parseInt(args[1]);
+        for (int i = startPort; i < endPort; i++) {
+            SocketGet get = new SocketGet("127.0.0.1", startPort);
+            String cpCMI = get.syncGet("", "getContract", "");
+            System.out.println(i + "-> 测试结果为 : " + cpCMI);
+        }
+    }
+}
diff --git a/src/test/java/org/bdware/sc/db/MultiIndexTimeDBUtilTest.java b/src/test/java/org/bdware/sc/db/MultiIndexTimeDBUtilTest.java
new file mode 100644
index 0000000..0c19962
--- /dev/null
+++ b/src/test/java/org/bdware/sc/db/MultiIndexTimeDBUtilTest.java
@@ -0,0 +1,31 @@
+package org.bdware.sc.db;
+
+import com.google.gson.JsonObject;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.List;
+
+public class MultiIndexTimeDBUtilTest {
+    private MultiIndexTimeDBUtil db;
+
+    @Before
+    public void init() {
+        db = new MultiIndexTimeDBUtil("/Users/huaqiancai/lab/BDM/temp/", "CM_LocalContractLogDB");
+    }
+
+    @Test
+    public void test() {
+        long start = System.currentTimeMillis() - 10 * 24 * 3600 * 1000L;
+        for (; start < System.currentTimeMillis(); start += 24 * 3600 * 1000)
+            System.out.println(db.queryOffset("TakeoutTianjinRate", start));
+        System.out.println(db.size("TakeoutTianjinRate"));
+        List<JsonObject> list =
+                db.queryByDateAsJson(
+                        "TakeoutTianjinRate",
+                        System.currentTimeMillis() - 10 * 24 * 3600 * 1000L,
+                        System.currentTimeMillis());
+        for (JsonObject jo:list)
+            System.out.println(jo.toString());
+    }
+}
diff --git a/src/test/java/org/bdware/sc/encrypt/test/HardwareInfoTest.java b/src/test/java/org/bdware/sc/encrypt/test/HardwareInfoTest.java
new file mode 100644
index 0000000..11160cf
--- /dev/null
+++ b/src/test/java/org/bdware/sc/encrypt/test/HardwareInfoTest.java
@@ -0,0 +1,46 @@
+package org.bdware.sc.encrypt.test;
+
+import org.bdware.sc.conn.ByteUtil;
+import org.bdware.sc.encrypt.HardwareInfo;
+import org.bdware.sc.encrypt.RSA;
+
+import java.io.IOException;
+import java.util.Arrays;
+
+public class HardwareInfoTest {
+    // {"action":"apply","arg":"{\"uuid\":\"MzkxMmQ0MDUtMjAyYy00NWE0LTk2ZjktMGQ1ZmMzOWFiN2Nl\",\"remark\":1660864742952}"}
+    // {"action":"accept","arg":"{\"uuid\":\"MzkxMmQ0MDUtMjAyYy00NWE0LTk2ZjktMGQ1ZmMzOWFiN2Nl\",\"date\":1660864742952}"}
+    public static void main(String[] args) throws IOException {
+        System.out.println("CPUID:" + HardwareInfo.getCPUID());
+        String key =
+                "OTIzNmUzMGNmOGI1ZjFkMDBjZjEyMWY4OThmM2ZmYTIwNjE2ODYxOWNiMDNhMTVlM2FiZTA0OThhNTlkZDg1MmRiMjA5Njc1NmM3ZDBhOWM3YTNkOTg2NWVlYzk2YzM1MmY0MDdkMGMyOTA4M2NkNDI4YmY1YjM5M2U5OTA1NWE0MzM0MTJhM2Y2ZDhkZWVmZDk4MmI4NmZiZTMyYjhlMGE3ZWFmZmE5ODM3M2E4ZTRmNTYyNDgxNTY0Yjk2ZjFkMTZiODk2MGRhZDAwMTNjZDYwOGZmOTcxNjdiOWI1MDU1MjJlMzk0ODhmODczNDJjNWUwOGRjZjFhZjFkYzBjODUxZjRlNDg2ZWIyOTM5NDI3MDc4MjA5NDg5ODliODVhZDNlOGJlNWJiYWEzZDUyMWU2MjdmZjE3NGY4Y2ZlZDk3NTY4OWNlNDEzOGYyMTgyOWIwMDVmMzE0YjM3MmNlZmFkZjBkNmUyOTY4ZGUzZmFlNGUxNTFkMWFmNWE4Mjc4ZjQ2MDI5ODBjY2JkMDM0ZDE0YWRjZDk1ZjI1MjY3NmRlODRjYzdkNzU5NGYyYTAxMTliYWJmYjgyMGRjMWNjZWZjNThjNWUwYWRjMDQyM2MzYzA1ODNhZTU1MWZlN2Y5YTYwYjkxZjg2YWViNDNlMzU0NzlhYWI5YmFjOTAwN2IsMTAwMDEsODg1Yjk1YWRlMDM4ZDY1NWZmZWJkNTkxYTExYjU0OTkwNmYyNzQ4NzkzNzQ0NDQ2YmJhM2MwNjc5Nzc0Yjg2Y2I1MWQxNDE0NTg2M2Q4YzQ4YjlmZWMwMzhjMDhkZWQ4NGVjM2U2OWFiMzlkOTIxNTBlMTczZjdkMDg2YWVlYjlmYTE4OTMxNWM0YmQwNjU0NGFkNjg1MjhmOTA5MTZhZmI1MGEwY2ZhNGFiNDRmOWI4ZjU4ZTNmZWM3OWJjNDBiMmRjODYxNzA0OTk5ZGJkZGRhMjMwYjJmN2VkYjhhZmQ3NjYxZDM1YzVmMzY2OTJhYzM1YmEyYTllNjc1NjlmNjNkMjIwZDdhMmI5MGRjYmU3ZTA4NWE0ODhjZDY0YzhhNTc0MjY1NDI5NzJjMGU0MGJjZmM3ZDc2N2U5ZDFiNDU1NDUwMTFjYzZjOWExNjExNGIzMGNkZjBmYmI1MzA5NzI5MzA3ZTM1NWI5NjBlMjRmMzg0NDUyM2JjOWYxZDk4YzE1Yzk0MGUwNmYyM2FiNDk4MzA0ZGIzODZjZDU2MmYwMThmN2Y5OGQ3MzQ0YWQyNjFkY2MzZWIzYjZmODQ0MThjZWZmNGE3ZTYyMDc2NjY5ZDdhMGUwNjgxYzlhZTRkMWZhOWViMmVjNjg3M2ZlMDY2Mzk4ZTAzOTlkMTk4ODE=";
+        RSA rsa = RSA.generateFromBase64(key);
+        String data =
+                HardwareInfo.getCPUID() + "==" + (System.currentTimeMillis() + 365L * 50L * 24L * 3600L * 1000L);
+        byte[] bytes = data.getBytes();
+        bytes = rsa.decode(bytes);
+        // rsa = RSA.generateFromBase64(rsa.toBase64Pubkey());
+        System.out.println("Data:" + data);
+        System.out.println("======Generated Key:=====");
+        System.out.println(ByteUtil.encodeBASE64(bytes).replaceAll("\n", ""));
+        System.out.println("======Done:======");
+        String encoded =
+                "OWXJxeOhjmer/+2oBTXlLEOltiocVqBWsj/uW1mDoYFC+ikh2z9b7EQVDDDnz3TBOsfjs8+JpTYp4B6b2uYcrFww2WUrf78rB/WOqJ9domJXQ8w/3uiQwqNXecHByQ8488UtLLtvm5eNy9B7xtWzRqi/89X4A/sypIPxUe7NF4IXnameuC0GE/ZKdZeJKV5qn2deVBt7ApAPbsKSk55W5lOK/nLwAr8oK1QtFI0qKDhjVTbNobU16AOTzbhaijZpG102BkzrkoCeosnHOD8CMz3WT0P2H+hI9yXbvfNJTCw2tmo+Q1yeEjSQxgdXHEbKM6sdJiN35GXEiFXxXpDsNw==";
+        bytes = rsa.encode(ByteUtil.decodeBASE64(encoded));
+        System.out.println(new String(bytes));
+
+        byte[] data2 = ByteUtil.decodeBASE64("MzkxMmQ0MDUtMjAyYy00NWE0LTk2ZjktMGQ1ZmMzOWFiN2Nl");
+        String strr = new String(data2) + "==" + "1660864742952";
+
+        System.out.println("Original:" + strr);
+        byte[] decoded = rsa.decode(strr.getBytes());
+        System.out.println("Hash:" + Arrays.hashCode(decoded));
+        String newLicence = ByteUtil.encodeBASE64(decoded);
+        System.out.println("newLicence:" + newLicence.replaceAll("\n", ""));
+    }
+
+    // OGJhYmY5Yjk0YzU1Y2RlMmE0Y2VhODE0YTE2NmMyYWNhZDMwZjNmNjdmZWUwY2M1MDNhODNlYTk3NjQxMGRiMGRjYzc5MDI4OTIzNDhiMTUxMmE2MWZmODJkOTFhMjAyMzIzYmJkMTA0MzMyZTJjMmQ3YmQxNTdkNTZjZWIzOGMyOWY4MWFiOTM1MzY0ZDEzMjY5ZDQzMTc0NWUyZDcyOGMwMTk0NmFlMDA0ZGY5OWQ1YzViNDUwMDRjMDgyOWE0YWFhZGQ2YTFjYjNiMmM3YjBhYzE3MTdjZGFkYzVhZTg1NTA2NTI4Mjg4MzBhNzMwNTExM2YwN2FiNWUyNmU3YWFmMzgwMDAyYTE1OTM0ZWQyOTA4YjViZTI0MTNiYmEwNDkwN2RkNDEzYjkwYzIzMmIxNmIyNTVlM2ZlYjg2ZDM2YTAzZGVmZTM1MTlhOTk4NzI3ODIxODA2YWI3YmJjNjk3NGNiMTI5YmIwZTFmNmY2NWI2NmVhN2EzNzU1ZmJiYWQ5MTI2MTM2NGIwMjNiYWQzZDZiYTUyODkwYTg5MGNiZjAxMTQwYjY5YjU2NzZkZTMxMmFjZjRlN2I4OGQyMTllNWEzZmRjNTQwNzVlNTg0ODIzMGNhNGI4NWE5MmE0MzY4ZjdjMmVjYzk0ZWNlMjhlOWI1ZGYwZmQ5MDA1Y2QsMTAwMDEsYTZiZTg5NDM0ZTdlYTE2ZDEyOTQyNGQ1N2M1YWQxY2U5NDc0ZmNjYzJiYWU2NjUwNGUyZDZkYTFhMjJiYzdjYzdkYzc0MWIzMmRkOGNjYjIzYmIxNTgzOTUxMmRhYmRjMzM1YzVlM2EyYmZmNzNmODY4ZDZiM2YxMGVkMTc2NDhiZjUyMTM5NTQ4OTFhYjMyNTFjNzJkNzE3YjVkNzRjMDkxOTU5YjZiZGZiMTM3NmY0NWYzMzA0ZDRhNzdmNDNmNDIwNDg3NTg2MGU4MjQxMjQwYTRmMDc3YmU1MTkzYjYwYWNiYTE3NTc0NjFhMTM3NmQ5NDAwNjQ3ZWZmZjQyMzdmYjg3NDM0OWFiMzRmYzQxZmQ4MTI0OTYwMzQ3NTY1YTczYzk2ZWFiOGRiZmY2MzQzYTE5Mzg0ZTRhMzdkZTQ4MjcxZTFiMDZhZTI3NGVjZmY3MTQ5MjRiYzNjNzUwNDNiZWRjMTlkZjc3YmQyM2ZjMDAxNjk2NDY2NjM3OGU4ZGQ0Y2QyZTY0MzhlNDdkOGU3NGJlZGYwNmFmOWQxNGJkMDFkNjU2YzI1MWNlNWQ5OWI4Mzk0MjA5ODViNzZiZmI5YmU1MmVkODY1ODc2OGM5NzkyYTNjNzdiODA2N2JhOTJjZDI2YjQxZDI4ZDM2NGNkNTkwMTZmOWFmZTNkOQ==
+    // {"action":"init","arg":
+    // "OTIzNmUzMGNmOGI1ZjFkMDBjZjEyMWY4OThmM2ZmYTIwNjE2ODYxOWNiMDNhMTVlM2FiZTA0OThhNTlkZDg1MmRiMjA5Njc1NmM3ZDBhOWM3YTNkOTg2NWVlYzk2YzM1MmY0MDdkMGMyOTA4M2NkNDI4YmY1YjM5M2U5OTA1NWE0MzM0MTJhM2Y2ZDhkZWVmZDk4MmI4NmZiZTMyYjhlMGE3ZWFmZmE5ODM3M2E4ZTRmNTYyNDgxNTY0Yjk2ZjFkMTZiODk2MGRhZDAwMTNjZDYwOGZmOTcxNjdiOWI1MDU1MjJlMzk0ODhmODczNDJjNWUwOGRjZjFhZjFkYzBjODUxZjRlNDg2ZWIyOTM5NDI3MDc4MjA5NDg5ODliODVhZDNlOGJlNWJiYWEzZDUyMWU2MjdmZjE3NGY4Y2ZlZDk3NTY4OWNlNDEzOGYyMTgyOWIwMDVmMzE0YjM3MmNlZmFkZjBkNmUyOTY4ZGUzZmFlNGUxNTFkMWFmNWE4Mjc4ZjQ2MDI5ODBjY2JkMDM0ZDE0YWRjZDk1ZjI1MjY3NmRlODRjYzdkNzU5NGYyYTAxMTliYWJmYjgyMGRjMWNjZWZjNThjNWUwYWRjMDQyM2MzYzA1ODNhZTU1MWZlN2Y5YTYwYjkxZjg2YWViNDNlMzU0NzlhYWI5YmFjOTAwN2IsMTAwMDEsODg1Yjk1YWRlMDM4ZDY1NWZmZWJkNTkxYTExYjU0OTkwNmYyNzQ4NzkzNzQ0NDQ2YmJhM2MwNjc5Nzc0Yjg2Y2I1MWQxNDE0NTg2M2Q4YzQ4YjlmZWMwMzhjMDhkZWQ4NGVjM2U2OWFiMzlkOTIxNTBlMTczZjdkMDg2YWVlYjlmYTE4OTMxNWM0YmQwNjU0NGFkNjg1MjhmOTA5MTZhZmI1MGEwY2ZhNGFiNDRmOWI4ZjU4ZTNmZWM3OWJjNDBiMmRjODYxNzA0OTk5ZGJkZGRhMjMwYjJmN2VkYjhhZmQ3NjYxZDM1YzVmMzY2OTJhYzM1YmEyYTllNjc1NjlmNjNkMjIwZDdhMmI5MGRjYmU3ZTA4NWE0ODhjZDY0YzhhNTc0MjY1NDI5NzJjMGU0MGJjZmM3ZDc2N2U5ZDFiNDU1NDUwMTFjYzZjOWExNjExNGIzMGNkZjBmYmI1MzA5NzI5MzA3ZTM1NWI5NjBlMjRmMzg0NDUyM2JjOWYxZDk4YzE1Yzk0MGUwNmYyM2FiNDk4MzA0ZGIzODZjZDU2MmYwMThmN2Y5OGQ3MzQ0YWQyNjFkY2MzZWIzYjZmODQ0MThjZWZmNGE3ZTYyMDc2NjY5ZDdhMGUwNjgxYzlhZTRkMWZhOWViMmVjNjg3M2ZlMDY2Mzk4ZTAzOTlkMTk4ODE="}
+
+}
diff --git a/src/test/java/org/bdware/sc/encrypt/test/RSATest.java b/src/test/java/org/bdware/sc/encrypt/test/RSATest.java
new file mode 100644
index 0000000..77c0487
--- /dev/null
+++ b/src/test/java/org/bdware/sc/encrypt/test/RSATest.java
@@ -0,0 +1,25 @@
+package org.bdware.sc.encrypt.test;
+
+import org.bdware.sc.conn.ByteUtil;
+import org.bdware.sc.encrypt.RSA;
+
+public class RSATest {
+    public static void main(String[] args) {
+        RSA rsa = RSA.generate();
+        String base64 = rsa.toBase64();
+        String pubBase64 = rsa.toBase64Pubkey();
+        System.out.println("======Privkey");
+        System.out.println(base64);
+        System.out.println("======Pubkey");
+        System.out.println(pubBase64);
+        System.out.println("======Done");
+        rsa = RSA.generateFromBase64(pubBase64);
+        byte[] data = "hafasdfadsfas".getBytes();
+        assert rsa != null;
+        byte[] encodeData = rsa.encode(data);
+        System.out.println(ByteUtil.encodeBASE64(encodeData).replaceAll("\n", ""));
+        System.out.println(new String(rsa.decode(encodeData)) + "|||");
+        // RSA rsa2 = generateFromBase64(base64);
+        // System.out.println(rsa.e2 + "\n" + rsa2.e2);
+    }
+}
diff --git a/src/test/java/org/bdware/sc/http/test/ApiGateTest.java b/src/test/java/org/bdware/sc/http/test/ApiGateTest.java
new file mode 100644
index 0000000..900bdd4
--- /dev/null
+++ b/src/test/java/org/bdware/sc/http/test/ApiGateTest.java
@@ -0,0 +1,11 @@
+package org.bdware.sc.http.test;
+
+import org.bdware.sc.http.ApiGate;
+
+public class ApiGateTest {
+    public static void main(String[] args) {
+        ApiGate gate = new ApiGate("192.168.0.105");
+        String ret = gate.get("com.smal.kettle", "getModes", "");
+        System.out.println(ret);
+    }
+}
diff --git a/src/test/java/org/bdware/sc/http/test/HttpPostFormTest.java b/src/test/java/org/bdware/sc/http/test/HttpPostFormTest.java
new file mode 100644
index 0000000..a20f212
--- /dev/null
+++ b/src/test/java/org/bdware/sc/http/test/HttpPostFormTest.java
@@ -0,0 +1,23 @@
+package org.bdware.sc.http.test;
+
+import org.bdware.sc.http.HttpPostForm;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class HttpPostFormTest {
+    public static void main(String[] args) {
+        String url = "http://47.106.38.23:13081/register";
+
+        Map<String, String> params = new HashMap<>();
+        String sucFix = System.currentTimeMillis() + "_ContractLog";
+        params.put("DOI", "86.5000.470/" + sucFix);
+        params.put("Description", "Contract Log");
+        params.put("Interface", "");
+        params.put("Address", "");
+        params.put("PublicKey", "");
+        params.put("Signature", "");
+        // http://47.106.38.23:8080/idsystem/doDetail.html?doi=86.5000.470/1570626378959_ContractLog
+        HttpPostForm.postForm(url, params);
+    }
+}
diff --git a/src/test/java/org/bdware/sc/http/test/HttpUtilTest.java b/src/test/java/org/bdware/sc/http/test/HttpUtilTest.java
new file mode 100644
index 0000000..49fc805
--- /dev/null
+++ b/src/test/java/org/bdware/sc/http/test/HttpUtilTest.java
@@ -0,0 +1,18 @@
+package org.bdware.sc.http.test;
+
+import org.bdware.sc.http.HttpUtil;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+public class HttpUtilTest extends HttpUtil {
+    public static void main(String[] arg) {
+        File f = new File("/Users/huaqiancai/Downloads/用户_35052234324_15454544545.xls");
+        Map<String, String> header = new HashMap<>();
+        header.put("Content-Type", "application/x-www-form-urlencoded; boundary=" + BOUNDARY);
+        header.put("Charsert", "UTF-8");
+        // http://127.0.0.1:8081/api/file_upload?name=user5
+        postForm("http://127.0.0.1:8081/api/file_upload?name=user5", header, f);
+    }
+}
diff --git a/src/test/java/org/bdware/sc/test/ContractProcessInfoLogger.java b/src/test/java/org/bdware/sc/test/ContractProcessInfoLogger.java
new file mode 100644
index 0000000..4e050c2
--- /dev/null
+++ b/src/test/java/org/bdware/sc/test/ContractProcessInfoLogger.java
@@ -0,0 +1,26 @@
+package org.bdware.sc.test;
+
+import org.bdware.sc.conn.SocketGet;
+
+public class ContractProcessInfoLogger {
+    public static void main(String[] args) {
+        System.out.println("开始测试 : ");
+        int startPort, endPort;
+        if (args != null && args.length > 1) {
+            startPort = Integer.parseInt(args[0]);
+            endPort = Integer.parseInt(args[1]);
+        } else {
+            startPort = 1915;
+            endPort = 1918;
+        }
+        for (int i = startPort; i < endPort; i++) {
+            try {
+                SocketGet get = new SocketGet("127.0.0.1", i);
+                String cpCMI = get.syncGet("", "getContract", "");
+                System.out.println("端口" + i + "-> 测试结果为 : " + cpCMI);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+}
diff --git a/src/test/java/org/bdware/sc/test/JedionTest.java b/src/test/java/org/bdware/sc/test/JedionTest.java
new file mode 100644
index 0000000..cc85cd8
--- /dev/null
+++ b/src/test/java/org/bdware/sc/test/JedionTest.java
@@ -0,0 +1,35 @@
+package org.bdware.sc.test;
+
+import com.sleepycat.je.DatabaseException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.bdware.sc.Jedion;
+
+import java.io.File;
+import java.util.ArrayList;
+
+public class JedionTest {
+    private static final Logger LOGGER = LogManager.getLogger(JedionTest.class);
+
+    public static void main(String[] args) throws DatabaseException {
+        Jedion edion = new Jedion("ABCInstrument");
+        File file = new File("/Applications/jee-2019-03/Eclipse.app/Contents/MacOS/ContractDB");
+        LOGGER.info(file.getAbsolutePath());
+        if (!file.exists()) {
+            LOGGER.info("create directory " + file.getAbsolutePath() + ": " + file.mkdirs());
+        }
+        edion.configEnvironment(file);
+        edion.createDatabase();
+        ArrayList<String> keys = edion.getAllFromDatabase();
+
+        for (int i = 0; i < keys.size(); i++) {
+            String key = keys.get(i);
+            LOGGER.info("i = " + i + " ; key = " + key);
+            // edion.deleteFromDatabase(key);
+            String value = edion.readFromDatabase(key);
+            LOGGER.info("value = " + value);
+        }
+
+        edion.closeDatabase();
+    }
+}
diff --git a/src/test/java/org/bdware/sc/test/YJSPackerTest.java b/src/test/java/org/bdware/sc/test/YJSPackerTest.java
new file mode 100644
index 0000000..899cbfe
--- /dev/null
+++ b/src/test/java/org/bdware/sc/test/YJSPackerTest.java
@@ -0,0 +1,17 @@
+package org.bdware.sc.test;
+
+import org.bdware.sc.YJSPacker;
+
+public class YJSPackerTest {
+    public static void main(String[] args) {
+        if (args.length != 2) {
+            System.out.println("Usage: inputDir output");
+            System.out.println("\tExample: ./testjs/ ./output/out.zip");
+            return;
+        }
+        String testInput = args[0];
+        String target = args[1];
+
+        YJSPacker.pack(testInput, target);
+    }
+}
diff --git a/src/test/java/org/bdware/sc/units/ByteArrayTest.java b/src/test/java/org/bdware/sc/units/ByteArrayTest.java
new file mode 100644
index 0000000..1759e52
--- /dev/null
+++ b/src/test/java/org/bdware/sc/units/ByteArrayTest.java
@@ -0,0 +1,36 @@
+package org.bdware.sc.units;
+
+import io.netty.handler.codec.base64.Base64Encoder;
+import org.bdware.sc.conn.ByteUtil;
+import org.bouncycastle.pqc.math.linearalgebra.ByteUtils;
+import org.junit.Test;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.net.URLEncoder;
+
+public class ByteArrayTest {
+    @Test
+    public void timeOutAllFalse() throws InterruptedException {
+        float i = 116.316801F;
+        Constructor c = null;
+        Method m = null;
+
+        // 11100111 01001000 11011110 00101100 11110010 01001110 10110110 00010011
+        System.out.println(Integer.toBinaryString(Float.floatToIntBits(i)));
+    }
+
+    @Test
+    public void hexStringToBase64() {
+        //http://59.110.125.211:21056/v0/ledgers/bdcontract/transaction?hash=pD587F%2F5R64efno9%2FbAiI%2FSv6BA%3D
+        String str = "a43e7cec5ff947ae1e7e7a3dfdb02223f4afe810";
+        System.out.println(URLEncoder.encode(ByteUtil.encodeBASE64(ByteUtils.fromHexString(str))));
+    }
+
+    @Test
+    public void base64ToUtf8() {
+        String str =
+                "MTYyNTEyNTI3ODY4OSAtLT4geyJleHRyYUdhcyI6IjAiLCJ0b3RhbEdhcyI6IjAiLCJleGVjdXRpb25HYXMiOiIwIiwic2lnbmF0dXJlIjoiMzA0NTAyMjEwMGVlMzczMWE2NmU4N2NmZGIyZDBjNTA0YWQ2ZjE4ZTQzZDI5NTZjOTZkMjE3ZDY0NmQ0ZjViMzAzZjRkZTBlODEwMjIwMjkxMDcwYTEwMzU2OWE5Y2Q3OGU2YTRjNTExMjQ1MzVkZDliZjY3OGMyYzcwMzk1NzdmYTRlZjVjMDBkYjNmYiIsImNvc3RUaW1lIjoiNjMiLCJhcmciOiLnjokiLCJjb250cmFjdElEIjoiLTE4NjMxMjQ5ODEiLCJhY3Rpb24iOiJzZWFyY2giLCJwdWJLZXkiOiIwNGQxOTI0MzI5ZjcyY2VkMTQ4ZjZmMzMzZmI5ODVjY2JhYTMxYjFlM2FhY2YxMGJlNWY0M2Q0YTRmZjVhZDg4ODk5YTAwNWU3OWUzN2ZjMDY5OTNlMWQ2NmFkYThjZjhiNzExY2IzNmY1OTUzOGJiN2QzZTM5ZTcwZmE5MzYwZGRkIn0=+S6uuWRmFxcXCIsXFxcImNvdW50XFxcIjoyfSIsImNvbnRyYWN0SUQiOiItMTE1Mzg4NTk3NiIsImFjdGlvbiI6ImF1dGhVc2VyIiwicHViS2V5IjoiMDRkMTkyNDMyOWY3MmNlZDE0OGY2ZjMzM2ZiOTg1Y2NiYWEzMWIxZTNhYWNmMTBiZTVmNDNkNGE0ZmY1YWQ4ODg5OWEwMDVlNzllMzdmYzA2OTkzZTFkNjZhZGE4Y2Y4YjcxMWNiMzZmNTk1MzhiYjdkM2UzOWU3MGZhOTM2MGRkZCJ9";
+        System.out.println(new String(ByteUtil.decodeBASE64(str)));
+    }
+}
diff --git a/src/test/java/org/bdware/sc/util/UtilTest.java b/src/test/java/org/bdware/sc/util/UtilTest.java
new file mode 100644
index 0000000..3027616
--- /dev/null
+++ b/src/test/java/org/bdware/sc/util/UtilTest.java
@@ -0,0 +1,13 @@
+package org.bdware.sc.util;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class UtilTest {
+    @Test
+    public void testGetDir() {
+        String fullPath = "123/456";
+        String dirPath = FileUtil.getDir(fullPath);
+        Assert.assertEquals("123/", dirPath);
+    }
+}
diff --git a/src/test/java/org/bdware/sc/util/versionUtiltest.java b/src/test/java/org/bdware/sc/util/versionUtiltest.java
new file mode 100644
index 0000000..f85e75f
--- /dev/null
+++ b/src/test/java/org/bdware/sc/util/versionUtiltest.java
@@ -0,0 +1,13 @@
+package org.bdware.sc.util;
+
+import org.junit.Test;
+
+public class versionUtiltest {
+    @Test
+    public void test1(){
+        String v1="0.0.0";
+        String v2="0.0.1";
+
+        System.out.println(VersionUtil.compareVersion(v1,v2));
+    }
+}