From 2f4253929316277267db95d51136cf1454a147d6 Mon Sep 17 00:00:00 2001
From: "Frank.R.Wu" <wukd94@pku.edu.cn>
Date: Thu, 15 Jun 2023 11:08:09 +0800
Subject: [PATCH] build: config spotless plugin and reformat code

---
 build.gradle                                  |    19 +-
 shardingsphere_eclipse_formatter.xml          |   431 -
 .../org/bdware/analysis/AnalysisResult.java   |    15 +-
 .../org/bdware/analysis/AnalysisTarget.java   |     4 +-
 .../org/bdware/analysis/BasicBlock.java       |    56 +-
 .../bdware/analysis/BreadthFirstSearch.java   |    82 +-
 .../analysis/org/bdware/analysis/CFGraph.java |   264 +-
 .../analysis/org/bdware/analysis/CFType.java  |    12 +-
 .../analysis/org/bdware/analysis/FrontCF.java |   222 +-
 .../org/bdware/analysis/InsnPrinter.java      |   495 +-
 .../analysis/org/bdware/analysis/OpInfo.java  |   487 +-
 .../FieldSensitiveDynamicTaintAnalysis.java   |    13 +-
 .../dynamic/NaiveDynamicTaintAnalysis.java    |    18 +-
 .../bdware/analysis/dynamic/ProgramPoint.java |    24 +-
 .../example/FieldSensitiveTaintAnalysis.java  |    22 +-
 .../example/MultiSourceTaintAnalysis.java     |    75 +-
 .../analysis/example/NaiveTaintAnalysis.java  |     7 +-
 .../analysis/org/bdware/analysis/gas/BFS.java |    47 +-
 .../org/bdware/analysis/gas/CostDetail.java   |     2 +-
 .../analysis/gas/CountProgramPoint.java       |   388 +-
 .../analysis/org/bdware/analysis/gas/DFS.java |     3 +-
 .../org/bdware/analysis/gas/Evaluates.java    |    22 +-
 .../org/bdware/analysis/gas/FeeSchedule.java  |    83 +-
 .../org/bdware/analysis/gas/PPCount.java      |   136 +-
 .../bdware/analysis/taint/DirectGraphDFS.java |    40 +-
 .../org/bdware/analysis/taint/HeapObject.java |   421 +-
 .../org/bdware/analysis/taint/TaintBB.java    |   102 +-
 .../org/bdware/analysis/taint/TaintBits.java  |   110 +-
 .../org/bdware/analysis/taint/TaintCFG.java   |   123 +-
 .../bdware/analysis/taint/TaintConfig.java    |     2 +-
 .../analysis/taint/TaintInterpreter.java      |   302 +-
 .../bdware/analysis/taint/TaintResult.java    |   330 +-
 .../org/bdware/analysis/taint/TaintValue.java |    82 +-
 .../org/objectweb/asm/AnnotationVisitor.java  |   131 +-
 .../org/objectweb/asm/AnnotationWriter.java   |   605 +-
 src/main/asm/org/objectweb/asm/Attribute.java |   214 +-
 .../asm/org/objectweb/asm/ByteVector.java     |   124 +-
 .../asm/org/objectweb/asm/ClassReader.java    |  4513 ++---
 .../asm/org/objectweb/asm/ClassVisitor.java   |   262 +-
 .../asm/org/objectweb/asm/ClassWriter.java    |   717 +-
 src/main/asm/org/objectweb/asm/Context.java   |    48 +-
 src/main/asm/org/objectweb/asm/Edge.java      |    69 +-
 .../asm/org/objectweb/asm/FieldVisitor.java   |    86 +-
 .../asm/org/objectweb/asm/FieldWriter.java    |    85 +-
 src/main/asm/org/objectweb/asm/Frame.java     |  1220 +-
 src/main/asm/org/objectweb/asm/Handle.java    |   100 +-
 src/main/asm/org/objectweb/asm/Handler.java   |    62 +-
 src/main/asm/org/objectweb/asm/Item.java      |   255 +-
 src/main/asm/org/objectweb/asm/Label.java     |   348 +-
 .../asm/org/objectweb/asm/MethodVisitor.java  |   558 +-
 .../asm/org/objectweb/asm/MethodWriter.java   |  1364 +-
 src/main/asm/org/objectweb/asm/Opcodes.java   |    72 +-
 src/main/asm/org/objectweb/asm/Type.java      |   455 +-
 .../objectweb/asm/commons/AdviceAdapter.java  |   627 +-
 .../asm/commons/AnalyzerAdapter.java          |  1002 +-
 .../asm/commons/CodeSizeEvaluator.java        |    60 +-
 .../asm/commons/GeneratorAdapter.java         |   908 +-
 .../asm/commons/InstructionAdapter.java       |  1104 +-
 .../asm/commons/JSRInlinerAdapter.java        |   369 +-
 .../asm/commons/LocalVariablesSorter.java     |   245 +-
 .../asm/org/objectweb/asm/commons/Method.java |   131 +-
 .../org/objectweb/asm/commons/Remapper.java   |   126 +-
 .../commons/RemappingAnnotationAdapter.java   |    55 +-
 .../asm/commons/RemappingClassAdapter.java    |    90 +-
 .../asm/commons/RemappingFieldAdapter.java    |    48 +-
 .../asm/commons/RemappingMethodAdapter.java   |    97 +-
 .../commons/RemappingSignatureAdapter.java    |    53 +-
 .../asm/commons/SerialVersionUIDAdder.java    |   221 +-
 .../objectweb/asm/commons/SimpleRemapper.java |    42 +-
 .../asm/commons/StaticInitMerger.java         |    52 +-
 .../asm/commons/TableSwitchGenerator.java     |    48 +-
 .../asm/commons/TryCatchBlockSorter.java      |    69 +-
 .../asm/signature/SignatureReader.java        |   235 +-
 .../asm/signature/SignatureVisitor.java       |   128 +-
 .../asm/signature/SignatureWriter.java        |    51 +-
 .../objectweb/asm/tree/AbstractInsnNode.java  |   104 +-
 .../objectweb/asm/tree/AnnotationNode.java    |   431 +-
 .../asm/org/objectweb/asm/tree/ClassNode.java |   150 +-
 .../org/objectweb/asm/tree/FieldInsnNode.java |    72 +-
 .../asm/org/objectweb/asm/tree/FieldNode.java |   150 +-
 .../asm/org/objectweb/asm/tree/FrameNode.java |   185 +-
 .../org/objectweb/asm/tree/IincInsnNode.java  |    50 +-
 .../objectweb/asm/tree/InnerClassNode.java    |    86 +-
 .../asm/org/objectweb/asm/tree/InsnList.java  |   187 +-
 .../asm/org/objectweb/asm/tree/InsnNode.java  |    72 +-
 .../org/objectweb/asm/tree/IntInsnNode.java   |    54 +-
 .../asm/tree/InvokeDynamicInsnNode.java       |    60 +-
 .../org/objectweb/asm/tree/JumpInsnNode.java  |    72 +-
 .../asm/org/objectweb/asm/tree/LabelNode.java |    44 +-
 .../org/objectweb/asm/tree/LdcInsnNode.java   |    57 +-
 .../objectweb/asm/tree/LineNumberNode.java    |    57 +-
 .../objectweb/asm/tree/LocalVariableNode.java |    81 +-
 .../asm/tree/LookupSwitchInsnNode.java        |    66 +-
 .../objectweb/asm/tree/MethodInsnNode.java    |    75 +-
 .../org/objectweb/asm/tree/MethodNode.java    |   264 +-
 .../asm/tree/MultiANewArrayInsnNode.java      |    50 +-
 .../asm/tree/TableSwitchInsnNode.java         |    68 +-
 .../objectweb/asm/tree/TryCatchBlockNode.java |    68 +-
 .../org/objectweb/asm/tree/TypeInsnNode.java  |    63 +-
 .../org/objectweb/asm/tree/VarInsnNode.java   |    70 +-
 .../objectweb/asm/tree/analysis/Analyzer.java |   249 +-
 .../asm/tree/analysis/AnalyzerException.java  |    50 +-
 .../asm/tree/analysis/BasicInterpreter.java   |   529 +-
 .../asm/tree/analysis/BasicValue.java         |    60 +-
 .../asm/tree/analysis/BasicVerifier.java      |   594 +-
 .../objectweb/asm/tree/analysis/Frame.java    |  1305 +-
 .../asm/tree/analysis/Interpreter.java        |   246 +-
 .../asm/tree/analysis/SimpleVerifier.java     |   162 +-
 .../objectweb/asm/tree/analysis/SmallSet.java |    45 +-
 .../asm/tree/analysis/SourceInterpreter.java  |   169 +-
 .../asm/tree/analysis/SourceValue.java        |    54 +-
 .../asm/tree/analysis/Subroutine.java         |    50 +-
 .../objectweb/asm/tree/analysis/Value.java    |    42 +-
 .../org/objectweb/asm/util/ASMifiable.java    |    56 +-
 .../asm/org/objectweb/asm/util/ASMifier.java  |   249 +-
 .../asm/util/CheckAnnotationAdapter.java      |    73 +-
 .../objectweb/asm/util/CheckClassAdapter.java |   326 +-
 .../objectweb/asm/util/CheckFieldAdapter.java |    64 +-
 .../asm/util/CheckMethodAdapter.java          |   622 +-
 .../asm/util/CheckSignatureAdapter.java       |    95 +-
 .../asm/org/objectweb/asm/util/Printer.java   |   247 +-
 .../org/objectweb/asm/util/Textifiable.java   |    56 +-
 .../asm/org/objectweb/asm/util/Textifier.java |   245 +-
 .../asm/util/TraceAnnotationVisitor.java      |    57 +-
 .../objectweb/asm/util/TraceClassVisitor.java |   111 +-
 .../objectweb/asm/util/TraceFieldVisitor.java |    51 +-
 .../asm/util/TraceMethodVisitor.java          |    90 +-
 .../asm/util/TraceSignatureVisitor.java       |    61 +-
 .../objectweb/asm/xml/ASMContentHandler.java  |   237 +-
 .../asm/org/objectweb/asm/xml/Processor.java  |   304 +-
 .../asm/org/objectweb/asm/xml/SAXAdapter.java |    41 +-
 .../asm/xml/SAXAnnotationAdapter.java         |    82 +-
 .../objectweb/asm/xml/SAXClassAdapter.java    |    90 +-
 .../org/objectweb/asm/xml/SAXCodeAdapter.java |   125 +-
 .../objectweb/asm/xml/SAXFieldAdapter.java    |    41 +-
 .../org/bdware/sc/ComponedContractResult.java |    40 +-
 src/main/base/org/bdware/sc/ContractPort.java |     6 +-
 .../base/org/bdware/sc/ContractPrinter.java   |     2 +-
 .../base/org/bdware/sc/ContractResult.java    |     6 +-
 src/main/base/org/bdware/sc/JSEngine.java     |     6 +-
 src/main/base/org/bdware/sc/Jedion.java       |    74 +-
 .../org/bdware/sc/codec/DelimiterCodec.java   |     4 +-
 .../sc/codec/LengthFieldBasedFrameCodec.java  |    10 +-
 .../codec/LengthFieldBasedFrameEncoder.java   |     2 +-
 .../bdware/sc/compiler/PermissionStub.java    |     2 +-
 .../sc/compiler/PermissionStubGenerator.java  |    11 +-
 .../bdware/sc/compiler/YJSErrorListener.java  |    19 +-
 .../base/org/bdware/sc/conn/ByteUtil.java     |    10 +-
 .../base/org/bdware/sc/conn/Description.java  |     2 +-
 .../base/org/bdware/sc/conn/EventHandler.java |     2 +-
 .../base/org/bdware/sc/conn/MsgHandler.java   |     7 +-
 .../org/bdware/sc/conn/ResultCallback.java    |     7 +-
 .../org/bdware/sc/conn/ServiceServer.java     |    60 +-
 .../base/org/bdware/sc/conn/SocketGet.java    |   114 +-
 .../base/org/bdware/sc/conn/SyncResult.java   |    27 +-
 src/main/base/org/bdware/sc/encrypt/AES.java  |    38 +-
 .../org/bdware/sc/encrypt/HardwareInfo.java   |    21 +-
 src/main/base/org/bdware/sc/encrypt/RSA.java  |    72 +-
 src/main/base/org/bdware/sc/event/REvent.java |    11 +-
 .../base/org/bdware/sc/gen/PYGenerator.java   |   180 +-
 .../base/org/bdware/sc/get/GetMessage.java    |     5 +-
 .../base/org/bdware/sc/node/ContractNode.java |    33 +-
 .../base/org/bdware/sc/node/FunctionNode.java |     4 +-
 .../org/bdware/sc/node/InterfaceNode.java     |     2 +-
 .../base/org/bdware/sc/node/LogLocation.java  |     2 +-
 src/main/base/org/bdware/sc/node/LogType.java |     2 +-
 .../base/org/bdware/sc/node/MockConfig.java   |     7 +-
 .../base/org/bdware/sc/node/Permission.java   |    17 +-
 src/main/base/org/bdware/sc/node/YjsType.java |     5 +-
 src/main/base/org/bdware/sc/py/PYEntry.java   |    26 +-
 src/main/base/org/bdware/sc/py/PYLoader.java  |     3 +-
 .../org/bdware/sc/py/utils/HttpClient.java    |    10 +-
 .../base/org/bdware/sc/redo/TransRecord.java  |    91 +-
 .../org/bdware/sc/units/RequestCache.java     |     8 +-
 .../base/org/bdware/sc/util/FileUtil.java     |     2 +-
 .../base/org/bdware/sc/util/HashUtil.java     |    10 +-
 src/main/base/org/bdware/sc/util/LRUList.java |     3 +-
 .../base/org/bdware/sc/util/VersionUtil.java  |     5 +-
 .../sc/visitor/ContractDependencyVisitor.java |     8 +-
 .../org/bdware/sc/visitor/ContractReader.java |    26 +-
 .../sc/visitor/FunctionDependencyVisitor.java |     6 +-
 .../org/bdware/sc/visitor/FunctionReader.java |    23 +-
 .../bdware/sc/visitor/InterfaceReader.java    |     4 +-
 .../entry/org/bdware/sc/ContractStatus.java   |     4 +-
 src/main/entry/org/bdware/sc/SCAPI.java       |    29 +-
 src/main/entry/org/bdware/sc/YJSPacker.java   |    32 +-
 .../org/bdware/sc/bean/ContractDesp.java      |     2 +-
 .../org/bdware/sc/bean/ContractExecType.java  |     9 +-
 .../org/bdware/sc/bean/ContractRequest.java   |     9 +-
 .../org/bdware/sc/bean/ContractStartInfo.java |    10 +-
 .../org/bdware/sc/bean/DefaultJoinRule.java   |     4 +-
 .../org/bdware/sc/bean/DoipOperationInfo.java |    10 +-
 .../org/bdware/sc/bean/FunctionDesp.java      |     3 +-
 .../org/bdware/sc/bean/ProjectConfig.java     |     5 +-
 .../org/bdware/sc/bean/SM2Verifiable.java     |    15 +-
 src/main/entry/org/bdware/sc/db/CMTables.java |    18 +-
 .../entry/org/bdware/sc/db/FIFOCache.java     |     7 +-
 .../org/bdware/sc/db/KeyValueRocksDBUtil.java |    34 +-
 .../bdware/sc/db/MultiIndexTimeDBUtil.java    |     9 +-
 .../sc/db/MultiIndexTimeRocksDBUtil.java      |    19 +-
 .../entry/org/bdware/sc/db/TimeDBUtil.java    |    26 +-
 .../org/bdware/sc/db/TimeRocksDBUtil.java     |    29 +-
 .../org/bdware/sc/http/HttpPostForm.java      |     6 +-
 .../entry/org/bdware/sc/http/HttpUtil.java    |    29 +-
 .../sc/index/LenVarTimeSerialIndex.java       |    13 +-
 .../org/bdware/sc/index/TimeSerialIndex.java  |    27 +-
 .../org/bdware/sc/packer/AvatarHelper.java    |    10 +-
 .../entry/org/bdware/sc/packer/JarPacker.java |     9 +-
 .../bdware/sc/parser/JavaScriptBaseLexer.java |    23 +-
 .../sc/parser/JavaScriptBaseParser.java       |    27 +-
 .../org/bdware/sc/parser/JavaScriptLexer.java |  1570 +-
 .../gen/org/bdware/sc/parser/YJSParser.java   | 16776 +++++++++-------
 .../sc/parser/YJSParserBaseListener.java      |  3691 ++--
 .../sc/parser/YJSParserBaseVisitor.java       |  2275 ++-
 .../bdware/sc/parser/YJSParserListener.java   |  2903 +--
 .../bdware/sc/parser/YJSParserVisitor.java    |  1684 +-
 .../bdware/sc/commParser/BDLedger/Block.java  |    58 +-
 .../sc/commParser/BDLedger/Transaction.java   |     4 +-
 .../bdware/sc/commParser/LocalLogAdapter.java |     8 +-
 .../bdware/sc/commParser/Transaction_bak.java |     5 +-
 .../sc/commParser/XuperChainAdapter.java      |    26 +-
 .../org/bdware/sc/common/Transaction.java     |     6 +-
 .../MultiIndextTimeRocksDBUtilTest.java       |     3 +-
 ...ieldSensitiveDynamicTaintAnalysisTest.java |     9 +-
 .../analysis/dynamic/test/TracedFileTest.java |     2 +-
 .../test/FieldSensitiveTaintAnalysisTest.java |     3 +-
 .../org/bdware/analysis/test/CFGraphTest.java |     3 +-
 .../java/org/bdware/sc/AvatarHelperTest.java  |     4 +-
 .../java/org/bdware/sc/LedgerUtilTest.java    |    24 +-
 src/test/java/org/bdware/sc/SockGetTest.java  |     6 +-
 .../bdware/sc/bean/ContractRequestTest.java   |     6 +-
 .../bdware/sc/bean/test/EnumDecodeTest2.java  |     2 +-
 .../bdware/sc/boundary/utils/SM2UtilTest.java |   108 +-
 .../sc/db/MultiIndexTimeDBUtilTest.java       |     9 +-
 .../sc/encrypt/test/HardwareInfoTest.java     |     4 +-
 .../org/bdware/sc/units/ByteArrayTest.java    |     3 +-
 .../java/org/bdware/sc/util/UtilTest.java     |     5 +-
 .../org/bdware/sc/util/versionUtiltest.java   |     8 +-
 238 files changed, 31053 insertions(+), 30607 deletions(-)
 delete mode 100644 shardingsphere_eclipse_formatter.xml

diff --git a/build.gradle b/build.gradle
index e8af3d5..de37eb4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,9 +1,3 @@
-buildscript {
-    dependencies {
-        classpath "com.diffplug.spotless:spotless-plugin-gradle:4.5.1"
-    }
-}
-
 plugins {
     id 'java'
     id 'java-library'
@@ -12,18 +6,7 @@ plugins {
     id 'com.github.johnrengelman.shadow' version '4.0.2'
 }
 
-apply plugin: "com.diffplug.gradle.spotless"
-
-spotless {
-    java {
-        removeUnusedImports()
-        eclipse().configFile('shardingsphere_eclipse_formatter.xml')
-        target fileTree('.') {
-            include '**/*.java'
-        }
-    }
-}
-//tasks.compileJava.dependsOn(spotlessJavaApply)
+apply from: '../spotless.gradle'
 
 shadowJar {
     classifier = "jar"
diff --git a/shardingsphere_eclipse_formatter.xml b/shardingsphere_eclipse_formatter.xml
deleted file mode 100644
index 675ae1f..0000000
--- a/shardingsphere_eclipse_formatter.xml
+++ /dev/null
@@ -1,431 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<profiles version="13">
-    <profile kind="CodeFormatterProfile" name="GoogleStyle" version="13">
-        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_cascading_method_invocation_with_arguments.count_dependent" value="16|-1|16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_prefer_two_fragments" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_comment_inline_tags" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_local_variable_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter" value="1040"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type.count_dependent" value="1585|-1|1585"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields.count_dependent" value="16|-1|16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression.count_dependent" value="16|4|80"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration.count_dependent" value="16|4|48"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration.count_dependent" value="16|4|49"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_cascading_method_invocation_with_arguments" value="16"/>
-        <setting id="org.eclipse.jdt.core.compiler.source" value="1.7"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration.count_dependent" value="16|4|48"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_local_variable_annotation" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants.count_dependent" value="16|5|48"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="100"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation.count_dependent" value="16|4|48"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package" value="1585"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="16"/>
-        <setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
-        <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters"
-                 value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_type_annotation" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_field_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration"
-                 value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws"
-                 value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return"
-                 value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments"
-                 value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw"
-                 value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_generic_type_arguments" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment_new_line_at_start_of_html_paragraph" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comment_prefix" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_parameter_annotation" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method" value="1585"/>
-        <setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments"
-                 value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation.count_dependent"
-                 value="16|5|80"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter.count_dependent"
-                 value="1040|-1|1040"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package.count_dependent"
-                 value="1585|-1|1585"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters"
-                 value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.force_if_else_statement_brace" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="3"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_package_annotation" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression"
-                 value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation.count_dependent"
-                 value="16|-1|16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type" value="1585"/>
-        <setting id="org.eclipse.jdt.core.compiler.compliance" value="1.7"/>
-        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration"
-                 value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_new_anonymous_class" value="20"/>
-        <setting
-                id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference"
-                value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable.count_dependent"
-                 value="1585|-1|1585"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration"
-                 value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field.count_dependent"
-                 value="1585|-1|1585"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters"
-                 value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration.count_dependent"
-                 value="16|5|80"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
-        <setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant.count_dependent"
-                 value="16|-1|16"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="100"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-        <setting
-                id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration"
-                value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="2"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header"
-                 value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field" value="1585"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-        <setting
-                id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference"
-                value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer.count_dependent"
-                 value="16|5|80"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws"
-                 value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.7"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
-        <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header"
-                 value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration.count_dependent"
-                 value="16|4|48"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method.count_dependent"
-                 value="1585|-1|1585"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer"
-                 value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression.count_dependent" value="16|-1|16"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_member_annotation" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable" value="1585"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-        <setting
-                id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call.count_dependent"
-                value="16|5|80"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-        <setting
-                id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference"
-                value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations"
-                 value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_generic_type_arguments.count_dependent"
-                 value="16|-1|16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference"
-                 value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression.count_dependent"
-                 value="16|5|80"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments"
-                 value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration.count_dependent"
-                 value="16|5|80"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations"
-                 value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header"
-                 value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_for_statement" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments"
-                 value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
-    </profile>
-</profiles>
\ No newline at end of file
diff --git a/src/main/analysis/org/bdware/analysis/AnalysisResult.java b/src/main/analysis/org/bdware/analysis/AnalysisResult.java
index bdbc01a..6b2c980 100644
--- a/src/main/analysis/org/bdware/analysis/AnalysisResult.java
+++ b/src/main/analysis/org/bdware/analysis/AnalysisResult.java
@@ -3,16 +3,15 @@ package org.bdware.analysis;
 import org.objectweb.asm.tree.AbstractInsnNode;
 
 public abstract class AnalysisResult {
-	public AnalysisResult() {
-	}
+    public AnalysisResult() {}
 
-	public abstract AnalysisResult merge(AbstractInsnNode insn);
+    public abstract AnalysisResult merge(AbstractInsnNode insn);
 
-	public abstract void printResult();
+    public abstract void printResult();
 
-	public abstract boolean covers(AnalysisResult result);
+    public abstract boolean covers(AnalysisResult result);
 
-	public abstract void mergeResult(AnalysisResult r);
+    public abstract void mergeResult(AnalysisResult r);
 
-	public abstract AnalysisResult clone();
-}
\ No newline at end of file
+    public abstract AnalysisResult clone();
+}
diff --git a/src/main/analysis/org/bdware/analysis/AnalysisTarget.java b/src/main/analysis/org/bdware/analysis/AnalysisTarget.java
index 0a8465d..7bf3f7b 100644
--- a/src/main/analysis/org/bdware/analysis/AnalysisTarget.java
+++ b/src/main/analysis/org/bdware/analysis/AnalysisTarget.java
@@ -1,7 +1,7 @@
 package org.bdware.analysis;
 
 public interface AnalysisTarget {
-	public boolean inList();
+    public boolean inList();
 
-	public void setInList(boolean b);
+    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
index 4d31245..788385a 100644
--- a/src/main/analysis/org/bdware/analysis/BasicBlock.java
+++ b/src/main/analysis/org/bdware/analysis/BasicBlock.java
@@ -6,44 +6,44 @@ 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 List<AbstractInsnNode> list;
+    public int blockID;
+    public int lineNum = -1;
     public int insnCount;
 
     public BasicBlock(int id) {
-		list = new ArrayList<>();
-		blockID = id;
-	}
+        list = new ArrayList<>();
+        blockID = id;
+    }
 
-	public void add(AbstractInsnNode insn) {
-		list.add(insn);
-	}
+    public void add(AbstractInsnNode insn) {
+        list.add(insn);
+    }
 
-	public int size() {
+    public int size() {
 
-		return list.size();
-	}
+        return list.size();
+    }
 
-	public List<AbstractInsnNode> getInsn() {
-		return list;
-	}
+    public List<AbstractInsnNode> getInsn() {
+        return list;
+    }
 
-	boolean inList = false;
+    boolean inList = false;
 
-	public AbstractInsnNode lastInsn() {
-		return list.get(list.size() - 1);
-	}
+    public AbstractInsnNode lastInsn() {
+        return list.get(list.size() - 1);
+    }
 
-	public void setLineNum(int line) {
-		lineNum = line;
-	}
+    public void setLineNum(int line) {
+        lineNum = line;
+    }
 
-	public boolean inList() {
-		return inList;
-	}
+    public boolean inList() {
+        return inList;
+    }
 
-	public void setInList(boolean b) {
-		inList = b;
-	}
+    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
index 20a040d..db5374b 100644
--- a/src/main/analysis/org/bdware/analysis/BreadthFirstSearch.java
+++ b/src/main/analysis/org/bdware/analysis/BreadthFirstSearch.java
@@ -6,53 +6,53 @@ 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 Map<T, AnalysisResult> results;
+    protected List<T> toAnalysis;
 
-	public abstract R execute(T t);
+    public abstract R execute(T t);
 
-	public abstract Collection<T> getSuc(T t);
+    public abstract Collection<T> getSuc(T t);
 
-	public BreadthFirstSearch() {
-		results = new HashMap<T, AnalysisResult>();
-	}
+    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);
+    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 (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;
-	}
+                    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 int getListLength() {
+        return toAnalysis.size();
+    }
 
-	public void setToAnalysis(List<T> l) {
-		toAnalysis = l;
-	}
+    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
index 5648ff3..6f8a5b9 100644
--- a/src/main/analysis/org/bdware/analysis/CFGraph.java
+++ b/src/main/analysis/org/bdware/analysis/CFGraph.java
@@ -19,7 +19,7 @@ public abstract class CFGraph {
     // type2(canThrow) and catchLabels
     // type3 and target labels
     // type4 and catchLabels
-//    private List<TryCatchBlockNode> tryCacheList;
+    // private List<TryCatchBlockNode> tryCacheList;
     // Pass1: build basic blocks
     // create a new block when:
     // 1.starts with Label(can jump)
@@ -110,8 +110,8 @@ public abstract class CFGraph {
     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("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) {
@@ -171,21 +171,17 @@ public abstract class CFGraph {
         /**
          * 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.
+         * @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);
@@ -199,77 +195,75 @@ public abstract class CFGraph {
         /**
          * 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 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}.
+         *        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.
+         * 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.
+         * @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.
+         * 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}).
+         * @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.
+         * 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}).
+         * @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.
+         * 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}).
+         * @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);
@@ -288,16 +282,16 @@ public abstract class CFGraph {
         /**
          * 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.
+         * @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) {
+        public void visitInvokeDynamicInsn(String name, String desc, Handle bsm,
+                Object... bsmArgs) {
 
             // TODO add edges to try catch blocks!
             currBlock.add(currInsn);
@@ -309,16 +303,14 @@ public abstract class CFGraph {
         }
 
         /**
-         * Visits a jump instruction. A jump instruction is an instruction that may jump
-         * to another instruction.
+         * 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.
+         * @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);
@@ -331,8 +323,7 @@ public abstract class CFGraph {
         }
 
         /**
-         * Visits a label. A label designates the instruction that will be visited just
-         * after it.
+         * Visits a label. A label designates the instruction that will be visited just after it.
          *
          * @param label a {@link Label Label} object.
          */
@@ -349,47 +340,45 @@ public abstract class CFGraph {
         }
 
         /**
-         * 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:
+         * 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
-         *    }
+         *     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
+         *     // 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.
+         * @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);
@@ -398,7 +387,7 @@ public abstract class CFGraph {
         /**
          * Visits an IINC instruction.
          *
-         * @param var       index of the local variable to be incremented.
+         * @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) {
@@ -411,11 +400,11 @@ public abstract class CFGraph {
         /**
          * 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.
+         * @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);
@@ -426,10 +415,10 @@ public abstract class CFGraph {
         /**
          * 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.
+         * @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);
@@ -450,33 +439,31 @@ public abstract class CFGraph {
         /**
          * 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).
+         * @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) {
+        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 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).
+         * @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);
@@ -557,7 +544,8 @@ public abstract class CFGraph {
         }
 
         @Override
-        public void visitInvokeDynamicInsn(String name, String desc, Handle bsm, Object... bsmArgs) {
+        public void visitInvokeDynamicInsn(String name, String desc, Handle bsm,
+                Object... bsmArgs) {
             addTryCatchNodes();
         }
 
diff --git a/src/main/analysis/org/bdware/analysis/CFType.java b/src/main/analysis/org/bdware/analysis/CFType.java
index 82bd336..ddd174c 100644
--- a/src/main/analysis/org/bdware/analysis/CFType.java
+++ b/src/main/analysis/org/bdware/analysis/CFType.java
@@ -1,10 +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
+    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
index e7cfb43..4712dbf 100644
--- a/src/main/analysis/org/bdware/analysis/FrontCF.java
+++ b/src/main/analysis/org/bdware/analysis/FrontCF.java
@@ -8,131 +8,127 @@ 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;
+    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;
+    static class ArrayPs extends PrintStream {
+        List<String> content;
 
-		public ArrayPs() throws FileNotFoundException {
-			super("/dev/null");
-		}
+        public ArrayPs() throws FileNotFoundException {
+            super("/dev/null");
+        }
 
-		public void println(String str) {
-			if (content != null)
-				content.add(str);
-		}
-	}
+        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 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 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 EdgeLabel {
+        String label;
+    }
 
-	public static class FrontEdge {
-		String from, to;
-		EdgeLabel 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 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;
 
-	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);
+        // 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
index 7079c8e..7311027 100644
--- a/src/main/analysis/org/bdware/analysis/InsnPrinter.java
+++ b/src/main/analysis/org/bdware/analysis/InsnPrinter.java
@@ -10,288 +10,275 @@ import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 
 public class InsnPrinter extends MethodVisitor {
-	PrintStream ps;
-	private Map<Label, Integer> labelOrder;
+    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
-	// -------------------------------------------------------------------------
+    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 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 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 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 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 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 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));
+    /**
+     * 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();
-	}
+    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 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);
-	}
+    /**
+     * 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) + "=");
+    public void visitLabel(Label label) {
+        ps.println("=" + getLabelStr(label) + "=");
 
-	}
+    }
 
-	// -------------------------------------------------------------------------
-	// Special instructions
-	// -------------------------------------------------------------------------
+    // -------------------------------------------------------------------------
+    // 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 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 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));
+    /**
+     * 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();
-	}
+    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 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);
-	}
+    /**
+     * 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;
-	}
+    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
index 676746d..5abd145 100644
--- a/src/main/analysis/org/bdware/analysis/OpInfo.java
+++ b/src/main/analysis/org/bdware/analysis/OpInfo.java
@@ -1,256 +1,257 @@
 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];
+    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);// ??--
 
-	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;
+    public final static OpInfo ops[] = new OpInfo[256];
 
-	OpInfo() {
-	}
+    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(int opcode, String displayName, int branchType, int changStack) {
-		flags = branchType;
-		this.displayName = displayName;
-		this.opcode = opcode;
-		this.changeStack = changeStack;
-	}
+    OpInfo() {}
 
-	public boolean canBranch() {
-		return 0 != (flags & kInstrCanBranch);
-	}
+    OpInfo(int opcode, String displayName, int branchType, int changStack) {
+        flags = branchType;
+        this.displayName = displayName;
+        this.opcode = opcode;
+        this.changeStack = changeStack;
+    }
 
-	public boolean canContinue() {
-		return 0 != (flags & kInstrCanContinue);
-	}
+    public boolean canBranch() {
+        return 0 != (flags & kInstrCanBranch);
+    }
 
-	public boolean canReturn() {
-		return 0 != (flags & kInstrCanReturn);
-	}
+    public boolean canContinue() {
+        return 0 != (flags & kInstrCanContinue);
+    }
 
-	public boolean canSwitch() {
-		return 0 != (flags & kInstrCanSwitch);
-	}
+    public boolean canReturn() {
+        return 0 != (flags & kInstrCanReturn);
+    }
 
-	public boolean canThrow() {
-		return 0 != (flags & kInstrCanThrow);
-	}
-	
+    public boolean canSwitch() {
+        return 0 != (flags & kInstrCanSwitch);
+    }
 
-	public String toString() {
-		return displayName;
-	}
+    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
index 7c94c2e..208b059 100644
--- a/src/main/analysis/org/bdware/analysis/dynamic/FieldSensitiveDynamicTaintAnalysis.java
+++ b/src/main/analysis/org/bdware/analysis/dynamic/FieldSensitiveDynamicTaintAnalysis.java
@@ -18,7 +18,8 @@ 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);
+    private static final Logger LOGGER =
+            LogManager.getLogger(FieldSensitiveDynamicTaintAnalysis.class);
     public static boolean isDebug = false;
     TaintCFG cfg;
     TracedFile tf;
@@ -79,8 +80,8 @@ public class FieldSensitiveDynamicTaintAnalysis extends BreadthFirstSearch<Taint
                     // subBlock.clear();
                     subBlock.add(cfg.getBasicBlockAt(t.blockID + 1));
                 } else if (OpInfo.ops[insn.getOpcode()].canBranch()) {
-//                    subBlock.clear();
-//                    LOGGER.info("can branch " + t.blockID);
+                    // 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()) {
@@ -91,14 +92,14 @@ public class FieldSensitiveDynamicTaintAnalysis extends BreadthFirstSearch<Taint
             }
         }
         Set<TaintBB> ret = new HashSet<>();
-//        StringBuilder log = new StringBuilder("nextBB:");
+        // StringBuilder log = new StringBuilder("nextBB:");
         for (BasicBlock bb : subBlock) {
-//            log.append("\n\t").append(bb.blockID);
+            // log.append("\n\t").append(bb.blockID);
             TaintBB ntbb = (TaintBB) bb;
             ntbb.preResult.mergeResult(t.sucResult);
             ret.add(ntbb);
         }
-//        LOGGER.info(log.toString());
+        // LOGGER.info(log.toString());
         return ret;
     }
 
diff --git a/src/main/analysis/org/bdware/analysis/dynamic/NaiveDynamicTaintAnalysis.java b/src/main/analysis/org/bdware/analysis/dynamic/NaiveDynamicTaintAnalysis.java
index 48d6402..2530f94 100644
--- a/src/main/analysis/org/bdware/analysis/dynamic/NaiveDynamicTaintAnalysis.java
+++ b/src/main/analysis/org/bdware/analysis/dynamic/NaiveDynamicTaintAnalysis.java
@@ -27,7 +27,8 @@ public class NaiveDynamicTaintAnalysis extends BreadthFirstSearch<TaintResult, T
         String methodDesc = mn.desc;
         methodDesc = methodDesc.replaceAll("\\).*$", ")");
         int pos = 2;
-        if (methodDesc.split(";").length == 3) pos = 1;
+        if (methodDesc.split(";").length == 3)
+            pos = 1;
         // TODO add inputBlock!
         TaintBB b = (TaintBB) cfg.getBasicBlockAt(0);
         b.preResult = new TaintResult();
@@ -47,11 +48,8 @@ public class NaiveDynamicTaintAnalysis extends BreadthFirstSearch<TaintResult, T
         setToAnalysis(toAnalysis);
         if (isDebug) {
             System.out.println("===Method:" + cfg.getMethodNode().name + cfg.getMethodNode().desc);
-            System.out.println(
-                    "===Local:"
-                            + cfg.getMethodNode().maxLocals
-                            + " "
-                            + cfg.getMethodNode().maxStack);
+            System.out.println("===Local:" + cfg.getMethodNode().maxLocals + " "
+                    + cfg.getMethodNode().maxStack);
         }
     }
 
@@ -68,7 +66,8 @@ public class NaiveDynamicTaintAnalysis extends BreadthFirstSearch<TaintResult, T
             AbstractInsnNode insn = t.lastInsn();
             if (insn != null) {
                 OpInfo info = null;
-                if (insn.getOpcode() >= 0) info = OpInfo.ops[insn.getOpcode()];
+                if (insn.getOpcode() >= 0)
+                    info = OpInfo.ops[insn.getOpcode()];
                 if (info == null) {
                     subBlock.addAll(cfg.getSucBlocks(t));
                 } else if (info.canThrow()) {
@@ -104,9 +103,8 @@ public class NaiveDynamicTaintAnalysis extends BreadthFirstSearch<TaintResult, T
             if (functionName.contains("traceif")) {
                 traceIfNum = (int) invoke;
                 if (branchCount.get(functionGlobel).containsKey(traceIfNum)) {
-                    branchCount
-                            .get(functionGlobel)
-                            .put(traceIfNum, branchCount.get(functionGlobel).get(traceIfNum) + 1);
+                    branchCount.get(functionGlobel).put(traceIfNum,
+                            branchCount.get(functionGlobel).get(traceIfNum) + 1);
                 } else {
                     branchCount.get(functionGlobel).put(traceIfNum, 1);
                 }
diff --git a/src/main/analysis/org/bdware/analysis/dynamic/ProgramPoint.java b/src/main/analysis/org/bdware/analysis/dynamic/ProgramPoint.java
index e5cd34d..8f46815 100644
--- a/src/main/analysis/org/bdware/analysis/dynamic/ProgramPoint.java
+++ b/src/main/analysis/org/bdware/analysis/dynamic/ProgramPoint.java
@@ -33,23 +33,23 @@ public class ProgramPoint {
                 System.out.println("[stringsss: ]" + strings[0]);
                 funcTx.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("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 = JsonUtil.parseStringAsJsonObject(string);
                 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());
+                        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());
+                        transaction.insert(jo.get("traceMark").getAsInt(),
+                                jo.get("val").getAsInt());
                     }
                 }
             }
diff --git a/src/main/analysis/org/bdware/analysis/example/FieldSensitiveTaintAnalysis.java b/src/main/analysis/org/bdware/analysis/example/FieldSensitiveTaintAnalysis.java
index a93ed77..c8f0247 100644
--- a/src/main/analysis/org/bdware/analysis/example/FieldSensitiveTaintAnalysis.java
+++ b/src/main/analysis/org/bdware/analysis/example/FieldSensitiveTaintAnalysis.java
@@ -21,16 +21,14 @@ public class FieldSensitiveTaintAnalysis extends BreadthFirstSearch<TaintResult,
         this.cfg = cfg;
         List<TaintBB> toAnalysis = new ArrayList<>();
         /*
-         * NaiveTaintBB������ boolean inList NaiveTaintResult preResult NaiveTaintResult
-         * sucResult
+         * 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
+         * 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();
@@ -40,10 +38,9 @@ public class FieldSensitiveTaintAnalysis extends BreadthFirstSearch<TaintResult,
         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,
+         * 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
@@ -54,8 +51,7 @@ public class FieldSensitiveTaintAnalysis extends BreadthFirstSearch<TaintResult,
         b.setInList(true);
         // ����BreadthFirstSearch���еĺ���setToAnalysis����ʱBreadthFirstSearch�����toAnalysisΪ��ǰ�Ŀ��б�ֻ��һ����B0
         /*
-         * BreadthFirstSearch���еı����� Map<T, AnalysisResult> results; List<T>
-         * toAnalysis;
+         * BreadthFirstSearch���еı����� Map<T, AnalysisResult> results; List<T> toAnalysis;
          */
         setToAnalysis(toAnalysis);
         if (isDebug) {
diff --git a/src/main/analysis/org/bdware/analysis/example/MultiSourceTaintAnalysis.java b/src/main/analysis/org/bdware/analysis/example/MultiSourceTaintAnalysis.java
index c5f468e..b0852fb 100644
--- a/src/main/analysis/org/bdware/analysis/example/MultiSourceTaintAnalysis.java
+++ b/src/main/analysis/org/bdware/analysis/example/MultiSourceTaintAnalysis.java
@@ -37,11 +37,8 @@ public class MultiSourceTaintAnalysis extends BreadthFirstSearch<TaintResult, Ta
         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);
+            System.out.println("===Local:" + cfg.getMethodNode().maxLocals + " "
+                    + cfg.getMethodNode().maxStack);
         }
     }
 
@@ -57,18 +54,12 @@ public class MultiSourceTaintAnalysis extends BreadthFirstSearch<TaintResult, Ta
         for (BasicBlock bb : subBlock) {
             TaintBB ntbb = (TaintBB) bb;
             if (TaintConfig.isDebug)
-                System.out.println(
-                        "[MultiSoruceTaintAnalysis] B"
-                                + ntbb.blockID
-                                + " beforeMerge:"
-                                + ntbb.preResult.frame2Str());
+                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());
+                System.out.println("[MultiSoruceTaintAnalysis] B" + ntbb.blockID + " afterMerge:"
+                        + ntbb.preResult.frame2Str());
 
             ret.add(ntbb);
         }
@@ -95,9 +86,10 @@ public class MultiSourceTaintAnalysis extends BreadthFirstSearch<TaintResult, Ta
                 }
             }
         }
-        /*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.
+        /*
+         * 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<>();
@@ -108,9 +100,11 @@ public class MultiSourceTaintAnalysis extends BreadthFirstSearch<TaintResult, Ta
                 int sucSize = sucBlocks.size();
                 int count = 0;
                 for (BasicBlock sucBlock : sucBlocks) {
-                    if (isArrival(cfg, sucBlock, bb)) count++;
+                    if (isArrival(cfg, sucBlock, bb))
+                        count++;
                 }
-                if (count > 0 && count != sucSize) list.add(id);
+                if (count > 0 && count != sucSize)
+                    list.add(id);
             }
             map.put(bb.blockID, list);
         }
@@ -129,10 +123,8 @@ public class MultiSourceTaintAnalysis extends BreadthFirstSearch<TaintResult, Ta
                 }
             }
             /*
-            for(int i : entry.getValue())
-            	System.out.print(i+ " ");
-            System.out.println();
-            */
+             * for(int i : entry.getValue()) System.out.print(i+ " "); System.out.println();
+             */
         }
 
         // add dependence to the last block
@@ -141,7 +133,8 @@ public class MultiSourceTaintAnalysis extends BreadthFirstSearch<TaintResult, Ta
             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);
+                    if (!lastBlockDep.contains(i))
+                        lastBlockDep.add(i);
                 }
             }
             returnMap.put(cfg.getBasicBlockSize() - 1, lastBlockDep);
@@ -149,14 +142,10 @@ public class MultiSourceTaintAnalysis extends BreadthFirstSearch<TaintResult, Ta
 
         // 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();
-        }
-        */
+         * 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;
     }
@@ -164,20 +153,14 @@ public class MultiSourceTaintAnalysis extends BreadthFirstSearch<TaintResult, Ta
     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; 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;
+        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
index 11602fc..8b0e2f3 100644
--- a/src/main/analysis/org/bdware/analysis/example/NaiveTaintAnalysis.java
+++ b/src/main/analysis/org/bdware/analysis/example/NaiveTaintAnalysis.java
@@ -33,11 +33,8 @@ public class NaiveTaintAnalysis extends BreadthFirstSearch<TaintResult, TaintBB>
         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);
+            System.out.println("===Local:" + cfg.getMethodNode().maxLocals + " "
+                    + cfg.getMethodNode().maxStack);
         }
     }
 
diff --git a/src/main/analysis/org/bdware/analysis/gas/BFS.java b/src/main/analysis/org/bdware/analysis/gas/BFS.java
index 235b945..c4dc62e 100644
--- a/src/main/analysis/org/bdware/analysis/gas/BFS.java
+++ b/src/main/analysis/org/bdware/analysis/gas/BFS.java
@@ -6,26 +6,29 @@ 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;
-	}
-	
+    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
index 9fa2113..a09a521 100644
--- a/src/main/analysis/org/bdware/analysis/gas/CostDetail.java
+++ b/src/main/analysis/org/bdware/analysis/gas/CostDetail.java
@@ -1 +1 @@
-package org.bdware.analysis.gas;
\ No newline at end of file
+package org.bdware.analysis.gas;
diff --git a/src/main/analysis/org/bdware/analysis/gas/CountProgramPoint.java b/src/main/analysis/org/bdware/analysis/gas/CountProgramPoint.java
index 5652de5..2a8181b 100644
--- a/src/main/analysis/org/bdware/analysis/gas/CountProgramPoint.java
+++ b/src/main/analysis/org/bdware/analysis/gas/CountProgramPoint.java
@@ -12,215 +12,215 @@ 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 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);
-	}
+    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;
-	}
+    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;
+    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;
-				}
-			}
-		}
+    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);
+        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) {
+    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);
-						}
-					}
-				}
-			}
+                        } 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;
-	}
+        }
+        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 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 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);
-			}
+    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);
-			}
-		}
+        } 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;
-		}
-	}
+    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
index 60d1812..2b2dc62 100644
--- a/src/main/analysis/org/bdware/analysis/gas/DFS.java
+++ b/src/main/analysis/org/bdware/analysis/gas/DFS.java
@@ -15,7 +15,8 @@ public abstract class DFS {
         // System.out.println("[start.blockID]" + start.blockID);
         Set<BasicBlock> sucBlocks = getSuc(start);
         for (BasicBlock bb : sucBlocks) {
-            if (!marked[bb.blockID]) dfs(cfg, bb);
+            if (!marked[bb.blockID])
+                dfs(cfg, bb);
         }
     }
 
diff --git a/src/main/analysis/org/bdware/analysis/gas/Evaluates.java b/src/main/analysis/org/bdware/analysis/gas/Evaluates.java
index 2c797cd..0882cc1 100644
--- a/src/main/analysis/org/bdware/analysis/gas/Evaluates.java
+++ b/src/main/analysis/org/bdware/analysis/gas/Evaluates.java
@@ -20,7 +20,7 @@ public class Evaluates {
                 long fee = getValue(cmap.getKey());
                 value = fee * cmap.getValue() + value;
             }
-                CountResult.put(cfrKey, value);
+            CountResult.put(cfrKey, value);
         }
         return CountResult;
     }
@@ -62,14 +62,14 @@ public class Evaluates {
     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);
+        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) {
@@ -84,13 +84,13 @@ public class Evaluates {
     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()) {
+        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
index bad8086..c980ae1 100644
--- a/src/main/analysis/org/bdware/analysis/gas/FeeSchedule.java
+++ b/src/main/analysis/org/bdware/analysis/gas/FeeSchedule.java
@@ -1,51 +1,52 @@
 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);
+    // BDaload(20L),BDstore(200L),
+    BDgetMethod(10L), BDsetMethod(20L), BDnew(20L), BDcallUtil(30L), BDcallFuntion(40L), BDcall(
+            10L), BDjump(15L), BDInsn(1L);
 
-	long fee;
+    long fee;
 
-	FeeSchedule(long value) {
-		fee = value;
-	}
+    FeeSchedule(long value) {
+        fee = value;
+    }
 
-	public long getFee() {
-		return fee;
-	}
+    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 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();
+    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
index c39a887..c9bc675 100644
--- a/src/main/analysis/org/bdware/analysis/gas/PPCount.java
+++ b/src/main/analysis/org/bdware/analysis/gas/PPCount.java
@@ -11,12 +11,8 @@ 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;
@@ -49,7 +45,7 @@ public class PPCount extends DFS {
         BasicBlock b = cfg.getBasicBlockAt(0);
         toAnalysis.add(b);
         b.setInList(true);
-//        System.out.println("=========:"+cfg.getMethodNode().name);
+        // System.out.println("=========:"+cfg.getMethodNode().name);
         functionList.add(cfg.getMethodNode().name);
         isBranchBlock = new boolean[cfg.getBasicBlockSize()];
         // setToAnalysis(toAnalysis);
@@ -302,44 +298,42 @@ public class PPCount extends DFS {
         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);
+                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);
+                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);
+                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);
+                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);
+            // 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);
+                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);
@@ -348,16 +342,16 @@ public class PPCount extends DFS {
         } 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);
+                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);
+                BlockInsn.get(globalBlockID).put(bdName,
+                        BlockInsn.get(globalBlockID).get(bdName) + 1);
             } else {
                 BlockInsn.get(globalBlockID).put(bdName, 1);
             }
@@ -366,8 +360,8 @@ public class PPCount extends DFS {
 
     private boolean isInnerfunction(String functionName) {
         String string = functionName.split(":")[2];
-       // System.out.println("++++++++++++++" + functionName);
-       // System.out.println("【function】" + functionList);
+        // System.out.println("++++++++++++++" + functionName);
+        // System.out.println("【function】" + functionList);
         if (functionList.contains(string)) {
             return true;
         } else {
@@ -375,57 +369,57 @@ public class PPCount extends DFS {
         }
     }
 
-    //    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);
+    // 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);
+    // 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();
+    // 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);
+    // 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());
-    //    }
+    // // System.out.println(feEvaluates.getCallFee());
+    // }
 
     public static HashMap<String, Long> functionSumGas = new HashMap<>();
 
diff --git a/src/main/analysis/org/bdware/analysis/taint/DirectGraphDFS.java b/src/main/analysis/org/bdware/analysis/taint/DirectGraphDFS.java
index 3dcdf70..ec10e4d 100644
--- a/src/main/analysis/org/bdware/analysis/taint/DirectGraphDFS.java
+++ b/src/main/analysis/org/bdware/analysis/taint/DirectGraphDFS.java
@@ -5,24 +5,24 @@ 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];
-	}
- 
+    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
index ccee54d..9653b56 100644
--- a/src/main/analysis/org/bdware/analysis/taint/HeapObject.java
+++ b/src/main/analysis/org/bdware/analysis/taint/HeapObject.java
@@ -11,237 +11,240 @@ 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;
+    private Map<String, TaintValue> fields = new HashMap<String, TaintValue>();
+    static int allocatID = 0;
+    int id;
 
-	public HeapObject() {
-		super(1);
-		id = allocatID++;
-	}
+    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 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;
-	}
+    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();
-	}
+    @Override
+    public String toString() {
+        return countSize() + "|" + super.toString();
+    }
 
-	private String countSize() {
-		objSet = new HashSet<>();
-		return countSizeInternal();
-	}
+    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 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;
+    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;
+    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 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 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;
-	}
+    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 getProp(String str) {
+        return fields.get(str);
+    }
 
-	public TaintValue setProp(String str, TaintValue val) {
-		return fields.put(str, val);
-	}
+    public TaintValue setProp(String str, TaintValue val) {
+        return fields.put(str, val);
+    }
 
-	@Override
-	public HeapObject clone() {
-		return this;
-	}
+    @Override
+    public HeapObject clone() {
+        return this;
+    }
 
-	public HeapObject actualClone() {
-		ccObj = new HashMap<>();
-		return cloneInternal();
-	}
+    public HeapObject actualClone() {
+        ccObj = new HashMap<>();
+        return cloneInternal();
+    }
 
-	static Map<HeapObject, HeapObject> ccObj;
+    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;
-	}
+    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);
+    // 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());
+                } else
+                    fields.put(field, targetObject.fields.get(field).clone());
 
-			}
-		}
-	}
+            }
+        }
+    }
 
-	public synchronized long wholeTaint() {
-		objSet = new HashSet<>();
-		return wholeTaintInternal();
-	}
+    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;
-	}
+    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
index d7949fd..5b22994 100644
--- a/src/main/analysis/org/bdware/analysis/taint/TaintBB.java
+++ b/src/main/analysis/org/bdware/analysis/taint/TaintBB.java
@@ -7,64 +7,68 @@ import org.bdware.analysis.BasicBlock;
 import org.objectweb.asm.tree.AbstractInsnNode;
 
 public class TaintBB extends BasicBlock implements AnalysisTarget {
-	boolean inList = false;
+    boolean inList = false;
 
-	public TaintBB(int id) {
-		super(id);
-		preResult = new TaintResult();
-		sucResult = new TaintResult();
-	}
+    public TaintBB(int id) {
+        super(id);
+        preResult = new TaintResult();
+        sucResult = new TaintResult();
+    }
 
-	public TaintResult preResult;
-	public TaintResult sucResult;
+    public TaintResult preResult;
+    public TaintResult sucResult;
 
-	@Override
-	public boolean inList() {
-		return inList;
-	}
+    @Override
+    public boolean inList() {
+        return inList;
+    }
 
-	@Override
-	public void setInList(boolean b) {
-		inList = b;
-	}
-	 
-	public String getResult() {
-		return (sucResult.frame2Str() + " Ret:" + sucResult.ret.toString());
-	}
+    @Override
+    public void setInList(boolean b) {
+        inList = b;
+    }
 
-	public String getResultWithTaintBit() {
-		return "Ret:" + sucResult.ret.toReadableTaint();
-	}
+    public String getResult() {
+        return (sucResult.frame2Str() + " Ret:" + sucResult.ret.toString());
+    }
 
-	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());
+    public String getResultWithTaintBit() {
+        return "Ret:" + sucResult.ret.toReadableTaint();
+    }
 
-		for (int i = 0; i < insns.size(); i++) {
-			currentResult = (TaintResult) currentResult.merge(insns.get(i));
-		}
-		currentResult.mergeResult(oldSuc);
+    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());
 
-		if (TaintConfig.isDebug)
-			System.out.println("[TaintBB] Leave B" + blockID + ":" + getResult() + " size:" + insns.size());
-		// already done.
-		return currentResult;
-	}
+        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;
+    }
 
-	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
index 331d179..81b32b3 100644
--- a/src/main/analysis/org/bdware/analysis/taint/TaintBits.java
+++ b/src/main/analysis/org/bdware/analysis/taint/TaintBits.java
@@ -4,65 +4,65 @@ 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;
+    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 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;
-	}
+    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;
-	}
+    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 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 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;
-	}
+    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
index 4a62cb8..4a04572 100644
--- a/src/main/analysis/org/bdware/analysis/taint/TaintCFG.java
+++ b/src/main/analysis/org/bdware/analysis/taint/TaintCFG.java
@@ -11,74 +11,75 @@ import org.objectweb.asm.tree.InvokeDynamicInsnNode;
 import org.objectweb.asm.tree.MethodNode;
 
 public class TaintCFG extends CFGraph {
-	public TaintBits taintBits;
+    public TaintBits taintBits;
 
-	public TaintCFG(MethodNode mn) {
-		super(mn);
-		taintBits = new TaintBits();
-	}
+    public TaintCFG(MethodNode mn) {
+        super(mn);
+        taintBits = new TaintBits();
+    }
 
-	@Override
-	public BasicBlock getBasicBlock(int id) {
-		return new TaintBB(id);
-	}
+    @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 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 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());
-			}
+    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);
-			}
-		}
+            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;
-	}
+    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
index e51392a..4bcc5fa 100644
--- a/src/main/analysis/org/bdware/analysis/taint/TaintConfig.java
+++ b/src/main/analysis/org/bdware/analysis/taint/TaintConfig.java
@@ -1,5 +1,5 @@
 package org.bdware.analysis.taint;
 
 public class TaintConfig {
-	public static boolean isDebug = false;
+    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
index c29ab7a..df20943 100644
--- a/src/main/analysis/org/bdware/analysis/taint/TaintInterpreter.java
+++ b/src/main/analysis/org/bdware/analysis/taint/TaintInterpreter.java
@@ -12,166 +12,172 @@ import org.objectweb.asm.tree.analysis.AnalyzerException;
 import org.objectweb.asm.tree.analysis.Interpreter;
 
 public class TaintInterpreter extends Interpreter<TaintValue> {
-	TaintResult currentResult;
-	TaintBits taintBits;
+    TaintResult currentResult;
+    TaintBits taintBits;
 
-	public TaintInterpreter(int api) {
-		super(api);
+    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 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 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 copyOperation(AbstractInsnNode insn, TaintValue value)
+            throws AnalyzerException {
+        return value;
+    }
 
-	@Override
-	public TaintValue unaryOperation(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 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 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;
+    @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()));
+                // 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);
-	}
+            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 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;
-	}
+    @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 setCurrentResult(TaintResult naiveTaintResult) {
+        currentResult = naiveTaintResult;
+    }
 
-	public void setTaintBits(TaintBits tb) {
-		taintBits = tb;
-	}
-}
\ No newline at end of file
+    public void setTaintBits(TaintBits tb) {
+        taintBits = tb;
+    }
+}
diff --git a/src/main/analysis/org/bdware/analysis/taint/TaintResult.java b/src/main/analysis/org/bdware/analysis/taint/TaintResult.java
index e3025c0..5601c11 100644
--- a/src/main/analysis/org/bdware/analysis/taint/TaintResult.java
+++ b/src/main/analysis/org/bdware/analysis/taint/TaintResult.java
@@ -8,183 +8,183 @@ 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 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;
-	}
+    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());
+    @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;
-	}
-	
+        } 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();
-	}
+    @Override
+    public void printResult() {
+        System.out.println("====" + frame2Str() + " Ret:" + ret.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;
-	}
+    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 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;
-	}
+    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;
+    }
 
-	@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());	
-	}
+    /*
+     * 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;
+    }
 
-	// 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 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());
+    }
 
-	@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());
-			}
-		}
+    // 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;
+    }
 
-		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);
-					}
-				}
+    @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());
+            }
+        }
 
-				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); 
-	}
+        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);
+                    }
+                }
 
-	@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;
-	}
+                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
index d01e7df..7ee8e0c 100644
--- a/src/main/analysis/org/bdware/analysis/taint/TaintValue.java
+++ b/src/main/analysis/org/bdware/analysis/taint/TaintValue.java
@@ -3,52 +3,52 @@ 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 int size;
+    // public boolean isTainted;
+    public long isTainted;
 
-	public TaintValue(int size) {
-		this.size = size;
-		isTainted = 0L;
-	}
+    public TaintValue(int size) {
+        this.size = size;
+        isTainted = 0L;
+    }
 
-	public TaintValue(int size, long isTainted) {
-		this.size = size;
-		this.isTainted = isTainted;
-	}
+    public TaintValue(int size, long isTainted) {
+        this.size = size;
+        this.isTainted = isTainted;
+    }
 
-	@Override
-	public int getSize() {
-		return size;
-	}
+    @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();
-	}
+    @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 TaintValue clone() {
+        TaintValue ret = new TaintValue(size);
+        ret.isTainted = isTainted;
+        return ret;
+    }
 
-	public String toReadableTaint() {
-		return TaintResult.interpreter.taintBits.parse(isTainted);
-	}
+    public String toReadableTaint() {
+        return TaintResult.interpreter.taintBits.parse(isTainted);
+    }
 
-	public void merge(TaintValue target) {
-		if (target != null)
-			isTainted |= target.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
index 3c8a740..2eaa156 100644
--- a/src/main/asm/org/objectweb/asm/AnnotationVisitor.java
+++ b/src/main/asm/org/objectweb/asm/AnnotationVisitor.java
@@ -1,38 +1,30 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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>.
+ * 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
@@ -40,23 +32,21 @@ package org.objectweb.asm;
 public abstract class AnnotationVisitor {
 
     /**
-     * The ASM API version implemented by this visitor. The value of this field
-     * must be one of {@link Opcodes#ASM4}.
+     * 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.
+     * 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}.
+     * @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);
@@ -65,12 +55,10 @@ public abstract class AnnotationVisitor {
     /**
      * 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.
+     * @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) {
@@ -83,17 +71,13 @@ public abstract class AnnotationVisitor {
     /**
      * 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).
+     * @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) {
@@ -104,12 +88,9 @@ public abstract class AnnotationVisitor {
     /**
      * 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.
+     * @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) {
@@ -120,15 +101,12 @@ public abstract class AnnotationVisitor {
     /**
      * 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>.
+     * @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) {
@@ -138,18 +116,15 @@ public abstract class AnnotationVisitor {
     }
 
     /**
-     * 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.
+     * 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>.
+     * @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) {
diff --git a/src/main/asm/org/objectweb/asm/AnnotationWriter.java b/src/main/asm/org/objectweb/asm/AnnotationWriter.java
index 4cfa633..2a99aee 100644
--- a/src/main/asm/org/objectweb/asm/AnnotationWriter.java
+++ b/src/main/asm/org/objectweb/asm/AnnotationWriter.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -35,344 +27,267 @@ package org.objectweb.asm;
  * @author Eric Bruneton
  * @author Eugene Kuleshov
  */
-final class AnnotationWriter extends AnnotationVisitor
-{
+final class AnnotationWriter extends AnnotationVisitor {
 
-	/**
-	 * The class writer to which this annotation must be added.
-	 */
-	private final ClassWriter cw;
+    /**
+     * The class writer to which this annotation must be added.
+     */
+    private final ClassWriter cw;
 
-	/**
-	 * The number of values in this annotation.
-	 */
-	private int size;
+    /**
+     * 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;
+    /**
+     * <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 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;
+    /**
+     * 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;
+    /**
+     * 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;
+    /**
+     * 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;
+    /**
+     * Previous annotation writer. This field is used to store annotation lists.
+     */
+    AnnotationWriter prev;
 
-	// ------------------------------------------------------------------------
-	// Constructor
-	// ------------------------------------------------------------------------
+    // ------------------------------------------------------------------------
+    // 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;
-	}
+    /**
+     * 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
-	// ------------------------------------------------------------------------
+    // ------------------------------------------------------------------------
+    // 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 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 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 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 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;
-		}
-	}
+    @Override
+    public void visitEnd() {
+        if (parent != null) {
+            byte[] data = parent.data;
+            data[offset] = (byte) (size >>> 8);
+            data[offset + 1] = (byte) size;
+        }
+    }
 
-	// ------------------------------------------------------------------------
-	// Utility methods
-	// ------------------------------------------------------------------------
+    // ------------------------------------------------------------------------
+    // 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;
-	}
+    /**
+     * 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 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;
-			}
-		}
-	}
+    /**
+     * 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
index 8a2a882..c7d8df9 100644
--- a/src/main/asm/org/objectweb/asm/Attribute.java
+++ b/src/main/asm/org/objectweb/asm/Attribute.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -55,16 +47,15 @@ public class Attribute {
     /**
      * Constructs a new empty attribute.
      * 
-     * @param type
-     *            the type of the 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>.
+     * 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.
      */
@@ -84,47 +75,36 @@ public class Attribute {
     /**
      * 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.
+     * @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.
+     * 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.
+     * @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) {
+    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);
@@ -134,30 +114,20 @@ public class Attribute {
     /**
      * 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.
+     * @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) {
+    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;
@@ -182,30 +152,21 @@ public class Attribute {
     /**
      * 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.
+     * @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) {
+    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) {
@@ -217,33 +178,22 @@ public class Attribute {
     }
 
     /**
-     * Writes all the attributes of this attribute list in the given byte
-     * vector.
+     * 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.
+     * @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) {
+    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);
diff --git a/src/main/asm/org/objectweb/asm/ByteVector.java b/src/main/asm/org/objectweb/asm/ByteVector.java
index f1e2da1..b0d3d05 100644
--- a/src/main/asm/org/objectweb/asm/ByteVector.java
+++ b/src/main/asm/org/objectweb/asm/ByteVector.java
@@ -1,37 +1,29 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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.
+ * 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
  */
@@ -48,30 +40,25 @@ public class ByteVector {
     int length;
 
     /**
-     * Constructs a new {@link ByteVector ByteVector} with a default initial
-     * size.
+     * 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.
+     * Constructs a new {@link ByteVector ByteVector} with the given initial size.
      * 
-     * @param initialSize
-     *            the initial size of the byte vector to be constructed.
+     * @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.
+     * Puts a byte into this byte vector. The byte vector is automatically enlarged if necessary.
      * 
-     * @param b
-     *            a byte.
+     * @param b a byte.
      * @return this byte vector.
      */
     public ByteVector putByte(final int b) {
@@ -85,13 +72,10 @@ public class ByteVector {
     }
 
     /**
-     * Puts two bytes into this byte vector. The byte vector is automatically
-     * enlarged if necessary.
+     * Puts two bytes into this byte vector. The byte vector is automatically enlarged if necessary.
      * 
-     * @param b1
-     *            a byte.
-     * @param b2
-     *            another byte.
+     * @param b1 a byte.
+     * @param b2 another byte.
      * @return this byte vector.
      */
     ByteVector put11(final int b1, final int b2) {
@@ -107,11 +91,9 @@ public class ByteVector {
     }
 
     /**
-     * Puts a short into this byte vector. The byte vector is automatically
-     * enlarged if necessary.
+     * Puts a short into this byte vector. The byte vector is automatically enlarged if necessary.
      * 
-     * @param s
-     *            a short.
+     * @param s a short.
      * @return this byte vector.
      */
     public ByteVector putShort(final int s) {
@@ -127,13 +109,11 @@ public class ByteVector {
     }
 
     /**
-     * Puts a byte and a short into this byte vector. The byte vector is
-     * automatically enlarged if necessary.
+     * 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.
+     * @param b a byte.
+     * @param s a short.
      * @return this byte vector.
      */
     ByteVector put12(final int b, final int s) {
@@ -150,11 +130,9 @@ public class ByteVector {
     }
 
     /**
-     * Puts an int into this byte vector. The byte vector is automatically
-     * enlarged if necessary.
+     * Puts an int into this byte vector. The byte vector is automatically enlarged if necessary.
      * 
-     * @param i
-     *            an int.
+     * @param i an int.
      * @return this byte vector.
      */
     public ByteVector putInt(final int i) {
@@ -172,11 +150,9 @@ public class ByteVector {
     }
 
     /**
-     * Puts a long into this byte vector. The byte vector is automatically
-     * enlarged if necessary.
+     * Puts a long into this byte vector. The byte vector is automatically enlarged if necessary.
      * 
-     * @param l
-     *            a long.
+     * @param l a long.
      * @return this byte vector.
      */
     public ByteVector putLong(final long l) {
@@ -200,11 +176,10 @@ public class ByteVector {
     }
 
     /**
-     * Puts an UTF8 string into this byte vector. The byte vector is
-     * automatically enlarged if necessary.
+     * 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.
+     * @param s a String whose UTF8 encoded length must be less than 65536.
      * @return this byte vector.
      */
     public ByteVector putUTF8(final String s) {
@@ -272,16 +247,13 @@ public class ByteVector {
     }
 
     /**
-     * Puts an array of bytes into this byte vector. The byte vector is
-     * automatically enlarged if necessary.
+     * 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.
+     * @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) {
@@ -298,9 +270,7 @@ public class ByteVector {
     /**
      * 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.
+     * @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;
diff --git a/src/main/asm/org/objectweb/asm/ClassReader.java b/src/main/asm/org/objectweb/asm/ClassReader.java
index 5341e0d..0510363 100644
--- a/src/main/asm/org/objectweb/asm/ClassReader.java
+++ b/src/main/asm/org/objectweb/asm/ClassReader.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -33,2486 +25,2001 @@ 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.
+ * 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);
-		}
-	}
+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
index cf3366c..1f33212 100644
--- a/src/main/asm/org/objectweb/asm/ClassVisitor.java
+++ b/src/main/asm/org/objectweb/asm/ClassVisitor.java
@@ -1,38 +1,29 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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> |
+ * 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>.
  * 
@@ -41,23 +32,21 @@ package org.objectweb.asm;
 public abstract class ClassVisitor {
 
     /**
-     * The ASM API version implemented by this visitor. The value of this field
-     * must be one of {@link Opcodes#ASM4}.
+     * 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.
+     * 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}.
+     * @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);
@@ -66,12 +55,9 @@ public abstract class ClassVisitor {
     /**
      * 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.
+     * @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) {
@@ -84,30 +70,21 @@ public abstract class ClassVisitor {
     /**
      * 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>.
+     * @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) {
+    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);
         }
@@ -116,13 +93,10 @@ public abstract class ClassVisitor {
     /**
      * 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>.
+     * @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) {
@@ -131,19 +105,14 @@ public abstract class ClassVisitor {
     }
 
     /**
-     * Visits the enclosing class of the class. This method must be called only
-     * if the class has an enclosing class.
+     * 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.
+     * @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) {
@@ -154,12 +123,10 @@ public abstract class ClassVisitor {
     /**
      * 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.
+     * @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) {
@@ -171,8 +138,7 @@ public abstract class ClassVisitor {
     /**
      * Visits a non standard attribute of the class.
      * 
-     * @param attr
-     *            an attribute.
+     * @param attr an attribute.
      */
     public void visitAttribute(Attribute attr) {
         if (cv != null) {
@@ -181,25 +147,20 @@ public abstract class ClassVisitor {
     }
 
     /**
-     * Visits information about an inner class. This inner class is not
-     * necessarily a member of the class being visited.
+     * 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.
+     * @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) {
+    public void visitInnerClass(String name, String outerName, String innerName, int access) {
         if (cv != null) {
             cv.visitInnerClass(name, outerName, innerName, access);
         }
@@ -208,32 +169,23 @@ public abstract class ClassVisitor {
     /**
      * 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.
+     * @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) {
+    public FieldVisitor visitField(int access, String name, String desc, String signature,
+            Object value) {
         if (cv != null) {
             return cv.visitField(access, name, desc, signature, value);
         }
@@ -241,32 +193,23 @@ public abstract class ClassVisitor {
     }
 
     /**
-     * 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.
+     * 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.
+     * @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) {
+    public MethodVisitor visitMethod(int access, String name, String desc, String signature,
+            String[] exceptions) {
         if (cv != null) {
             return cv.visitMethod(access, name, desc, signature, exceptions);
         }
@@ -274,9 +217,8 @@ public abstract class ClassVisitor {
     }
 
     /**
-     * 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.
+     * 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) {
diff --git a/src/main/asm/org/objectweb/asm/ClassWriter.java b/src/main/asm/org/objectweb/asm/ClassWriter.java
index 4dfd03e..ca15bb4 100644
--- a/src/main/asm/org/objectweb/asm/ClassWriter.java
+++ b/src/main/asm/org/objectweb/asm/ClassWriter.java
@@ -1,81 +1,68 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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.
+ * 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.
+     * 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.
+     * 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.
+     * 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;
+    static final int TO_ACC_SYNTHETIC = ACC_SYNTHETIC_ATTRIBUTE / Opcodes.ACC_SYNTHETIC;
 
     /**
      * The type of instructions without any argument.
@@ -243,37 +230,35 @@ public class ClassWriter extends ClassVisitor {
     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.
+     * 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.
+     * 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.
+     * 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.
+     * 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.
+     * 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;
 
@@ -328,15 +313,13 @@ public class ClassWriter extends ClassVisitor {
     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.
+     * 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;
 
@@ -366,8 +349,7 @@ public class ClassWriter extends ClassVisitor {
     private int signature;
 
     /**
-     * The constant pool item that contains the internal name of the super class
-     * of this class.
+     * The constant pool item that contains the internal name of the super class of this class.
      */
     private int superName;
 
@@ -377,15 +359,15 @@ public class ClassWriter extends ClassVisitor {
     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.
+     * 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.
+     * The index of the constant pool item that contains the name of the source file from which this
+     * class was compiled.
      */
     private int sourceFile;
 
@@ -395,14 +377,13 @@ public class ClassWriter extends ClassVisitor {
     private ByteVector sourceDebug;
 
     /**
-     * The constant pool item that contains the name of the enclosing class of
-     * this class.
+     * 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.
+     * The constant pool item that contains the name and descriptor of the enclosing method of this
+     * class.
      */
     private int enclosingMethod;
 
@@ -442,40 +423,36 @@ public class ClassWriter extends ClassVisitor {
     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.
+     * 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.
+     * 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.
+     * 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.
+     * 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.
+     * <tt>true</tt> if the maximum stack size and number of local variables must be automatically
+     * computed.
      */
     private boolean computeMaxs;
 
@@ -486,11 +463,10 @@ public class ClassWriter extends ClassVisitor {
 
     /**
      * <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).
+     * {@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;
 
@@ -589,10 +565,8 @@ public class ClassWriter extends ClassVisitor {
     /**
      * 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}.
+     * @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);
@@ -609,36 +583,27 @@ public class ClassWriter extends ClassVisitor {
     }
 
     /**
-     * Constructs a new {@link ClassWriter} object and enables optimizations for
-     * "mostly add" bytecode transformations. These optimizations are the
-     * following:
+     * 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>
+     * <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}.
+     * @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);
@@ -651,9 +616,8 @@ public class ClassWriter extends ClassVisitor {
     // ------------------------------------------------------------------------
 
     @Override
-    public final void visit(final int version, final int access,
-            final String name, final String signature, final String superName,
-            final String[] interfaces) {
+    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);
@@ -682,8 +646,7 @@ public class ClassWriter extends ClassVisitor {
     }
 
     @Override
-    public final void visitOuterClass(final String owner, final String name,
-            final String desc) {
+    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);
@@ -691,8 +654,7 @@ public class ClassWriter extends ClassVisitor {
     }
 
     @Override
-    public final AnnotationVisitor visitAnnotation(final String desc,
-            final boolean visible) {
+    public final AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
         if (!ClassReader.ANNOTATIONS) {
             return null;
         }
@@ -717,8 +679,8 @@ public class ClassWriter extends ClassVisitor {
     }
 
     @Override
-    public final void visitInnerClass(final String name,
-            final String outerName, final String innerName, final int access) {
+    public final void visitInnerClass(final String name, final String outerName,
+            final String innerName, final int access) {
         if (innerClasses == null) {
             innerClasses = new ByteVector();
         }
@@ -730,21 +692,20 @@ public class ClassWriter extends ClassVisitor {
     }
 
     @Override
-    public final FieldVisitor visitField(final int access, final String name,
-            final String desc, final String signature, final Object value) {
+    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);
+    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() {
-    }
+    public final void visitEnd() {}
 
     // ------------------------------------------------------------------------
     // Other public methods
@@ -809,8 +770,7 @@ public class ClassWriter extends ClassVisitor {
             newUTF8("Deprecated");
         }
         if ((access & Opcodes.ACC_SYNTHETIC) != 0) {
-            if ((version & 0xFFFF) < Opcodes.V1_5
-                    || (access & ACC_SYNTHETIC_ATTRIBUTE) != 0) {
+            if ((version & 0xFFFF) < Opcodes.V1_5 || (access & ACC_SYNTHETIC_ATTRIBUTE) != 0) {
                 ++attributeCount;
                 size += 6;
                 newUTF8("Synthetic");
@@ -863,8 +823,7 @@ public class ClassWriter extends ClassVisitor {
         out.putShort(attributeCount);
         if (bootstrapMethods != null) {
             out.putShort(newUTF8("BootstrapMethods"));
-            out.putInt(bootstrapMethods.length + 2).putShort(
-                    bootstrapMethodsCount);
+            out.putInt(bootstrapMethods.length + 2).putShort(bootstrapMethodsCount);
             out.putByteArray(bootstrapMethods.data, 0, bootstrapMethods.length);
         }
         if (ClassReader.SIGNATURES && signature != 0) {
@@ -886,8 +845,7 @@ public class ClassWriter extends ClassVisitor {
             out.putShort(newUTF8("Deprecated")).putInt(0);
         }
         if ((access & Opcodes.ACC_SYNTHETIC) != 0) {
-            if ((version & 0xFFFF) < Opcodes.V1_5
-                    || (access & ACC_SYNTHETIC_ATTRIBUTE) != 0) {
+            if ((version & 0xFFFF) < Opcodes.V1_5 || (access & ACC_SYNTHETIC_ATTRIBUTE) != 0) {
                 out.putShort(newUTF8("Synthetic")).putInt(0);
             }
         }
@@ -933,14 +891,12 @@ public class ClassWriter extends ClassVisitor {
     // ------------------------------------------------------------------------
 
     /**
-     * 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.
+     * 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}.
+     * @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) {
@@ -989,30 +945,27 @@ public class ClassWriter extends ClassVisitor {
     }
 
     /**
-     * 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>
+     * 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.
+     * @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>
+     * 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.
+     * @param value the String value.
      * @return the index of a new or already existing UTF8 item.
      */
     public int newUTF8(final String value) {
@@ -1027,13 +980,12 @@ public class ClassWriter extends ClassVisitor {
     }
 
     /**
-     * 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>
+     * 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.
+     * @param value the internal name of the class.
      * @return a new or already existing class reference item.
      */
     Item newClassItem(final String value) {
@@ -1048,13 +1000,12 @@ public class ClassWriter extends ClassVisitor {
     }
 
     /**
-     * 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>
+     * 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.
+     * @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) {
@@ -1062,13 +1013,12 @@ public class ClassWriter extends ClassVisitor {
     }
 
     /**
-     * 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>
+     * 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.
+     * @param methodDesc method descriptor of the method type.
      * @return a new or already existing method type reference item.
      */
     Item newMethodTypeItem(final String methodDesc) {
@@ -1083,54 +1033,41 @@ public class ClassWriter extends ClassVisitor {
     }
 
     /**
-     * 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>
+     * 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.
+     * @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>
+     * 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.
+     * @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) {
+    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));
+                put112(HANDLE, tag, newMethod(owner, name, desc, tag == Opcodes.H_INVOKEINTERFACE));
             }
             result = new Item(index++, key4);
             put(result);
@@ -1139,52 +1076,39 @@ public class ClassWriter extends ClassVisitor {
     }
 
     /**
-     * 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>
+     * 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.
+     * @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) {
+    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>
+     * 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.
+     * @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) {
+    Item newInvokeDynamicItem(final String name, final String desc, final Handle bsm,
+            final Object... bsmArgs) {
         // cache for performance
         ByteVector bootstrapMethods = this.bootstrapMethods;
         if (bootstrapMethods == null) {
@@ -1194,8 +1118,7 @@ public class ClassWriter extends ClassVisitor {
         int position = bootstrapMethods.length; // record current position
 
         int hashCode = bsm.hashCode();
-        bootstrapMethods.putShort(newHandle(bsm.tag, bsm.owner, bsm.name,
-                bsm.desc));
+        bootstrapMethods.putShort(newHandle(bsm.tag, bsm.owner, bsm.name, bsm.desc));
 
         int argsLength = bsmArgs.length;
         bootstrapMethods.putShort(argsLength);
@@ -1251,38 +1174,30 @@ public class ClassWriter extends ClassVisitor {
     }
 
     /**
-     * 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>
+     * 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.
+     * @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.
+     * @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) {
+    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.
+     * 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.
+     * @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) {
@@ -1297,17 +1212,14 @@ public class ClassWriter extends ClassVisitor {
     }
 
     /**
-     * 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>
+     * 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.
+     * @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) {
@@ -1315,21 +1227,17 @@ public class ClassWriter extends ClassVisitor {
     }
 
     /**
-     * Adds a method reference to the constant pool of the class being build.
-     * Does nothing if the constant pool already contains a similar item.
+     * 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.
+     * @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) {
+    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);
@@ -1342,32 +1250,27 @@ public class ClassWriter extends ClassVisitor {
     }
 
     /**
-     * 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>
+     * 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.
+     * @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) {
+    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.
+     * 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.
+     * @param value the int value.
      * @return a new or already existing int item.
      */
     Item newInteger(final int value) {
@@ -1382,11 +1285,10 @@ public class ClassWriter extends ClassVisitor {
     }
 
     /**
-     * Adds a float to the constant pool of the class being build. Does nothing
-     * if the constant pool already contains a similar item.
+     * 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.
+     * @param value the float value.
      * @return a new or already existing float item.
      */
     Item newFloat(final float value) {
@@ -1401,11 +1303,10 @@ public class ClassWriter extends ClassVisitor {
     }
 
     /**
-     * Adds a long to the constant pool of the class being build. Does nothing
-     * if the constant pool already contains a similar item.
+     * 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.
+     * @param value the long value.
      * @return a new or already existing long item.
      */
     Item newLong(final long value) {
@@ -1421,11 +1322,10 @@ public class ClassWriter extends ClassVisitor {
     }
 
     /**
-     * Adds a double to the constant pool of the class being build. Does nothing
-     * if the constant pool already contains a similar item.
+     * 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.
+     * @param value the double value.
      * @return a new or already existing double item.
      */
     Item newDouble(final double value) {
@@ -1441,11 +1341,10 @@ public class ClassWriter extends ClassVisitor {
     }
 
     /**
-     * Adds a string to the constant pool of the class being build. Does nothing
-     * if the constant pool already contains a similar item.
+     * 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.
+     * @param value the String value.
      * @return a new or already existing string item.
      */
     private Item newString(final String value) {
@@ -1460,15 +1359,13 @@ public class ClassWriter extends ClassVisitor {
     }
 
     /**
-     * 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>
+     * 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.
+     * @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) {
@@ -1476,13 +1373,11 @@ public class ClassWriter extends ClassVisitor {
     }
 
     /**
-     * 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.
+     * 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.
+     * @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) {
@@ -1497,11 +1392,10 @@ public class ClassWriter extends ClassVisitor {
     }
 
     /**
-     * Adds the given internal name to {@link #typeTable} and returns its index.
-     * Does nothing if the type table already contains this internal name.
+     * 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.
+     * @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) {
@@ -1514,15 +1408,12 @@ public class ClassWriter extends ClassVisitor {
     }
 
     /**
-     * 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.
+     * 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.
+     * @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) {
@@ -1540,10 +1431,8 @@ public class ClassWriter extends ClassVisitor {
     /**
      * 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.
+     * @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;
@@ -1562,15 +1451,12 @@ public class ClassWriter extends ClassVisitor {
     }
 
     /**
-     * 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.
+     * 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}.
+     * @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) {
@@ -1589,20 +1475,16 @@ public class ClassWriter extends ClassVisitor {
     }
 
     /**
-     * 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.
+     * 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.
+     * @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;
@@ -1630,13 +1512,11 @@ public class ClassWriter extends ClassVisitor {
     }
 
     /**
-     * Returns the constant pool's hash table item which is equal to the given
-     * item.
+     * 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.
+     * @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];
@@ -1647,11 +1527,10 @@ public class ClassWriter extends ClassVisitor {
     }
 
     /**
-     * Puts the given item in the constant pool's hash table. The hash table
-     * <i>must</i> not already contains this item.
+     * 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.
+     * @param i the item to be added to the constant pool's hash table.
      */
     private void put(final Item i) {
         if (index + typeCount > threshold) {
@@ -1679,12 +1558,9 @@ public class ClassWriter extends ClassVisitor {
     /**
      * Puts one byte and two shorts into the constant pool.
      * 
-     * @param b
-     *            a byte.
-     * @param s1
-     *            a short.
-     * @param s2
-     *            another short.
+     * @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);
@@ -1693,12 +1569,9 @@ public class ClassWriter extends ClassVisitor {
     /**
      * Puts two bytes and one short into the constant pool.
      * 
-     * @param b1
-     *            a byte.
-     * @param b2
-     *            another byte.
-     * @param s
-     *            a short.
+     * @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
index 34691b6..b5b41b2 100644
--- a/src/main/asm/org/objectweb/asm/Context.java
+++ b/src/main/asm/org/objectweb/asm/Context.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
@@ -88,8 +80,8 @@ class Context {
     int localCount;
 
     /**
-     * The number locals in the latest stack map frame that has been parsed,
-     * minus the number of locals in the previous frame.
+     * The number locals in the latest stack map frame that has been parsed, minus the number of
+     * locals in the previous frame.
      */
     int localDiff;
 
@@ -107,4 +99,4 @@ class Context {
      * 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
index 4e87cba..e57a1ce 100644
--- a/src/main/asm/org/objectweb/asm/Edge.java
+++ b/src/main/asm/org/objectweb/asm/Edge.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -42,23 +34,20 @@ class 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.
+     * 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).
+     * 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;
 
@@ -68,8 +57,8 @@ class Edge {
     Label successor;
 
     /**
-     * The next edge in the list of successors of the originating basic block.
-     * See {@link Label#successors successors}.
+     * 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
index ad6db26..4fd4ad5 100644
--- a/src/main/asm/org/objectweb/asm/FieldVisitor.java
+++ b/src/main/asm/org/objectweb/asm/FieldVisitor.java
@@ -1,61 +1,50 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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>.
+ * 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}.
+     * 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.
+     * 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}.
+     * @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);
@@ -64,12 +53,9 @@ public abstract class FieldVisitor {
     /**
      * 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.
+     * @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) {
@@ -82,12 +68,10 @@ public abstract class FieldVisitor {
     /**
      * 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.
+     * @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) {
@@ -99,8 +83,7 @@ public abstract class FieldVisitor {
     /**
      * Visits a non standard attribute of the field.
      * 
-     * @param attr
-     *            an attribute.
+     * @param attr an attribute.
      */
     public void visitAttribute(Attribute attr) {
         if (fv != null) {
@@ -109,9 +92,8 @@ public abstract class FieldVisitor {
     }
 
     /**
-     * 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.
+     * 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) {
diff --git a/src/main/asm/org/objectweb/asm/FieldWriter.java b/src/main/asm/org/objectweb/asm/FieldWriter.java
index 5cbd9c7..75c17db 100644
--- a/src/main/asm/org/objectweb/asm/FieldWriter.java
+++ b/src/main/asm/org/objectweb/asm/FieldWriter.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -47,26 +39,22 @@ final class FieldWriter extends FieldVisitor {
     private final int access;
 
     /**
-     * The index of the constant pool item that contains the name of this
-     * method.
+     * 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.
+     * 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.
+     * 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.
+     * The index of the constant pool item that contains the constant value of this field.
      */
     private int value;
 
@@ -92,21 +80,15 @@ final class FieldWriter extends FieldVisitor {
     /**
      * 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>.
+     * @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) {
+    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;
@@ -131,8 +113,7 @@ final class FieldWriter extends FieldVisitor {
     // ------------------------------------------------------------------------
 
     @Override
-    public AnnotationVisitor visitAnnotation(final String desc,
-            final boolean visible) {
+    public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
         if (!ClassReader.ANNOTATIONS) {
             return null;
         }
@@ -157,8 +138,7 @@ final class FieldWriter extends FieldVisitor {
     }
 
     @Override
-    public void visitEnd() {
-    }
+    public void visitEnd() {}
 
     // ------------------------------------------------------------------------
     // Utility methods
@@ -207,8 +187,7 @@ final class FieldWriter extends FieldVisitor {
     /**
      * Puts the content of this field into the given byte vector.
      * 
-     * @param out
-     *            where the content of this field must be put.
+     * @param out where the content of this field must be put.
      */
     void put(final ByteVector out) {
         final int FACTOR = ClassWriter.TO_ACC_SYNTHETIC;
diff --git a/src/main/asm/org/objectweb/asm/Frame.java b/src/main/asm/org/objectweb/asm/Frame.java
index 10e15bc..07e7644 100644
--- a/src/main/asm/org/objectweb/asm/Frame.java
+++ b/src/main/asm/org/objectweb/asm/Frame.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -37,61 +29,51 @@ package org.objectweb.asm;
 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.
+     * 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.
+     * 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.
+     * 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
+     * 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).
+     * 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).
+     * 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.
+     * Mask to get the dimension of a frame type. This dimension is a signed integer between -8 and
+     * 7.
      */
     static final int DIM = 0xF0000000;
 
@@ -115,11 +97,10 @@ final class Frame {
     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.
+     * 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;
 
@@ -144,28 +125,27 @@ final class 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.
+     * 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).
+     * 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.
+     * 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.
+     * 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;
 
@@ -225,9 +205,9 @@ final class Frame {
     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.
+     * 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;
 
@@ -461,8 +441,7 @@ final class Frame {
     }
 
     /**
-     * The label (i.e. basic block) to which these input and output stack map
-     * frames correspond.
+     * The label (i.e. basic block) to which these input and output stack map frames correspond.
      */
     Label owner;
 
@@ -487,14 +466,14 @@ final class Frame {
     private int[] outputStack;
 
     /**
-     * Relative size of the output stack. The exact semantics of this field
-     * depends on the algorithm that is used.
+     * 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 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}.
+     * When the stack map frames are completely computed, this field is the actual number of types
+     * in {@link #outputStack}.
      */
     private int outputStackTop;
 
@@ -506,25 +485,22 @@ final class Frame {
     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).
+     * 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.
+     * @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) {
@@ -546,10 +522,8 @@ final class Frame {
     /**
      * 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.
+     * @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
@@ -569,8 +543,7 @@ final class Frame {
     /**
      * Pushes a new type onto the output frame stack.
      * 
-     * @param type
-     *            the type that must be pushed.
+     * @param type the type that must be pushed.
      */
     private void push(final int type) {
         // creates and/or resizes the output stack array if necessary
@@ -595,12 +568,9 @@ final class Frame {
     /**
      * 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).
+     * @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);
@@ -615,74 +585,72 @@ final class Frame {
     /**
      * Returns the int encoding of the given type.
      * 
-     * @param cw
-     *            the ClassWriter to which this label belongs.
-     * @param desc
-     *            a type descriptor.
+     * @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 'V':
+                return 0;
             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;
+                return INTEGER;
             case 'F':
-                data = FLOAT;
-                break;
+                return FLOAT;
             case 'J':
-                data = LONG;
-                break;
+                return LONG;
             case 'D':
-                data = DOUBLE;
-                break;
-            // case 'L':
+                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:
-                // 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;
+                // 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;
         }
     }
 
@@ -703,8 +671,7 @@ final class Frame {
     /**
      * Pops the given number of types from the output frame stack.
      * 
-     * @param elements
-     *            the number of types that must be popped.
+     * @param elements the number of types that must be popped.
      */
     private void pop(final int elements) {
         if (outputStackTop >= elements) {
@@ -721,10 +688,8 @@ final class Frame {
     /**
      * 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).
+     * @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);
@@ -738,11 +703,9 @@ final class Frame {
     }
 
     /**
-     * Adds a new type to the list of types on which a constructor is invoked in
-     * the basic block.
+     * 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.
+     * @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
@@ -760,15 +723,13 @@ final class Frame {
     }
 
     /**
-     * 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.
+     * 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.
+     * @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;
@@ -797,20 +758,15 @@ final class Frame {
     }
 
     /**
-     * Initializes the input frame of the first basic block from the method
-     * descriptor.
+     * 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.
+     * @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) {
+    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;
@@ -836,452 +792,442 @@ final class Frame {
     /**
      * 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.
+     * @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) {
+    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:
+            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 ClassWriter.LONG:
+            case Opcodes.LCONST_0:
+            case Opcodes.LCONST_1:
+            case Opcodes.LLOAD:
                 push(LONG);
                 push(TOP);
                 break;
-            case ClassWriter.FLOAT:
+            case Opcodes.FCONST_0:
+            case Opcodes.FCONST_1:
+            case Opcodes.FCONST_2:
+            case Opcodes.FLOAD:
                 push(FLOAT);
                 break;
-            case ClassWriter.DOUBLE:
+            case Opcodes.DCONST_0:
+            case Opcodes.DCONST_1:
+            case Opcodes.DLOAD:
                 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);
+            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.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) {
+                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();
-                if (opcode == Opcodes.INVOKESPECIAL
-                        && item.strVal2.charAt(0) == '<') {
-                    init(t1);
+                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);
+                    }
                 }
-            }
-            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);
+            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.T_BYTE:
-                push(ARRAY_OF | BYTE);
+            case Opcodes.IASTORE:
+            case Opcodes.BASTORE:
+            case Opcodes.CASTORE:
+            case Opcodes.SASTORE:
+            case Opcodes.FASTORE:
+            case Opcodes.AASTORE:
+                pop(3);
                 break;
-            case Opcodes.T_SHORT:
-                push(ARRAY_OF | SHORT);
+            case Opcodes.LASTORE:
+            case Opcodes.DASTORE:
+                pop(4);
                 break;
-            case Opcodes.T_INT:
-                push(ARRAY_OF | INTEGER);
+            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.T_FLOAT:
-                push(ARRAY_OF | FLOAT);
+            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.T_DOUBLE:
-                push(ARRAY_OF | DOUBLE);
+            case Opcodes.DUP:
+                t1 = pop();
+                push(t1);
+                push(t1);
                 break;
-            // case Opcodes.T_LONG:
+            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:
-                push(ARRAY_OF | LONG);
+                pop(arg);
+                push(cw, item.strVal1);
                 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.
+     * 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.
+     * @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;
@@ -1310,8 +1256,7 @@ final class Frame {
                         } else {
                             t = dim + inputStack[nStack - (s & VALUE)];
                         }
-                        if ((s & TOP_IF_LONG_OR_DOUBLE) != 0
-                                && (t == LONG || t == DOUBLE)) {
+                        if ((s & TOP_IF_LONG_OR_DOUBLE) != 0 && (t == LONG || t == DOUBLE)) {
                             t = TOP;
                         }
                     }
@@ -1363,8 +1308,7 @@ final class Frame {
                 } else {
                     t = dim + inputStack[nStack - (s & VALUE)];
                 }
-                if ((s & TOP_IF_LONG_OR_DOUBLE) != 0
-                        && (t == LONG || t == DOUBLE)) {
+                if ((s & TOP_IF_LONG_OR_DOUBLE) != 0 && (t == LONG || t == DOUBLE)) {
                     t = TOP;
                 }
             }
@@ -1377,23 +1321,16 @@ final class Frame {
     }
 
     /**
-     * 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.
+     * 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.
+     * @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) {
+    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
@@ -1421,8 +1358,7 @@ final class Frame {
                     // 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);
+                    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
diff --git a/src/main/asm/org/objectweb/asm/Handle.java b/src/main/asm/org/objectweb/asm/Handle.java
index a627911..9cca494 100644
--- a/src/main/asm/org/objectweb/asm/Handle.java
+++ b/src/main/asm/org/objectweb/asm/Handle.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
@@ -39,9 +31,8 @@ package org.objectweb.asm;
 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},
+     * 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}.
@@ -49,8 +40,7 @@ public final class Handle {
     final int tag;
 
     /**
-     * The internal name of the class that owns the field or method designated
-     * by this handle.
+     * The internal name of the class that owns the field or method designated by this handle.
      */
     final String owner;
 
@@ -67,23 +57,15 @@ public final class Handle {
     /**
      * 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.
+     * @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;
@@ -95,23 +77,21 @@ public final class Handle {
     /**
      * 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}.
+     * @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.
+     * 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.
+     * @return the internal name of the class that owns the field or method designated by this
+     *         handle.
      */
     public String getOwner() {
         return owner;
@@ -144,8 +124,7 @@ public final class Handle {
             return false;
         }
         Handle h = (Handle) obj;
-        return tag == h.tag && owner.equals(h.owner) && name.equals(h.name)
-                && desc.equals(h.desc);
+        return tag == h.tag && owner.equals(h.owner) && name.equals(h.name) && desc.equals(h.desc);
     }
 
     @Override
@@ -154,8 +133,7 @@ public final class Handle {
     }
 
     /**
-     * Returns the textual representation of this handle. The textual
-     * representation is:
+     * Returns the textual representation of this handle. The textual representation is:
      * 
      * <pre>
      * owner '.' name desc ' ' '(' tag ')'
diff --git a/src/main/asm/org/objectweb/asm/Handler.java b/src/main/asm/org/objectweb/asm/Handler.java
index b24591d..ef818c8 100644
--- a/src/main/asm/org/objectweb/asm/Handler.java
+++ b/src/main/asm/org/objectweb/asm/Handler.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -52,14 +44,14 @@ class Handler {
     Label handler;
 
     /**
-     * Internal name of the type of exceptions handled by this handler, or
-     * <tt>null</tt> to catch any exceptions.
+     * 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.
+     * Constant pool index of the internal name of the type of exceptions handled by this handler,
+     * or 0 to catch any exceptions.
      */
     int type;
 
@@ -69,15 +61,11 @@ class Handler {
     Handler next;
 
     /**
-     * Removes the range between start and end from the given exception
-     * handlers.
+     * 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.
+     * @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) {
diff --git a/src/main/asm/org/objectweb/asm/Item.java b/src/main/asm/org/objectweb/asm/Item.java
index c25b7b7..b60f424 100644
--- a/src/main/asm/org/objectweb/asm/Item.java
+++ b/src/main/asm/org/objectweb/asm/Item.java
@@ -1,37 +1,29 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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.
+ * A constant pool item. Constant pool items can be created with the 'newXXX' methods in the
+ * {@link ClassWriter} class.
  * 
  * @author Eric Bruneton
  */
@@ -43,25 +35,21 @@ final class Item {
     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}.
+     * 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.
+     * 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#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;
@@ -77,20 +65,17 @@ final class Item {
     long longVal;
 
     /**
-     * First part of the value of this item, for items that do not hold a
-     * primitive value.
+     * 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.
+     * 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.
+     * Third part of the value of this item, for items that do not hold a primitive value.
      */
     String strVal3;
 
@@ -100,23 +85,20 @@ final class Item {
     int hashCode;
 
     /**
-     * Link to another constant pool item, used for collision lists in the
-     * constant pool's hash table.
+     * 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() {
-    }
+    Item() {}
 
     /**
-     * Constructs an uninitialized {@link Item} for constant pool element at
-     * given position.
+     * Constructs an uninitialized {@link Item} for constant pool element at given position.
      * 
-     * @param index
-     *            index of the item to be constructed.
+     * @param index index of the item to be constructed.
      */
     Item(final int index) {
         this.index = index;
@@ -125,10 +107,8 @@ final class Item {
     /**
      * 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.
+     * @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;
@@ -144,8 +124,7 @@ final class Item {
     /**
      * Sets this item to an integer item.
      * 
-     * @param intVal
-     *            the value of this item.
+     * @param intVal the value of this item.
      */
     void set(final int intVal) {
         this.type = ClassWriter.INT;
@@ -156,8 +135,7 @@ final class Item {
     /**
      * Sets this item to a long item.
      * 
-     * @param longVal
-     *            the value of this item.
+     * @param longVal the value of this item.
      */
     void set(final long longVal) {
         this.type = ClassWriter.LONG;
@@ -168,8 +146,7 @@ final class Item {
     /**
      * Sets this item to a float item.
      * 
-     * @param floatVal
-     *            the value of this item.
+     * @param floatVal the value of this item.
      */
     void set(final float floatVal) {
         this.type = ClassWriter.FLOAT;
@@ -180,8 +157,7 @@ final class Item {
     /**
      * Sets this item to a double item.
      * 
-     * @param doubleVal
-     *            the value of this item.
+     * @param doubleVal the value of this item.
      */
     void set(final double doubleVal) {
         this.type = ClassWriter.DOUBLE;
@@ -192,72 +168,60 @@ final class Item {
     /**
      * 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.
+     * @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) {
+    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());
+            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.
+     * @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());
+        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.
+     * @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;
@@ -266,45 +230,42 @@ final class Item {
     }
 
     /**
-     * Indicates if the given item is equal to this one. <i>This method assumes
-     * that the two items have the same {@link #type}</i>.
+     * 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.
+     * @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);
+            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
index 1c4de30..d993c3f 100644
--- a/src/main/asm/org/objectweb/asm/Label.java
+++ b/src/main/asm/org/objectweb/asm/Label.java
@@ -1,50 +1,40 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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.).
+ * 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).
+     * 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;
 
@@ -59,14 +49,14 @@ public class Label {
     static final int RESIZED = 4;
 
     /**
-     * Indicates if this basic block has been pushed in the basic block stack.
-     * See {@link MethodWriter#visitMaxs visitMaxs}.
+     * 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.
+     * Indicates if this label is the target of a jump instruction, or the start of an exception
+     * handler.
      */
     static final int TARGET = 16;
 
@@ -96,21 +86,20 @@ public class Label {
     static final int SUBROUTINE = 512;
 
     /**
-     * Indicates if this subroutine basic block has been visited by a
-     * visitSubroutine(null, ...) call.
+     * 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.
+     * 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
+     * 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;
@@ -146,100 +135,89 @@ public class Label {
     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.
+     * 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.
+     * 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 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.
+     * 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.
+     * 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 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.
+     * 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.
+     * 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.
+     * 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).
+     * 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.
+     * 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.
+     * 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
      */
@@ -252,49 +230,39 @@ public class Label {
     /**
      * Constructs a new label.
      */
-    public 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>
+     * 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.
+     * @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");
+            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.
+     * 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.
+     * @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) {
@@ -316,27 +284,22 @@ public class Label {
     }
 
     /**
-     * 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.
+     * 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.
+     * @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) {
+    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);
+            System.arraycopy(srcAndRefPositions, 0, a, 0, srcAndRefPositions.length);
             srcAndRefPositions = a;
         }
         srcAndRefPositions[referenceCount++] = sourcePosition;
@@ -344,30 +307,23 @@ public class Label {
     }
 
     /**
-     * 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.
+     * 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.
+     * @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 resolve(final MethodWriter owner, final int position, final byte[] data) {
         boolean needUpdate = false;
         this.status |= RESOLVED;
         this.position = position;
@@ -380,13 +336,11 @@ public class Label {
                 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).
+                     * 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) {
@@ -412,10 +366,9 @@ public class Label {
     }
 
     /**
-     * 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.
+     * 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.
      */
@@ -430,8 +383,7 @@ public class Label {
     /**
      * Returns true is this basic block belongs to the given subroutine.
      * 
-     * @param id
-     *            a subroutine id.
+     * @param id a subroutine id.
      * @return true is this basic block belongs to the given subroutine.
      */
     boolean inSubroutine(final long id) {
@@ -442,13 +394,10 @@ public class Label {
     }
 
     /**
-     * Returns true if this basic block and the given one belong to a common
-     * subroutine.
+     * 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.
+     * @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) {
@@ -465,10 +414,8 @@ public class Label {
     /**
      * 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.
+     * @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) {
@@ -479,19 +426,14 @@ public class Label {
     }
 
     /**
-     * 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.
+     * 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.
+     * @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
diff --git a/src/main/asm/org/objectweb/asm/MethodVisitor.java b/src/main/asm/org/objectweb/asm/MethodVisitor.java
index bd26721..98abeb1 100644
--- a/src/main/asm/org/objectweb/asm/MethodVisitor.java
+++ b/src/main/asm/org/objectweb/asm/MethodVisitor.java
@@ -1,71 +1,58 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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.
+ * 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}.
+     * 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.
+     * 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}.
+     * @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);
@@ -74,12 +61,9 @@ public abstract class MethodVisitor {
     /**
      * 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.
+     * @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) {
@@ -96,12 +80,11 @@ public abstract class MethodVisitor {
     /**
      * 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.
+     * @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) {
@@ -113,12 +96,10 @@ public abstract class MethodVisitor {
     /**
      * 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.
+     * @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) {
@@ -130,17 +111,13 @@ public abstract class MethodVisitor {
     /**
      * 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.
+     * @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) {
+    public AnnotationVisitor visitParameterAnnotation(int parameter, String desc, boolean visible) {
         if (mv != null) {
             return mv.visitParameterAnnotation(parameter, desc, visible);
         }
@@ -150,8 +127,7 @@ public abstract class MethodVisitor {
     /**
      * Visits a non standard attribute of this method.
      * 
-     * @param attr
-     *            an attribute.
+     * @param attr an attribute.
      */
     public void visitAttribute(Attribute attr) {
         if (mv != null) {
@@ -169,80 +145,63 @@ public abstract class MethodVisitor {
     }
 
     /**
-     * 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>
+     * 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>
+     * (*) 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):
+     * 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:
+     * <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_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).
+     * </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).
+     * @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) {
+    public void visitFrame(int type, int nLocal, Object[] local, int nStack, Object[] stack) {
         if (mv != null) {
             mv.visitFrame(type, nLocal, local, nStack, stack);
         }
@@ -255,22 +214,17 @@ public abstract class MethodVisitor {
     /**
      * 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.
+     * @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) {
@@ -281,20 +235,17 @@ public abstract class MethodVisitor {
     /**
      * 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}.
+     * @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) {
@@ -303,16 +254,14 @@ public abstract class MethodVisitor {
     }
 
     /**
-     * Visits a local variable instruction. A local variable instruction is an
-     * instruction that loads or stores the value of a local variable.
+     * 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.
+     * @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) {
@@ -321,16 +270,13 @@ public abstract class MethodVisitor {
     }
 
     /**
-     * Visits a type instruction. A type instruction is an instruction that
-     * takes the internal name of a class as parameter.
+     * 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}).
+     * @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) {
@@ -339,45 +285,33 @@ public abstract class MethodVisitor {
     }
 
     /**
-     * Visits a field instruction. A field instruction is an instruction that
-     * loads or stores the value of a field of an object.
+     * 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}).
+     * @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) {
+    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.
+     * 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}).
+     * @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) {
+    public void visitMethodInsn(int opcode, String owner, String name, String desc) {
         if (mv != null) {
             mv.visitMethodInsn(opcode, owner, name, desc);
         }
@@ -386,39 +320,29 @@ public abstract class MethodVisitor {
     /**
      * 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.
+     * @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) {
+    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.
+     * 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.
+     * @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) {
@@ -427,11 +351,9 @@ public abstract class MethodVisitor {
     }
 
     /**
-     * Visits a label. A label designates the instruction that will be visited
-     * just after it.
+     * Visits a label. A label designates the instruction that will be visited just after it.
      * 
-     * @param label
-     *            a {@link Label Label} object.
+     * @param label a {@link Label Label} object.
      */
     public void visitLabel(Label label) {
         if (mv != null) {
@@ -444,10 +366,9 @@ public abstract class MethodVisitor {
     // -------------------------------------------------------------------------
 
     /**
-     * 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:
+     * 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) {
@@ -478,14 +399,11 @@ public abstract class MethodVisitor {
      * }
      * </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.
+     * @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) {
@@ -496,10 +414,8 @@ public abstract class MethodVisitor {
     /**
      * Visits an IINC instruction.
      * 
-     * @param var
-     *            index of the local variable to be incremented.
-     * @param increment
-     *            amount to increment the local variable by.
+     * @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) {
@@ -510,18 +426,13 @@ public abstract class MethodVisitor {
     /**
      * 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.
+     * @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) {
+    public void visitTableSwitchInsn(int min, int max, Label dflt, Label... labels) {
         if (mv != null) {
             mv.visitTableSwitchInsn(min, max, dflt, labels);
         }
@@ -530,13 +441,10 @@ public abstract class MethodVisitor {
     /**
      * 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.
+     * @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) {
@@ -547,10 +455,8 @@ public abstract class MethodVisitor {
     /**
      * Visits a MULTIANEWARRAY instruction.
      * 
-     * @param desc
-     *            an array type descriptor (see {@link Type Type}).
-     * @param dims
-     *            number of dimensions of the array to allocate.
+     * @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) {
@@ -565,22 +471,15 @@ public abstract class MethodVisitor {
     /**
      * 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).
+     * @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) {
+    public void visitTryCatchBlock(Label start, Label end, Label handler, String type) {
         if (mv != null) {
             mv.visitTryCatchBlock(start, end, handler, type);
         }
@@ -589,28 +488,20 @@ public abstract class MethodVisitor {
     /**
      * 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).
+     * @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) {
+    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);
         }
@@ -619,14 +510,11 @@ public abstract class MethodVisitor {
     /**
      * 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).
+     * @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) {
@@ -635,13 +523,10 @@ public abstract class MethodVisitor {
     }
 
     /**
-     * Visits the maximum stack size and the maximum number of local variables
-     * of the method.
+     * 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.
+     * @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) {
@@ -650,9 +535,8 @@ public abstract class MethodVisitor {
     }
 
     /**
-     * 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.
+     * 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) {
diff --git a/src/main/asm/org/objectweb/asm/MethodWriter.java b/src/main/asm/org/objectweb/asm/MethodWriter.java
index ff03f19..9e23b72 100644
--- a/src/main/asm/org/objectweb/asm/MethodWriter.java
+++ b/src/main/asm/org/objectweb/asm/MethodWriter.java
@@ -1,38 +1,30 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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.
+ * 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
@@ -43,16 +35,16 @@ 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.
+     * 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
+     * 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)
 
@@ -62,28 +54,26 @@ class MethodWriter extends MethodVisitor {
     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;
+     * 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.
+     * 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;
+     * 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.
+     * 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
 
@@ -93,17 +83,16 @@ class MethodWriter extends MethodVisitor {
     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.
+     * 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.
+     * Indicates that the maximum stack size and number of local variables must be automatically
+     * computed.
      * 
      * @see #compute
      */
@@ -127,14 +116,12 @@ class MethodWriter extends MethodVisitor {
     private int access;
 
     /**
-     * The index of the constant pool item that contains the name of this
-     * method.
+     * 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.
+     * The index of the constant pool item that contains the descriptor of this method.
      */
     private final int desc;
 
@@ -149,18 +136,16 @@ class MethodWriter extends MethodVisitor {
     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>.
+     * 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>.
+     * 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;
 
@@ -170,9 +155,9 @@ class MethodWriter extends MethodVisitor {
     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.
+     * 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;
 
@@ -192,14 +177,12 @@ class MethodWriter extends MethodVisitor {
     private AnnotationWriter ianns;
 
     /**
-     * The runtime visible parameter annotations of this method. May be
-     * <tt>null</tt>.
+     * 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>.
+     * The runtime invisible parameter annotations of this method. May be <tt>null</tt>.
      */
     private AnnotationWriter[] ipanns;
 
@@ -244,8 +227,7 @@ class MethodWriter extends MethodVisitor {
     private ByteVector stackMap;
 
     /**
-     * The offset of the last frame that was written in the StackMapTable
-     * attribute.
+     * The offset of the last frame that was written in the StackMapTable attribute.
      */
     private int previousFrameOffset;
 
@@ -257,13 +239,12 @@ class MethodWriter extends MethodVisitor {
     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.
+     * 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;
 
@@ -330,13 +311,11 @@ class MethodWriter extends MethodVisitor {
     // ------------------------------------------------------------------------
 
     /*
-     * 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.
+     * 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.
      */
 
     /**
@@ -349,11 +328,9 @@ class MethodWriter extends MethodVisitor {
     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.
+     * 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;
 
@@ -368,20 +345,18 @@ class MethodWriter extends MethodVisitor {
     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>.
+     * 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>.
+     * 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;
 
@@ -392,29 +367,18 @@ class MethodWriter extends MethodVisitor {
     /**
      * 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.
+     * @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,
+    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) {
@@ -471,8 +435,7 @@ class MethodWriter extends MethodVisitor {
     }
 
     @Override
-    public AnnotationVisitor visitAnnotation(final String desc,
-            final boolean visible) {
+    public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
         if (!ClassReader.ANNOTATIONS) {
             return null;
         }
@@ -491,8 +454,8 @@ class MethodWriter extends MethodVisitor {
     }
 
     @Override
-    public AnnotationVisitor visitParameterAnnotation(final int parameter,
-            final String desc, final boolean visible) {
+    public AnnotationVisitor visitParameterAnnotation(final int parameter, final String desc,
+            final boolean visible) {
         if (!ClassReader.ANNOTATIONS) {
             return null;
         }
@@ -534,12 +497,11 @@ class MethodWriter extends MethodVisitor {
     }
 
     @Override
-    public void visitCode() {
-    }
+    public void visitCode() {}
 
     @Override
-    public void visitFrame(final int type, final int nLocal,
-            final Object[] local, final int nStack, final Object[] stack) {
+    public void visitFrame(final int type, final int nLocal, final Object[] local, final int nStack,
+            final Object[] stack) {
         if (!ClassReader.FRAMES || compute == FRAMES) {
             return;
         }
@@ -552,26 +514,22 @@ class MethodWriter extends MethodVisitor {
             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]);
+                    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);
+                            | 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]);
+                    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);
+                            | cw.addUninitializedType("", ((Label) stack[i]).position);
                 }
             }
             endFrame();
@@ -592,44 +550,43 @@ class MethodWriter extends MethodVisitor {
             }
 
             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;
+                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;
@@ -716,8 +673,8 @@ class MethodWriter extends MethodVisitor {
         if (compute != NOTHING) {
             // updates max locals
             int n;
-            if (opcode == Opcodes.LLOAD || opcode == Opcodes.DLOAD
-                    || opcode == Opcodes.LSTORE || opcode == Opcodes.DSTORE) {
+            if (opcode == Opcodes.LLOAD || opcode == Opcodes.DLOAD || opcode == Opcodes.LSTORE
+                    || opcode == Opcodes.DSTORE) {
                 n = var + 2;
             } else {
                 n = var + 1;
@@ -769,8 +726,8 @@ class MethodWriter extends MethodVisitor {
     }
 
     @Override
-    public void visitFieldInsn(final int opcode, final String owner,
-            final String name, final String desc) {
+    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) {
@@ -781,19 +738,19 @@ class MethodWriter extends MethodVisitor {
                 // 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;
+                    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) {
@@ -807,8 +764,8 @@ class MethodWriter extends MethodVisitor {
     }
 
     @Override
-    public void visitMethodInsn(final int opcode, final String owner,
-            final String name, final String desc) {
+    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;
@@ -818,12 +775,10 @@ class MethodWriter extends MethodVisitor {
                 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.
+                 * 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,
@@ -859,8 +814,8 @@ class MethodWriter extends MethodVisitor {
     }
 
     @Override
-    public void visitInvokeDynamicInsn(final String name, final String desc,
-            final Handle bsm, final Object... bsmArgs) {
+    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;
@@ -869,12 +824,10 @@ class MethodWriter extends MethodVisitor {
                 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.
+                 * 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,
@@ -924,10 +877,9 @@ class MethodWriter extends MethodVisitor {
                     // 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.
+                     * 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
@@ -942,10 +894,9 @@ class MethodWriter extends MethodVisitor {
         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'>
+             * 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) {
@@ -958,18 +909,16 @@ class MethodWriter extends MethodVisitor {
                 if (nextInsn != null) {
                     nextInsn.status |= Label.TARGET;
                 }
-                code.putByte(opcode <= 166 ? ((opcode + 1) ^ 1) - 1
-                        : opcode ^ 1);
+                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).
+             * 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);
@@ -1092,16 +1041,15 @@ class MethodWriter extends MethodVisitor {
         }
         // 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);
+            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) {
+    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);
@@ -1116,8 +1064,7 @@ class MethodWriter extends MethodVisitor {
     }
 
     @Override
-    public void visitLookupSwitchInsn(final Label dflt, final int[] keys,
-            final Label[] labels) {
+    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);
@@ -1176,8 +1123,8 @@ class MethodWriter extends MethodVisitor {
     }
 
     @Override
-    public void visitTryCatchBlock(final Label start, final Label end,
-            final Label handler, final String type) {
+    public void visitTryCatchBlock(final Label start, final Label end, final Label handler,
+            final String type) {
         ++handlerCount;
         Handler h = new Handler();
         h.start = start;
@@ -1194,27 +1141,22 @@ class MethodWriter extends MethodVisitor {
     }
 
     @Override
-    public void visitLocalVariable(final String name, final String desc,
-            final String signature, final Label start, final Label end,
-            final int index) {
+    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);
+            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);
+        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);
@@ -1245,8 +1187,7 @@ class MethodWriter extends MethodVisitor {
                 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;
+                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;
@@ -1272,10 +1213,9 @@ class MethodWriter extends MethodVisitor {
             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).
+             * 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;
@@ -1333,8 +1273,7 @@ class MethodWriter extends MethodVisitor {
                         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");
+                        frame[frameIndex] = Frame.OBJECT | cw.addType("java/lang/Throwable");
                         endFrame();
                         // removes the start-end range from the exception
                         // handlers
@@ -1385,8 +1324,8 @@ class MethodWriter extends MethodVisitor {
             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.
+                 * 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;
@@ -1401,8 +1340,8 @@ class MethodWriter extends MethodVisitor {
                         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);
+                            subroutine.visitSubroutine(null, (id / 32L) << 32 | (1L << (id % 32)),
+                                    subroutines);
                         }
                     }
                     l = l.successor;
@@ -1425,14 +1364,12 @@ class MethodWriter extends MethodVisitor {
             }
 
             /*
-             * 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.
+             * 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;
@@ -1458,8 +1395,7 @@ class MethodWriter extends MethodVisitor {
                     // 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;
+                        l.inputStackTop = b.info == Edge.EXCEPTION ? 1 : start + b.info;
                         // ...and pushes it onto the stack
                         l.status |= Label.PUSHED;
                         l.next = stack;
@@ -1476,8 +1412,7 @@ class MethodWriter extends MethodVisitor {
     }
 
     @Override
-    public void visitEnd() {
-    }
+    public void visitEnd() {}
 
     // ------------------------------------------------------------------------
     // Utility methods: control flow analysis algorithm
@@ -1486,10 +1421,8 @@ class MethodWriter extends MethodVisitor {
     /**
      * 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.
+     * @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...
@@ -1502,8 +1435,8 @@ class MethodWriter extends MethodVisitor {
     }
 
     /**
-     * Ends the current basic block. This method must be used in the case where
-     * the current basic block does not have any successor.
+     * 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) {
@@ -1526,8 +1459,7 @@ class MethodWriter extends MethodVisitor {
     /**
      * Visits a frame that has been computed from scratch.
      * 
-     * @param f
-     *            the frame that must be visited.
+     * @param f the frame that must be visited.
      */
     private void visitFrame(final Frame f) {
         int i, t;
@@ -1595,44 +1527,43 @@ class MethodWriter extends MethodVisitor {
         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;
+                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, ++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[frameIndex++] =
+                            Frame.OBJECT | cw.addType(descriptor.substring(j + 1, i++));
+                    break;
+                default:
+                    break loop;
             }
         }
         frame[1] = frameIndex - 3;
@@ -1642,12 +1573,9 @@ class MethodWriter extends MethodVisitor {
     /**
      * 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.
+     * @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) {
@@ -1662,8 +1590,8 @@ class MethodWriter extends MethodVisitor {
     }
 
     /**
-     * Checks if the visit of the current frame {@link #frame} is finished, and
-     * if yes, write it in the StackMapTable attribute.
+     * 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
@@ -1678,8 +1606,7 @@ class MethodWriter extends MethodVisitor {
     }
 
     /**
-     * Compress and writes the current frame {@link #frame} in the StackMapTable
-     * attribute.
+     * Compress and writes the current frame {@link #frame} in the StackMapTable attribute.
      */
     private void writeFrame() {
         int clocalsSize = frame[1];
@@ -1703,20 +1630,20 @@ class MethodWriter extends MethodVisitor {
         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;
+                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
@@ -1734,47 +1661,44 @@ class MethodWriter extends MethodVisitor {
             }
         }
         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);
+            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.
+     * 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).
+     * @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) {
@@ -1783,15 +1707,14 @@ class MethodWriter extends MethodVisitor {
             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);
+                    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();
@@ -1805,29 +1728,29 @@ class MethodWriter extends MethodVisitor {
                     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');
+                        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()));
@@ -1891,8 +1814,7 @@ class MethodWriter extends MethodVisitor {
                 size += 8 + stackMap.length;
             }
             if (cattrs != null) {
-                size += cattrs.getSize(cw, code.data, code.length, maxStack,
-                        maxLocals);
+                size += cattrs.getSize(cw, code.data, code.length, maxStack, maxLocals);
             }
         }
         if (exceptionCount > 0) {
@@ -1950,14 +1872,11 @@ class MethodWriter extends MethodVisitor {
     /**
      * 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.
+     * @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
+        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) {
@@ -2017,8 +1936,7 @@ class MethodWriter extends MethodVisitor {
                 size += 8 + stackMap.length;
             }
             if (cattrs != null) {
-                size += cattrs.getSize(cw, code.data, code.length, maxStack,
-                        maxLocals);
+                size += cattrs.getSize(cw, code.data, code.length, maxStack, maxLocals);
             }
             out.putShort(cw.newUTF8("Code")).putInt(size);
             out.putShort(maxStack).putShort(maxLocals);
@@ -2075,8 +1993,7 @@ class MethodWriter extends MethodVisitor {
             }
         }
         if (exceptionCount > 0) {
-            out.putShort(cw.newUTF8("Exceptions")).putInt(
-                    2 * exceptionCount + 2);
+            out.putShort(cw.newUTF8("Exceptions")).putInt(2 * exceptionCount + 2);
             out.putShort(exceptionCount);
             for (int i = 0; i < exceptionCount; ++i) {
                 out.putShort(exceptions[i]);
@@ -2092,8 +2009,7 @@ class MethodWriter extends MethodVisitor {
             out.putShort(cw.newUTF8("Deprecated")).putInt(0);
         }
         if (ClassReader.SIGNATURES && signature != null) {
-            out.putShort(cw.newUTF8("Signature")).putInt(2)
-                    .putShort(cw.newUTF8(signature));
+            out.putShort(cw.newUTF8("Signature")).putInt(2).putShort(cw.newUTF8(signature));
         }
         if (ClassReader.ANNOTATIONS && annd != null) {
             out.putShort(cw.newUTF8("AnnotationDefault"));
@@ -2126,50 +2042,44 @@ class MethodWriter extends MethodVisitor {
     // ------------------------------------------------------------------------
 
     /**
-     * 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.
+     * 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.
+     * <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:
+         * 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!).
+         * 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.
+         * 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).
+         * 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
@@ -2190,118 +2100,116 @@ class MethodWriter extends MethodVisitor {
                 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;
+                    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;
                         }
-                    }
-                    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 {
+                        // 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;
-                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;
+                        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(allIndexes, 0, newIndexes, 0, allIndexes.length);
                     System.arraycopy(allSizes, 0, newSizes, 0, allSizes.length);
                     newIndexes[allIndexes.length] = u;
                     newSizes[allSizes.length] = insert;
@@ -2327,135 +2235,134 @@ class MethodWriter extends MethodVisitor {
         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 {
+                case ClassWriter.NOARG_INSN:
+                case ClassWriter.IMPLVAR_INSN:
                     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) {
+                    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);
-                }
-                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));
+                    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);
-                }
-                break;
-            case ClassWriter.WIDE_INSN:
-                opcode = b[u + 1] & 0xFF;
-                if (opcode == Opcodes.IINC) {
-                    newCode.putByteArray(b, u, 6);
-                    u += 6;
-                } else {
+                    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;
-            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;
+                    break;
             }
         }
 
@@ -2474,8 +2381,8 @@ class MethodWriter extends MethodVisitor {
                 Label l = labels;
                 while (l != null) {
                     /*
-                     * here we need the original label position. getNewOffset
-                     * must therefore never have been called for this label.
+                     * 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])) {
@@ -2487,18 +2394,15 @@ class MethodWriter extends MethodVisitor {
                 }
             } 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.
+                 * 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;
             }
@@ -2523,8 +2427,7 @@ class MethodWriter extends MethodVisitor {
                     newOffset = getNewOffset(allIndexes, allSizes, 0, label);
                     writeShort(b, u, newOffset);
                     label += readUnsignedShort(b, u + 2);
-                    newOffset = getNewOffset(allIndexes, allSizes, 0, label)
-                            - newOffset;
+                    newOffset = getNewOffset(allIndexes, allSizes, 0, label) - newOffset;
                     writeShort(b, u + 2, newOffset);
                     u += 10;
                 }
@@ -2534,11 +2437,7 @@ class MethodWriter extends MethodVisitor {
             b = lineNumber.data;
             u = 0;
             while (u < lineNumber.length) {
-                writeShort(
-                        b,
-                        u,
-                        getNewOffset(allIndexes, allSizes, 0,
-                                readUnsignedShort(b, u)));
+                writeShort(b, u, getNewOffset(allIndexes, allSizes, 0, readUnsignedShort(b, u)));
                 u += 4;
             }
         }
@@ -2561,10 +2460,8 @@ class MethodWriter extends MethodVisitor {
     /**
      * 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.
+     * @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) {
@@ -2574,10 +2471,8 @@ class MethodWriter extends MethodVisitor {
     /**
      * 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.
+     * @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) {
@@ -2587,10 +2482,8 @@ class MethodWriter extends MethodVisitor {
     /**
      * 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.
+     * @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) {
@@ -2601,12 +2494,9 @@ class MethodWriter extends MethodVisitor {
     /**
      * 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.
+     * @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);
@@ -2616,32 +2506,24 @@ class MethodWriter extends MethodVisitor {
     /**
      * 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').
+     * 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.
+     * @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) {
+    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) {
@@ -2658,25 +2540,17 @@ class MethodWriter extends MethodVisitor {
     /**
      * 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.
+     * @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) {
+    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
index f9b6af1..dd7adf0 100644
--- a/src/main/asm/org/objectweb/asm/Opcodes.java
+++ b/src/main/asm/org/objectweb/asm/Opcodes.java
@@ -1,42 +1,32 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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.
+ * 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
@@ -120,28 +110,26 @@ public interface Opcodes {
     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.
+     * 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.
+     * 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.
+     * 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.
+     * 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;
 
diff --git a/src/main/asm/org/objectweb/asm/Type.java b/src/main/asm/org/objectweb/asm/Type.java
index be69a2c..11e08b9 100644
--- a/src/main/asm/org/objectweb/asm/Type.java
+++ b/src/main/asm/org/objectweb/asm/Type.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -33,8 +25,8 @@ 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.
+ * 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
@@ -104,56 +96,56 @@ public class Type {
     /**
      * The <tt>void</tt> type.
      */
-    public static final Type VOID_TYPE = new Type(VOID, null, ('V' << 24)
-            | (5 << 16) | (0 << 8) | 0, 1);
+    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);
+    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);
+    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);
+    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);
+    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);
+    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);
+    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);
+    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);
+    public static final Type DOUBLE_TYPE =
+            new Type(DOUBLE, null, ('D' << 24) | (3 << 16) | (3 << 8) | 2, 1);
 
     // ------------------------------------------------------------------------
     // Fields
@@ -165,16 +157,16 @@ public class Type {
     private final int sort;
 
     /**
-     * A buffer containing the internal name of this Java type. This field is
-     * only used for reference types.
+     * 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).
+     * 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;
 
@@ -190,14 +182,10 @@ public class Type {
     /**
      * 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.
+     * @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;
@@ -209,8 +197,7 @@ public class Type {
     /**
      * Returns the Java type corresponding to the given type descriptor.
      * 
-     * @param typeDescriptor
-     *            a field or method 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) {
@@ -220,8 +207,7 @@ public class Type {
     /**
      * Returns the Java type corresponding to the given internal name.
      * 
-     * @param internalName
-     *            an internal name.
+     * @param internalName an internal name.
      * @return the Java type corresponding to the given internal name.
      */
     public static Type getObjectType(final String internalName) {
@@ -230,11 +216,10 @@ public class Type {
     }
 
     /**
-     * Returns the Java type corresponding to the given method descriptor.
-     * Equivalent to <code>Type.getType(methodDescriptor)</code>.
+     * Returns the Java type corresponding to the given method descriptor. Equivalent to
+     * <code>Type.getType(methodDescriptor)</code>.
      * 
-     * @param methodDescriptor
-     *            a method descriptor.
+     * @param methodDescriptor a method descriptor.
      * @return the Java type corresponding to the given method descriptor.
      */
     public static Type getMethodType(final String methodDescriptor) {
@@ -242,26 +227,20 @@ public class Type {
     }
 
     /**
-     * Returns the Java method type corresponding to the given argument and
-     * return types.
+     * 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.
+     * @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) {
+    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.
+     * @param c a class.
      * @return the Java type corresponding to the given class.
      */
     public static Type getType(final Class<?> c) {
@@ -282,7 +261,7 @@ public class Type {
                 return DOUBLE_TYPE;
             } else if (c == Float.TYPE) {
                 return FLOAT_TYPE;
-            } else /* if (c == Long.TYPE) */{
+            } else /* if (c == Long.TYPE) */ {
                 return LONG_TYPE;
             }
         } else {
@@ -293,8 +272,7 @@ public class Type {
     /**
      * Returns the Java method type corresponding to the given constructor.
      * 
-     * @param c
-     *            a {@link Constructor Constructor} object.
+     * @param c a {@link Constructor Constructor} object.
      * @return the Java method type corresponding to the given constructor.
      */
     public static Type getType(final Constructor<?> c) {
@@ -304,8 +282,7 @@ public class Type {
     /**
      * Returns the Java method type corresponding to the given method.
      * 
-     * @param m
-     *            a {@link Method Method} object.
+     * @param m a {@link Method Method} object.
      * @return the Java method type corresponding to the given method.
      */
     public static Type getType(final Method m) {
@@ -313,13 +290,10 @@ public class Type {
     }
 
     /**
-     * Returns the Java types corresponding to the argument types of the given
-     * method descriptor.
+     * 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.
+     * @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();
@@ -349,13 +323,10 @@ public class Type {
     }
 
     /**
-     * Returns the Java types corresponding to the argument types of the given
-     * method.
+     * 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.
+     * @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();
@@ -367,13 +338,10 @@ public class Type {
     }
 
     /**
-     * Returns the Java type corresponding to the return type of the given
-     * method descriptor.
+     * 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.
+     * @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();
@@ -381,13 +349,10 @@ public class Type {
     }
 
     /**
-     * Returns the Java type corresponding to the return type of the given
-     * method.
+     * 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.
+     * @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());
@@ -396,13 +361,11 @@ public class Type {
     /**
      * 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>).
+     * @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;
@@ -411,8 +374,7 @@ public class Type {
             char car = desc.charAt(c++);
             if (car == ')') {
                 car = desc.charAt(c);
-                return n << 2
-                        | (car == 'V' ? 0 : (car == 'D' || car == 'J' ? 2 : 1));
+                return n << 2 | (car == 'V' ? 0 : (car == 'D' || car == 'J' ? 2 : 1));
             } else if (car == 'L') {
                 while (desc.charAt(c++) != ';') {
                 }
@@ -433,58 +395,55 @@ public class Type {
     }
 
     /**
-     * Returns the Java type corresponding to the given type descriptor. For
-     * method descriptors, buf is supposed to contain nothing more than the
-     * descriptor itself.
+     * 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.
+     * @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;
+            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(ARRAY, buf, off, len + 1);
-        case 'L':
-            len = 1;
-            while (buf[off + len] != ';') {
-                ++len;
-            }
-            return new Type(OBJECT, buf, off + 1, len - 1);
+                return new Type(OBJECT, buf, off + 1, len - 1);
             // case '(':
-        default:
-            return new Type(METHOD, buf, off, buf.length - off);
+            default:
+                return new Type(METHOD, buf, off, buf.length - off);
         }
     }
 
@@ -495,19 +454,18 @@ public class Type {
     /**
      * 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}.
+     * @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.
+     * 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.
      */
@@ -520,8 +478,8 @@ public class Type {
     }
 
     /**
-     * Returns the type of the elements of this array type. This method should
-     * only be used for an array type.
+     * 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.
      */
@@ -530,49 +488,48 @@ public class Type {
     }
 
     /**
-     * Returns the binary name of the class corresponding to this type. This
-     * method must not be used on method types.
+     * 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;
+            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.
+     * 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.
      */
@@ -581,8 +538,8 @@ public class Type {
     }
 
     /**
-     * Returns the argument types of methods of this type. This method should
-     * only be used for method types.
+     * 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.
      */
@@ -591,8 +548,8 @@ public class Type {
     }
 
     /**
-     * Returns the return type of methods of this type. This method should only
-     * be used for method types.
+     * 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.
      */
@@ -601,14 +558,13 @@ public class Type {
     }
 
     /**
-     * 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.
+     * 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>).
+     * @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());
@@ -630,18 +586,13 @@ public class Type {
     }
 
     /**
-     * Returns the descriptor corresponding to the given argument and return
-     * types.
+     * 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.
+     * @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) {
+    public static String getMethodDescriptor(final Type returnType, final Type... argumentTypes) {
         StringBuffer buf = new StringBuffer();
         buf.append('(');
         for (int i = 0; i < argumentTypes.length; ++i) {
@@ -653,11 +604,9 @@ public class Type {
     }
 
     /**
-     * Appends the descriptor corresponding to this Java type to the given
-     * string buffer.
+     * 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.
+     * @param buf the string buffer to which the descriptor must be appended.
      */
     private void getDescriptor(final StringBuffer buf) {
         if (this.buf == null) {
@@ -679,12 +628,10 @@ public class Type {
     // ------------------------------------------------------------------------
 
     /**
-     * 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 '/'.
+     * 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.
+     * @param c an object or array class.
      * @return the internal name of the given class.
      */
     public static String getInternalName(final Class<?> c) {
@@ -694,8 +641,7 @@ public class Type {
     /**
      * Returns the descriptor corresponding to the given Java type.
      * 
-     * @param c
-     *            an object class, a primitive class or an array class.
+     * @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) {
@@ -707,8 +653,7 @@ public class Type {
     /**
      * Returns the descriptor corresponding to the given constructor.
      * 
-     * @param c
-     *            a {@link Constructor Constructor} object.
+     * @param c a {@link Constructor Constructor} object.
      * @return the descriptor of the given constructor.
      */
     public static String getConstructorDescriptor(final Constructor<?> c) {
@@ -724,8 +669,7 @@ public class Type {
     /**
      * Returns the descriptor corresponding to the given method.
      * 
-     * @param m
-     *            a {@link Method Method} object.
+     * @param m a {@link Method Method} object.
      * @return the descriptor of the given method.
      */
     public static String getMethodDescriptor(final Method m) {
@@ -743,10 +687,8 @@ public class Type {
     /**
      * 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.
+     * @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;
@@ -769,7 +711,7 @@ public class Type {
                     car = 'D';
                 } else if (d == Float.TYPE) {
                     car = 'F';
-                } else /* if (d == Long.TYPE) */{
+                } else /* if (d == Long.TYPE) */ {
                     car = 'J';
                 }
                 buf.append(car);
@@ -796,11 +738,10 @@ public class Type {
     // ------------------------------------------------------------------------
 
     /**
-     * Returns the size of values of this type. This method must not be used for
-     * method types.
+     * 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.
+     * @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)
@@ -808,16 +749,15 @@ public class Type {
     }
 
     /**
-     * Returns a JVM instruction opcode adapted to this Java type. This method
-     * must not be used for method types.
+     * 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.
+     * @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) {
@@ -838,8 +778,7 @@ public class Type {
     /**
      * Tests if the given object is equal to this type.
      * 
-     * @param o
-     *            the object to be compared 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
diff --git a/src/main/asm/org/objectweb/asm/commons/AdviceAdapter.java b/src/main/asm/org/objectweb/asm/commons/AdviceAdapter.java
index c693215..c9c4c25 100644
--- a/src/main/asm/org/objectweb/asm/commons/AdviceAdapter.java
+++ b/src/main/asm/org/objectweb/asm/commons/AdviceAdapter.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -41,17 +33,17 @@ 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.
+ * 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>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>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>
  * 
@@ -81,20 +73,15 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
     /**
      * 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}).
+     * @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) {
+    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;
@@ -130,178 +117,178 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
         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;
+                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;
+                case RETURN:
+                case IRETURN:
+                case FRETURN:
+                case ARETURN:
+                case LRETURN:
+                case DRETURN:
+                case ATHROW:
+                    onMethodExit(opcode);
+                    break;
             }
         }
         mv.visitInsn(opcode);
@@ -312,64 +299,64 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
         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;
+                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) {
+    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) {
+                case GETSTATIC:
                     pushValue(OTHER);
-                }
-                break;
-            case PUTSTATIC:
-                popValue();
-                if (longOrDouble) {
+                    if (longOrDouble) {
+                        pushValue(OTHER);
+                    }
+                    break;
+                case PUTSTATIC:
                     popValue();
-                }
-                break;
-            case PUTFIELD:
-                popValue();
-                if (longOrDouble) {
+                    if (longOrDouble) {
+                        popValue();
+                    }
+                    break;
+                case PUTFIELD:
                     popValue();
-                    popValue();
-                }
-                break;
-            // case GETFIELD:
-            default:
-                if (longOrDouble) {
-                    pushValue(OTHER);
-                }
+                    if (longOrDouble) {
+                        popValue();
+                        popValue();
+                    }
+                    break;
+                // case GETFIELD:
+                default:
+                    if (longOrDouble) {
+                        pushValue(OTHER);
+                    }
             }
         }
     }
@@ -414,8 +401,8 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
     }
 
     @Override
-    public void visitMethodInsn(final int opcode, final String owner,
-            final String name, final String desc) {
+    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);
@@ -426,22 +413,22 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
                 }
             }
             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;
+                // 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);
@@ -455,8 +442,7 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
     }
 
     @Override
-    public void visitInvokeDynamicInsn(String name, String desc, Handle bsm,
-            Object... bsmArgs) {
+    public void visitInvokeDynamicInsn(String name, String desc, Handle bsm, Object... bsmArgs) {
         mv.visitInvokeDynamicInsn(name, desc, bsm, bsmArgs);
         if (constructor) {
             Type[] types = Type.getArgumentTypes(desc);
@@ -482,38 +468,37 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
         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;
+                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) {
+    public void visitLookupSwitchInsn(final Label dflt, final int[] keys, final Label[] labels) {
         mv.visitLookupSwitchInsn(dflt, keys, labels);
         if (constructor) {
             popValue();
@@ -522,8 +507,8 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
     }
 
     @Override
-    public void visitTableSwitchInsn(final int min, final int max,
-            final Label dflt, final Label... labels) {
+    public void visitTableSwitchInsn(final int min, final int max, final Label dflt,
+            final Label... labels) {
         mv.visitTableSwitchInsn(min, max, dflt, labels);
         if (constructor) {
             popValue();
@@ -532,8 +517,7 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
     }
 
     @Override
-    public void visitTryCatchBlock(Label start, Label end, Label handler,
-            String type) {
+    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>();
@@ -569,20 +553,18 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
     }
 
     /**
-     * Called at the beginning of the method or after super class class call in
-     * the constructor. <br>
+     * 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>
+     * <i>Custom code can use or change all the local variables, but should not change state of the
+     * stack.</i>
      */
-    protected void onMethodEnter() {
-    }
+    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:
+     * 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) {
@@ -610,16 +592,13 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
      * <br>
      * <br>
      * 
-     * <i>Custom code can use or change all the local variables, but should not
-     * change state of the stack.</i>
+     * <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
+     * @param opcode one of the RETURN, IRETURN, FRETURN, ARETURN, LRETURN, DRETURN or ATHROW
      * 
      */
-    protected void onMethodExit(int opcode) {
-    }
+    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
index 156af0c..a2d2f29 100644
--- a/src/main/asm/org/objectweb/asm/commons/AnalyzerAdapter.java
+++ b/src/main/asm/org/objectweb/asm/commons/AnalyzerAdapter.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -42,65 +34,55 @@ 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.
+ * {@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.
+     * <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.
+     * <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>.
+     * 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.
+     * 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;
 
@@ -120,49 +102,34 @@ public class AnalyzerAdapter extends MethodVisitor {
     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.
+     * 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>.
+     * @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) {
+    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>.
+     * @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) {
+    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>();
@@ -180,37 +147,37 @@ public class AnalyzerAdapter extends MethodVisitor {
         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());
+                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) {
+    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");
@@ -249,8 +216,7 @@ public class AnalyzerAdapter extends MethodVisitor {
             mv.visitInsn(opcode);
         }
         execute(opcode, 0, null);
-        if ((opcode >= Opcodes.IRETURN && opcode <= Opcodes.RETURN)
-                || opcode == Opcodes.ATHROW) {
+        if ((opcode >= Opcodes.IRETURN && opcode <= Opcodes.RETURN) || opcode == Opcodes.ATHROW) {
             this.locals = null;
             this.stack = null;
         }
@@ -294,8 +260,8 @@ public class AnalyzerAdapter extends MethodVisitor {
     }
 
     @Override
-    public void visitFieldInsn(final int opcode, final String owner,
-            final String name, final String desc) {
+    public void visitFieldInsn(final int opcode, final String owner, final String name,
+            final String desc) {
         if (mv != null) {
             mv.visitFieldInsn(opcode, owner, name, desc);
         }
@@ -303,8 +269,8 @@ public class AnalyzerAdapter extends MethodVisitor {
     }
 
     @Override
-    public void visitMethodInsn(final int opcode, final String owner,
-            final String name, final String desc) {
+    public void visitMethodInsn(final int opcode, final String owner, final String name,
+            final String desc) {
         if (mv != null) {
             mv.visitMethodInsn(opcode, owner, name, desc);
         }
@@ -339,8 +305,7 @@ public class AnalyzerAdapter extends MethodVisitor {
     }
 
     @Override
-    public void visitInvokeDynamicInsn(String name, String desc, Handle bsm,
-            Object... bsmArgs) {
+    public void visitInvokeDynamicInsn(String name, String desc, Handle bsm, Object... bsmArgs) {
         if (mv != null) {
             mv.visitInvokeDynamicInsn(name, desc, bsm, bsmArgs);
         }
@@ -423,8 +388,8 @@ public class AnalyzerAdapter extends MethodVisitor {
     }
 
     @Override
-    public void visitTableSwitchInsn(final int min, final int max,
-            final Label dflt, final Label... labels) {
+    public void visitTableSwitchInsn(final int min, final int max, final Label dflt,
+            final Label... labels) {
         if (mv != null) {
             mv.visitTableSwitchInsn(min, max, dflt, labels);
         }
@@ -434,8 +399,7 @@ public class AnalyzerAdapter extends MethodVisitor {
     }
 
     @Override
-    public void visitLookupSwitchInsn(final Label dflt, final int[] keys,
-            final Label[] labels) {
+    public void visitLookupSwitchInsn(final Label dflt, final int[] keys, final Label[] labels) {
         if (mv != null) {
             mv.visitLookupSwitchInsn(dflt, keys, labels);
         }
@@ -484,40 +448,40 @@ public class AnalyzerAdapter extends MethodVisitor {
     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));
-            }
+            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));
+                }
         }
     }
 
@@ -556,364 +520,364 @@ public class AnalyzerAdapter extends MethodVisitor {
         }
         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);
+            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.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.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.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");
+            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.T_BYTE:
-                pushDesc("[B");
+            case Opcodes.IASTORE:
+            case Opcodes.BASTORE:
+            case Opcodes.CASTORE:
+            case Opcodes.SASTORE:
+            case Opcodes.FASTORE:
+            case Opcodes.AASTORE:
+                pop(3);
                 break;
-            case Opcodes.T_SHORT:
-                pushDesc("[S");
+            case Opcodes.LASTORE:
+            case Opcodes.DASTORE:
+                pop(4);
                 break;
-            case Opcodes.T_INT:
-                pushDesc("[I");
+            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.T_FLOAT:
-                pushDesc("[F");
+            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.T_DOUBLE:
-                pushDesc("[D");
+            case Opcodes.DUP:
+                t1 = pop();
+                push(t1);
+                push(t1);
                 break;
-            // case Opcodes.T_LONG:
+            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:
-                pushDesc("[J");
+                pop(iarg);
+                pushDesc(sarg);
                 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
index ddeb26d..e6df16c 100644
--- a/src/main/asm/org/objectweb/asm/commons/CodeSizeEvaluator.java
+++ b/src/main/asm/org/objectweb/asm/commons/CodeSizeEvaluator.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -111,8 +103,8 @@ public class CodeSizeEvaluator extends MethodVisitor implements Opcodes {
     }
 
     @Override
-    public void visitFieldInsn(final int opcode, final String owner,
-            final String name, final String desc) {
+    public void visitFieldInsn(final int opcode, final String owner, final String name,
+            final String desc) {
         minSize += 3;
         maxSize += 3;
         if (mv != null) {
@@ -121,8 +113,8 @@ public class CodeSizeEvaluator extends MethodVisitor implements Opcodes {
     }
 
     @Override
-    public void visitMethodInsn(final int opcode, final String owner,
-            final String name, final String desc) {
+    public void visitMethodInsn(final int opcode, final String owner, final String name,
+            final String desc) {
         if (opcode == INVOKEINTERFACE) {
             minSize += 5;
             maxSize += 5;
@@ -136,8 +128,7 @@ public class CodeSizeEvaluator extends MethodVisitor implements Opcodes {
     }
 
     @Override
-    public void visitInvokeDynamicInsn(String name, String desc, Handle bsm,
-            Object... bsmArgs) {
+    public void visitInvokeDynamicInsn(String name, String desc, Handle bsm, Object... bsmArgs) {
         minSize += 5;
         maxSize += 5;
         if (mv != null) {
@@ -187,8 +178,8 @@ public class CodeSizeEvaluator extends MethodVisitor implements Opcodes {
     }
 
     @Override
-    public void visitTableSwitchInsn(final int min, final int max,
-            final Label dflt, final Label... labels) {
+    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) {
@@ -197,8 +188,7 @@ public class CodeSizeEvaluator extends MethodVisitor implements Opcodes {
     }
 
     @Override
-    public void visitLookupSwitchInsn(final Label dflt, final int[] keys,
-            final Label[] labels) {
+    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) {
diff --git a/src/main/asm/org/objectweb/asm/commons/GeneratorAdapter.java b/src/main/asm/org/objectweb/asm/commons/GeneratorAdapter.java
index ea2a097..987bdb4 100644
--- a/src/main/asm/org/objectweb/asm/commons/GeneratorAdapter.java
+++ b/src/main/asm/org/objectweb/asm/commons/GeneratorAdapter.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -41,8 +33,8 @@ 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
+ * A {@link org.objectweb.asm.MethodVisitor} with convenient methods to generate code. For example,
+ * using this adapter, the class below
  * 
  * <pre>
  * public class Example {
@@ -69,8 +61,7 @@ import org.objectweb.asm.Type;
  * 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.invokeVirtual(Type.getType(PrintStream.class), Method.getMethod(&quot;void println (String)&quot;));
  * mg.returnValue();
  * mg.endMethod();
  * 
@@ -88,48 +79,35 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     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 BOOLEAN_TYPE = Type.getObjectType("java/lang/Boolean");
 
-    private static final Type SHORT_TYPE = Type
-            .getObjectType("java/lang/Short");
+    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 CHARACTER_TYPE = Type.getObjectType("java/lang/Character");
 
-    private static final Type INTEGER_TYPE = Type
-            .getObjectType("java/lang/Integer");
+    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 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 DOUBLE_TYPE = Type.getObjectType("java/lang/Double");
 
-    private static final Type NUMBER_TYPE = Type
-            .getObjectType("java/lang/Number");
+    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 Type OBJECT_TYPE = Type.getObjectType("java/lang/Object");
 
-    private static final Method BOOLEAN_VALUE = Method
-            .getMethod("boolean booleanValue()");
+    private static final Method BOOLEAN_VALUE = Method.getMethod("boolean booleanValue()");
 
-    private static final Method CHAR_VALUE = Method
-            .getMethod("char charValue()");
+    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 FLOAT_VALUE = Method.getMethod("float floatValue()");
 
-    private static final Method LONG_VALUE = Method
-            .getMethod("long longValue()");
+    private static final Method LONG_VALUE = Method.getMethod("long longValue()");
 
-    private static final Method DOUBLE_VALUE = Method
-            .getMethod("double doubleValue()");
+    private static final Method DOUBLE_VALUE = Method.getMethod("double doubleValue()");
 
     /**
      * Constant for the {@link #math math} method.
@@ -242,42 +220,32 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     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)}
+     * 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}).
+     * @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) {
+    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}).
+     * @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) {
+    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);
@@ -285,54 +253,39 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     }
 
     /**
-     * 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)}
+     * 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.
+     * @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) {
+    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)}
+     * 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.
+     * @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)));
+    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.
+     * @param types a set of types.
      * @return the internal names of the given types.
      */
     private static String[] getInternalNames(final Type[] types) {
@@ -353,8 +306,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instruction to push the given value on the stack.
      * 
-     * @param value
-     *            the value to be pushed on the stack.
+     * @param value the value to be pushed on the stack.
      */
     public void push(final boolean value) {
         push(value ? 1 : 0);
@@ -363,8 +315,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instruction to push the given value on the stack.
      * 
-     * @param value
-     *            the value to be pushed on the stack.
+     * @param value the value to be pushed on the stack.
      */
     public void push(final int value) {
         if (value >= -1 && value <= 5) {
@@ -381,8 +332,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instruction to push the given value on the stack.
      * 
-     * @param value
-     *            the value to be pushed on the stack.
+     * @param value the value to be pushed on the stack.
      */
     public void push(final long value) {
         if (value == 0L || value == 1L) {
@@ -395,8 +345,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instruction to push the given value on the stack.
      * 
-     * @param value
-     *            the value to be pushed on the stack.
+     * @param value the value to be pushed on the stack.
      */
     public void push(final float value) {
         int bits = Float.floatToIntBits(value);
@@ -410,8 +359,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instruction to push the given value on the stack.
      * 
-     * @param value
-     *            the value to be pushed on the stack.
+     * @param value the value to be pushed on the stack.
      */
     public void push(final double value) {
         long bits = Double.doubleToLongBits(value);
@@ -425,8 +373,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * 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>.
+     * @param value the value to be pushed on the stack. May be <tt>null</tt>.
      */
     public void push(final String value) {
         if (value == null) {
@@ -439,48 +386,39 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instruction to push the given value on the stack.
      * 
-     * @param value
-     *            the value to be pushed 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);
+                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);
             }
         }
     }
@@ -488,8 +426,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instruction to push a handle on the stack.
      * 
-     * @param handle
-     *            the handle to be pushed on the stack.
+     * @param handle the handle to be pushed on the stack.
      */
     public void push(final Handle handle) {
         mv.visitLdcInsn(handle);
@@ -500,13 +437,10 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     // ------------------------------------------------------------------------
 
     /**
-     * Returns the index of the given method argument in the frame's local
-     * variables array.
+     * 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.
+     * @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;
@@ -519,23 +453,18 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * 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.
+     * @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.
+     * 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.
+     * @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);
@@ -546,8 +475,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
      */
     public void loadThis() {
         if ((access & Opcodes.ACC_STATIC) != 0) {
-            throw new IllegalStateException(
-                    "no 'this' pointer within static method");
+            throw new IllegalStateException("no 'this' pointer within static method");
         }
         mv.visitVarInsn(Opcodes.ALOAD, 0);
     }
@@ -555,21 +483,17 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instruction to load the given method argument on the stack.
      * 
-     * @param arg
-     *            the index of a method argument.
+     * @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.
+     * 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.
+     * @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);
@@ -588,8 +512,8 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     }
 
     /**
-     * Generates the instructions to load all the method arguments on the stack,
-     * as a single object array.
+     * Generates the instructions to load all the method arguments on the stack, as a single object
+     * array.
      */
     public void loadArgArray() {
         push(argumentTypes.length);
@@ -604,11 +528,9 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     }
 
     /**
-     * Generates the instruction to store the top stack value in the given
-     * method argument.
+     * Generates the instruction to store the top stack value in the given method argument.
      * 
-     * @param arg
-     *            the index of a method argument.
+     * @param arg the index of a method argument.
      */
     public void storeArg(final int arg) {
         storeInsn(argumentTypes[arg], getArgIndex(arg));
@@ -621,9 +543,8 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Returns the type of the given local variable.
      * 
-     * @param local
-     *            a local variable identifier, as returned by
-     *            {@link LocalVariablesSorter#newLocal(Type) newLocal()}.
+     * @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) {
@@ -642,9 +563,8 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * 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 local a local variable identifier, as returned by
+     *        {@link LocalVariablesSorter#newLocal(Type) newLocal()}.
      */
     public void loadLocal(final int local) {
         loadInsn(getLocalType(local), local);
@@ -653,11 +573,9 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * 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.
+     * @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);
@@ -665,26 +583,21 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     }
 
     /**
-     * Generates the instruction to store the top stack value in the given local
-     * variable.
+     * 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 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.
+     * 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.
+     * @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);
@@ -694,8 +607,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instruction to load an element from an array.
      * 
-     * @param type
-     *            the type of the array element to be loaded.
+     * @param type the type of the array element to be loaded.
      */
     public void arrayLoad(final Type type) {
         mv.visitInsn(type.getOpcode(Opcodes.IALOAD));
@@ -704,8 +616,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instruction to store an element in an array.
      * 
-     * @param type
-     *            the type of the array element to be stored.
+     * @param type the type of the array element to be stored.
      */
     public void arrayStore(final Type type) {
         mv.visitInsn(type.getOpcode(Opcodes.IASTORE));
@@ -781,10 +692,8 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * 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.
+     * @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) {
@@ -810,22 +719,18 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     // ------------------------------------------------------------------------
 
     /**
-     * Generates the instruction to do the specified mathematical or logical
-     * operation.
+     * 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.
+     * @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.
+     * Generates the instructions to compute the bitwise negation of the top stack value.
      */
     public void not() {
         mv.visitInsn(Opcodes.ICONST_1);
@@ -835,23 +740,18 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * 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.
+     * @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.
+     * 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.
+     * @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) {
@@ -906,32 +806,31 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     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;
+            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.
+     * 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.
+     * @param type the type of the top stack value.
      */
     public void box(final Type type) {
         if (type.getSort() == Type.OBJECT || type.getSort() == Type.ARRAY) {
@@ -952,18 +851,15 @@ public class GeneratorAdapter extends LocalVariablesSorter {
                 dupX1();
                 swap();
             }
-            invokeConstructor(boxed, new Method("<init>", Type.VOID_TYPE,
-                    new Type[] { type }));
+            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.
+     * 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.
+     * @param type the type of the top stack value.
      */
     public void valueOf(final Type type) {
         if (type.getSort() == Type.OBJECT || type.getSort() == Type.ARRAY) {
@@ -973,45 +869,43 @@ public class GeneratorAdapter extends LocalVariablesSorter {
             push((String) null);
         } else {
             Type boxed = getBoxedType(type);
-            invokeStatic(boxed, new Method("valueOf", boxed,
-                    new Type[] { 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.
+     * 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.
+     * @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;
+            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);
@@ -1037,8 +931,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Marks the current code position with the given label.
      * 
-     * @param label
-     *            a label.
+     * @param label a label.
      */
     public void mark(final Label label) {
         mv.visitLabel(label);
@@ -1056,115 +949,98 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     }
 
     /**
-     * Generates the instructions to jump to a label based on the comparison of
-     * the top two stack values.
+     * 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>.
+     * @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);
+            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;
-            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.
+     * 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>.
+     * @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.
+     * 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>.
+     * @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.
+     * 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>.
+     * @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.
+     * 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>.
+     * @param label where to jump if the condition is <tt>true</tt>.
      */
     public void ifNonNull(final Label label) {
         mv.visitJumpInsn(Opcodes.IFNONNULL, label);
@@ -1173,8 +1049,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instruction to jump to the given label.
      * 
-     * @param label
-     *            where to jump if the condition is <tt>true</tt>.
+     * @param label where to jump if the condition is <tt>true</tt>.
      */
     public void goTo(final Label label) {
         mv.visitJumpInsn(Opcodes.GOTO, label);
@@ -1183,9 +1058,8 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates a RET instruction.
      * 
-     * @param local
-     *            a local variable identifier, as returned by
-     *            {@link LocalVariablesSorter#newLocal(Type) newLocal()}.
+     * @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);
@@ -1194,19 +1068,15 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * 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 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) {
+    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);
+            density = (float) keys.length / (keys[keys.length - 1] - keys[0] + 1);
         }
         tableSwitch(keys, generator, density >= 0.5f);
     }
@@ -1214,20 +1084,16 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * 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.
+     * @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) {
+    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");
+                throw new IllegalArgumentException("keys must be sorted ascending");
             }
         }
         Label def = newLabel();
@@ -1282,31 +1148,22 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * 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.
+     * @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());
+    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.
+     * 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.
+     * @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);
@@ -1315,42 +1172,31 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * 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.
+     * @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.
+     * 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.
+     * @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.
+     * 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.
+     * @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);
@@ -1363,28 +1209,20 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * 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.
+     * @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());
+    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.
+     * @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);
@@ -1393,10 +1231,8 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instruction to invoke a constructor.
      * 
-     * @param type
-     *            the class in which the constructor is defined.
-     * @param method
-     *            the constructor to be invoked.
+     * @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);
@@ -1405,10 +1241,8 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * 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.
+     * @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);
@@ -1417,10 +1251,8 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * 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.
+     * @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);
@@ -1429,21 +1261,15 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * 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.
+     * @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) {
+    public void invokeDynamic(String name, String desc, Handle bsm, Object... bsmArgs) {
         mv.visitInvokeDynamicInsn(name, desc, bsm, bsmArgs);
     }
 
@@ -1454,10 +1280,8 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates a type dependent instruction.
      * 
-     * @param opcode
-     *            the instruction's opcode.
-     * @param type
-     *            the instruction's operand.
+     * @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());
@@ -1466,8 +1290,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instruction to create a new object.
      * 
-     * @param type
-     *            the class of the object to be created.
+     * @param type the class of the object to be created.
      */
     public void newInstance(final Type type) {
         typeInsn(Opcodes.NEW, type);
@@ -1476,39 +1299,38 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instruction to create a new array.
      * 
-     * @param type
-     *            the type of the array elements.
+     * @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;
+            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);
     }
@@ -1532,13 +1354,11 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     }
 
     /**
-     * Generates the instructions to create and throw an exception. The
-     * exception class must have a constructor with a single String argument.
+     * 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.
+     * @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);
@@ -1549,11 +1369,9 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     }
 
     /**
-     * Generates the instruction to check that the top stack value is of the
-     * given type.
+     * Generates the instruction to check that the top stack value is of the given type.
      * 
-     * @param type
-     *            a class or interface type.
+     * @param type a class or interface type.
      */
     public void checkCast(final Type type) {
         if (!type.equals(OBJECT_TYPE)) {
@@ -1562,11 +1380,9 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     }
 
     /**
-     * Generates the instruction to test if the top stack value is of the given
-     * type.
+     * Generates the instruction to test if the top stack value is of the given type.
      * 
-     * @param type
-     *            a class or interface type.
+     * @param type a class or interface type.
      */
     public void instanceOf(final Type type) {
         typeInsn(Opcodes.INSTANCEOF, type);
@@ -1603,21 +1419,15 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * 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.
+     * @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) {
+    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());
+            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
index 1f4c5a5..612fc66 100644
--- a/src/main/asm/org/objectweb/asm/commons/InstructionAdapter.java
+++ b/src/main/asm/org/objectweb/asm/commons/InstructionAdapter.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
@@ -37,8 +29,7 @@ import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 
 /**
- * A {@link MethodVisitor} providing a more detailed API to generate and
- * transform instructions.
+ * A {@link MethodVisitor} providing a more detailed API to generate and transform instructions.
  * 
  * @author Eric Bruneton
  */
@@ -47,12 +38,10 @@ 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.
+     * 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.
+     * @param mv the method visitor to which this adapter delegates calls.
      */
     public InstructionAdapter(final MethodVisitor mv) {
         this(Opcodes.ASM4, mv);
@@ -61,11 +50,9 @@ public class InstructionAdapter extends MethodVisitor {
     /**
      * 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.
+     * @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);
@@ -74,394 +61,394 @@ public class InstructionAdapter extends MethodVisitor {
     @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();
+            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);
+            case Opcodes.BIPUSH:
+                iconst(operand);
                 break;
-            case Opcodes.T_CHAR:
-                newarray(Type.CHAR_TYPE);
+            case Opcodes.SIPUSH:
+                iconst(operand);
                 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);
+            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();
-            }
-            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();
+            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();
         }
     }
 
@@ -469,130 +456,129 @@ public class InstructionAdapter extends MethodVisitor {
     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();
+            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) {
+    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();
+            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) {
+    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();
+            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) {
+    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();
+            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();
         }
     }
 
@@ -644,14 +630,13 @@ public class InstructionAdapter extends MethodVisitor {
     }
 
     @Override
-    public void visitTableSwitchInsn(final int min, final int max,
-            final Label dflt, final Label... labels) {
+    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) {
+    public void visitLookupSwitchInsn(final Label dflt, final int[] keys, final Label[] labels) {
         lookupswitch(dflt, keys, labels);
     }
 
@@ -951,13 +936,11 @@ public class InstructionAdapter extends MethodVisitor {
         mv.visitVarInsn(Opcodes.RET, var);
     }
 
-    public void tableswitch(final int min, final int max, final Label dflt,
-            final Label... labels) {
+    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) {
+    public void lookupswitch(final Label dflt, final int[] keys, final Label[] labels) {
         mv.visitLookupSwitchInsn(dflt, keys, labels);
     }
 
@@ -965,48 +948,39 @@ public class InstructionAdapter extends MethodVisitor {
         mv.visitInsn(t.getOpcode(Opcodes.IRETURN));
     }
 
-    public void getstatic(final String owner, final String name,
-            final String desc) {
+    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) {
+    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) {
+    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) {
+    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) {
+    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) {
+    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) {
+    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) {
+    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) {
+    public void invokedynamic(String name, String desc, Handle bsm, Object[] bsmArgs) {
         mv.visitInvokeDynamicInsn(name, desc, bsm, bsmArgs);
     }
 
@@ -1017,33 +991,33 @@ public class InstructionAdapter extends MethodVisitor {
     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;
+            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);
     }
diff --git a/src/main/asm/org/objectweb/asm/commons/JSRInlinerAdapter.java b/src/main/asm/org/objectweb/asm/commons/JSRInlinerAdapter.java
index a8325fd..2aafc47 100644
--- a/src/main/asm/org/objectweb/asm/commons/JSRInlinerAdapter.java
+++ b/src/main/asm/org/objectweb/asm/commons/JSRInlinerAdapter.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -55,8 +47,8 @@ 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.
+ * A {@link org.objectweb.asm.MethodVisitor} that removes JSR instructions and inlines the
+ * referenced subroutines.
  * 
  * <b>Explanation of how it works</b> TODO
  * 
@@ -72,82 +64,61 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
     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.
+     * 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.
+     * 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[])}
+     * 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>.
+     * @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) {
+    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>.
+     * @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) {
+    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.
+     * 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) {
@@ -159,8 +130,8 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
     }
 
     /**
-     * If any JSRs were seen, triggers the inlining process. Otherwise, forwards
-     * the byte codes untouched.
+     * If any JSRs were seen, triggers the inlining process. Otherwise, forwards the byte codes
+     * untouched.
      */
     @Override
     public void visitEnd() {
@@ -184,8 +155,8 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
     }
 
     /**
-     * Walks the method and determines which internal subroutine(s), if any,
-     * each instruction is a method of.
+     * Walks the method and determines which internal subroutine(s), if any, each instruction is a
+     * method of.
      */
     private void markSubroutines() {
         BitSet anyvisited = new BitSet();
@@ -196,8 +167,8 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
 
         // 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();) {
+        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();
@@ -207,23 +178,18 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
     }
 
     /**
-     * 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>.
+     * 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.
+     * @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) {
+    private void markSubroutineWalk(final BitSet sub, final int index, final BitSet anyvisited) {
         if (LOGGING) {
             log("markSubroutineWalk: sub=" + sub + " index=" + index);
         }
@@ -235,8 +201,7 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
         boolean loop = true;
         while (loop) {
             loop = false;
-            for (Iterator<TryCatchBlockNode> it = tryCatchBlocks.iterator(); it
-                    .hasNext();) {
+            for (Iterator<TryCatchBlockNode> it = tryCatchBlocks.iterator(); it.hasNext();) {
                 TryCatchBlockNode trycatch = it.next();
 
                 if (LOGGING) {
@@ -255,9 +220,8 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
                 int nextbit = sub.nextSetBit(startindex);
                 if (nextbit != -1 && nextbit < endindex) {
                     if (LOGGING) {
-                        log("Adding exception handler: " + startindex + '-'
-                                + endindex + " due to " + nextbit + " handler "
-                                + handlerindex);
+                        log("Adding exception handler: " + startindex + '-' + endindex + " due to "
+                                + nextbit + " handler " + handlerindex);
                     }
                     markSubroutineWalkDFS(sub, handlerindex, anyvisited);
                     loop = true;
@@ -267,20 +231,15 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
     }
 
     /**
-     * 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>.
+     * 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.
+     * @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) {
+    private void markSubroutineWalkDFS(final BitSet sub, int index, final BitSet anyvisited) {
         while (true) {
             AbstractInsnNode node = instructions.get(index);
 
@@ -299,8 +258,7 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
             }
             anyvisited.set(index);
 
-            if (node.getType() == AbstractInsnNode.JUMP_INSN
-                    && node.getOpcode() != JSR) {
+            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;
@@ -331,22 +289,22 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
             // 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;
+                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
@@ -367,8 +325,8 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
     }
 
     /**
-     * Creates the new instructions, inlining each instantiation of each
-     * subroutine until the code is fully elaborated.
+     * 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>();
@@ -383,8 +341,7 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
         List<LocalVariableNode> newLocalVariables = new ArrayList<LocalVariableNode>();
         while (!worklist.isEmpty()) {
             Instantiation inst = worklist.removeFirst();
-            emitSubroutine(inst, worklist, newInstructions, newTryCatchBlocks,
-                    newLocalVariables);
+            emitSubroutine(inst, worklist, newInstructions, newTryCatchBlocks, newLocalVariables);
         }
         instructions = newInstructions;
         tryCatchBlocks = newTryCatchBlocks;
@@ -392,25 +349,18 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
     }
 
     /**
-     * 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>.
+     * 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.
+     * @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,
+    private void emitSubroutine(final Instantiation instant, final List<Instantiation> worklist,
+            final InsnList newInstructions, final List<TryCatchBlockNode> newTryCatchBlocks,
             final List<LocalVariableNode> newLocalVariables) {
         LabelNode duplbl = null;
 
@@ -476,8 +426,8 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
                     // 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");
+                    throw new RuntimeException(
+                            "Instruction #" + i + " is a RET not owned by any subroutine");
                 }
                 newInstructions.add(new JumpInsnNode(GOTO, retlabel));
             } else if (insn.getOpcode() == JSR) {
@@ -508,14 +458,13 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
         }
 
         // Emit try/catch blocks that are relevant to this method.
-        for (Iterator<TryCatchBlockNode> it = tryCatchBlocks.iterator(); it
-                .hasNext();) {
+        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);
+                log("try catch block original labels=" + trycatch.start + '-' + trycatch.end + "->"
+                        + trycatch.handler);
             }
 
             final LabelNode start = instant.rangeLabel(trycatch.start);
@@ -533,20 +482,17 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
 
             if (LOGGING) {
                 // TODO use of default toString().
-                log(" try catch block new labels=" + start + '-' + end + "->"
-                        + handler);
+                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));
+            newTryCatchBlocks.add(new TryCatchBlockNode(start, end, handler, trycatch.type));
         }
 
-        for (Iterator<LocalVariableNode> it = localVariables.iterator(); it
-                .hasNext();) {
+        for (Iterator<LocalVariableNode> it = localVariables.iterator(); it.hasNext();) {
             LocalVariableNode lvnode = it.next();
             if (LOGGING) {
                 log("local var " + lvnode.name);
@@ -559,8 +505,8 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
                 }
                 continue;
             }
-            newLocalVariables.add(new LocalVariableNode(lvnode.name,
-                    lvnode.desc, lvnode.signature, start, end, lvnode.index));
+            newLocalVariables.add(new LocalVariableNode(lvnode.name, lvnode.desc, lvnode.signature,
+                    start, end, lvnode.index));
         }
     }
 
@@ -569,18 +515,16 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
     }
 
     /**
-     * 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.
+     * 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.
+         * Previous instantiations; the stack must be statically predictable to be inlinable.
          */
         final Instantiation previous;
 
@@ -590,15 +534,13 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
         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.
+         * 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
+         * 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)
@@ -660,27 +602,23 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
         }
 
         /**
-         * 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.
+         * 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
+         * 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.
+         * 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.
+         * @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)) {
@@ -699,13 +637,11 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
         }
 
         /**
-         * 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.
+         * 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
+         * @param l The label we will be translating
          * @return a label for use by a branch instruction in the inlined code
          * @see #rangeLabel
          */
@@ -717,15 +653,12 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
         }
 
         /**
-         * 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.
+         * 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
+         * @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) {
diff --git a/src/main/asm/org/objectweb/asm/commons/LocalVariablesSorter.java b/src/main/asm/org/objectweb/asm/commons/LocalVariablesSorter.java
index 09eef09..cf2412d 100644
--- a/src/main/asm/org/objectweb/asm/commons/LocalVariablesSorter.java
+++ b/src/main/asm/org/objectweb/asm/commons/LocalVariablesSorter.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -35,12 +27,11 @@ 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}).
+ * 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
@@ -48,13 +39,12 @@ import org.objectweb.asm.Type;
  */
 public class LocalVariablesSorter extends MethodVisitor {
 
-    private static final Type OBJECT_TYPE = Type
-            .getObjectType("java/lang/Object");
+    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]'.
+     * 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];
 
@@ -79,37 +69,29 @@ public class LocalVariablesSorter extends MethodVisitor {
     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.
+     * 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.
+     * @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) {
+    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.
+     * @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) {
+    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;
@@ -123,32 +105,32 @@ public class LocalVariablesSorter extends MethodVisitor {
     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.LLOAD:
+            case Opcodes.LSTORE:
+                type = Type.LONG_TYPE;
+                break;
 
-        case Opcodes.DLOAD:
-        case Opcodes.DSTORE:
-            type = Type.DOUBLE_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.FLOAD:
+            case Opcodes.FSTORE:
+                type = Type.FLOAT_TYPE;
+                break;
 
-        case Opcodes.ILOAD:
-        case Opcodes.ISTORE:
-            type = Type.INT_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;
+            default:
+                // case Opcodes.ALOAD:
+                // case Opcodes.ASTORE:
+                // case RET:
+                type = OBJECT_TYPE;
+                break;
         }
         mv.visitVarInsn(opcode, remap(var, type));
     }
@@ -164,16 +146,15 @@ public class LocalVariablesSorter extends MethodVisitor {
     }
 
     @Override
-    public void visitLocalVariable(final String name, final String desc,
-            final String signature, final Label start, final Label end,
-            final int index) {
+    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) {
+    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");
@@ -245,36 +226,35 @@ public class LocalVariablesSorter extends MethodVisitor {
     /**
      * Creates a new local variable of the given type.
      * 
-     * @param type
-     *            the type of the local variable to be created.
+     * @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;
+            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);
@@ -284,39 +264,30 @@ public class LocalVariablesSorter extends MethodVisitor {
     }
 
     /**
-     * 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.
+     * 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.
+     * @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) {
-    }
+    protected void updateNewLocals(Object[] newLocals) {}
 
     /**
-     * Notifies subclasses that a local variable has been added or remapped. The
-     * default implementation of this method does nothing.
+     * 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.
+     * @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) {
-    }
+    protected void setLocalType(final int local, final Type type) {}
 
     private void setFrameLocal(final int local, final Object type) {
         int l = newLocals.length;
diff --git a/src/main/asm/org/objectweb/asm/commons/Method.java b/src/main/asm/org/objectweb/asm/commons/Method.java
index 25c3660..082f2f1 100644
--- a/src/main/asm/org/objectweb/asm/commons/Method.java
+++ b/src/main/asm/org/objectweb/asm/commons/Method.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -74,10 +66,8 @@ public class Method {
     /**
      * Creates a new {@link Method}.
      * 
-     * @param name
-     *            the method's name.
-     * @param desc
-     *            the method's descriptor.
+     * @param name the method's name.
+     * @param desc the method's descriptor.
      */
     public Method(final String name, final String desc) {
         this.name = name;
@@ -87,25 +77,19 @@ public class Method {
     /**
      * 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.
+     * @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) {
+    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.
+     * @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));
@@ -114,60 +98,43 @@ public class Method {
     /**
      * Creates a new {@link Method}.
      * 
-     * @param c
-     *            a java.lang.reflect constructor descriptor
-     * @return a {@link Method} corresponding to the given Java constructor
-     *         declaration.
+     * @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.
+     * 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.
+     * @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 {
+    public static Method getMethod(final String method) throws IllegalArgumentException {
         return getMethod(method, false);
     }
 
     /**
-     * Returns a {@link Method} corresponding to the given Java method
-     * declaration.
+     * 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.
+     * @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 {
+    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);
@@ -279,4 +246,4 @@ public class Method {
     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
index 9c359fb..9115caa 100644
--- a/src/main/asm/org/objectweb/asm/commons/Remapper.java
+++ b/src/main/asm/org/objectweb/asm/commons/Remapper.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
@@ -37,8 +29,7 @@ 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:
+ * A class responsible for remapping types and names. Subclasses can override the following methods:
  * 
  * <ul>
  * <li>{@link #map(String)} - map type</li>
@@ -53,34 +44,34 @@ 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 + ';';
-            }
+            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()));
+            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;
     }
@@ -137,8 +128,8 @@ public abstract class Remapper {
         }
         if (value instanceof Handle) {
             Handle h = (Handle) value;
-            return new Handle(h.getTag(), mapType(h.getOwner()), mapMethodName(
-                    h.getOwner(), h.getName(), h.getDesc()),
+            return new Handle(h.getTag(), mapType(h.getOwner()),
+                    mapMethodName(h.getOwner(), h.getName(), h.getDesc()),
                     mapMethodDesc(h.getDesc()));
         }
         return value;
@@ -146,10 +137,8 @@ public abstract class Remapper {
 
     /**
      * 
-     * @param typeSignature
-     *            true if signature is a FieldTypeSignature, such as the
-     *            signature parameter of the ClassVisitor.visitField or
-     *            MethodVisitor.visitLocalVariable methods
+     * @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) {
@@ -166,20 +155,16 @@ public abstract class Remapper {
         return w.toString();
     }
 
-    protected SignatureVisitor createRemappingSignatureAdapter(
-            SignatureVisitor v) {
+    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.
+     * @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) {
@@ -189,10 +174,8 @@ public abstract class Remapper {
     /**
      * Map invokedynamic method name to the new name. Subclasses can override.
      * 
-     * @param name
-     *            name of the invokedynamic.
-     * @param desc
-     *            descriptor of the invokedynamic.
+     * @param name name of the invokedynamic.
+     * @param desc descriptor of the invokedynamic.
      * @return new invokdynamic name.
      */
     public String mapInvokeDynamicMethodName(String name, String desc) {
@@ -202,12 +185,9 @@ public abstract class Remapper {
     /**
      * 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
+     * @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) {
diff --git a/src/main/asm/org/objectweb/asm/commons/RemappingAnnotationAdapter.java b/src/main/asm/org/objectweb/asm/commons/RemappingAnnotationAdapter.java
index 8fff2d1..f0ce9a3 100644
--- a/src/main/asm/org/objectweb/asm/commons/RemappingAnnotationAdapter.java
+++ b/src/main/asm/org/objectweb/asm/commons/RemappingAnnotationAdapter.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
@@ -42,13 +34,12 @@ public class RemappingAnnotationAdapter extends AnnotationVisitor {
 
     protected final Remapper remapper;
 
-    public RemappingAnnotationAdapter(final AnnotationVisitor av,
-            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) {
+    protected RemappingAnnotationAdapter(final int api, final AnnotationVisitor av,
+            final Remapper remapper) {
         super(api, av);
         this.remapper = remapper;
     }
@@ -66,14 +57,12 @@ public class RemappingAnnotationAdapter extends AnnotationVisitor {
     @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));
+        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));
+        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
index f9e577d..21cbcdf 100644
--- a/src/main/asm/org/objectweb/asm/commons/RemappingClassAdapter.java
+++ b/src/main/asm/org/objectweb/asm/commons/RemappingClassAdapter.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
@@ -51,18 +43,17 @@ public class RemappingClassAdapter extends ClassVisitor {
         this(Opcodes.ASM4, cv, remapper);
     }
 
-    protected RemappingClassAdapter(final int api, final ClassVisitor cv,
-            final Remapper 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) {
+    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),
+        super.visit(version, access, remapper.mapType(name),
+                remapper.mapSignature(signature, false), remapper.mapType(superName),
                 interfaces == null ? null : remapper.mapTypes(interfaces));
     }
 
@@ -74,39 +65,35 @@ public class RemappingClassAdapter extends ClassVisitor {
     }
 
     @Override
-    public FieldVisitor visitField(int access, String name, String desc,
-            String signature, Object value) {
-        FieldVisitor fv = super.visitField(access,
-                remapper.mapFieldName(className, name, desc),
+    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) {
+    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),
+        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);
+        return mv == null ? null : createRemappingMethodAdapter(access, newDesc, mv);
     }
 
     @Override
-    public void visitInnerClass(String name, String outerName,
-            String innerName, int access) {
+    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);
+        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),
+        super.visitOuterClass(remapper.mapType(owner),
+                name == null ? null : remapper.mapMethodName(owner, name, desc),
                 desc == null ? null : remapper.mapMethodDesc(desc));
     }
 
@@ -114,13 +101,12 @@ public class RemappingClassAdapter extends ClassVisitor {
         return new RemappingFieldAdapter(fv, remapper);
     }
 
-    protected MethodVisitor createRemappingMethodAdapter(int access,
-            String newDesc, MethodVisitor mv) {
+    protected MethodVisitor createRemappingMethodAdapter(int access, String newDesc,
+            MethodVisitor mv) {
         return new RemappingMethodAdapter(access, newDesc, mv, remapper);
     }
 
-    protected AnnotationVisitor createRemappingAnnotationAdapter(
-            AnnotationVisitor av) {
+    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
index 1dbee7e..994679d 100644
--- a/src/main/asm/org/objectweb/asm/commons/RemappingFieldAdapter.java
+++ b/src/main/asm/org/objectweb/asm/commons/RemappingFieldAdapter.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
@@ -47,16 +39,14 @@ public class RemappingFieldAdapter extends FieldVisitor {
         this(Opcodes.ASM4, fv, remapper);
     }
 
-    protected RemappingFieldAdapter(final int api, final FieldVisitor fv,
-            final Remapper 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);
+        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
index e1c3b9c..c11fa68 100644
--- a/src/main/asm/org/objectweb/asm/commons/RemappingMethodAdapter.java
+++ b/src/main/asm/org/objectweb/asm/commons/RemappingMethodAdapter.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
@@ -45,13 +37,13 @@ public class RemappingMethodAdapter extends LocalVariablesSorter {
 
     protected final Remapper remapper;
 
-    public RemappingMethodAdapter(final int access, final String desc,
-            final MethodVisitor mv, 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) {
+    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;
     }
@@ -64,22 +56,19 @@ public class RemappingMethodAdapter extends LocalVariablesSorter {
 
     @Override
     public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
-        AnnotationVisitor av = mv.visitAnnotation(remapper.mapDesc(desc),
-                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);
+    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) {
+    public void visitFrame(int type, int nLocal, Object[] local, int nStack, Object[] stack) {
         super.visitFrame(type, nLocal, remapEntries(nLocal, local), nStack,
                 remapEntries(nStack, stack));
     }
@@ -93,8 +82,7 @@ public class RemappingMethodAdapter extends LocalVariablesSorter {
                 }
                 do {
                     Object t = entries[i];
-                    newEntries[i++] = t instanceof String ? remapper
-                            .mapType((String) t) : t;
+                    newEntries[i++] = t instanceof String ? remapper.mapType((String) t) : t;
                 } while (i < n);
                 return newEntries;
             }
@@ -103,31 +91,24 @@ public class RemappingMethodAdapter extends LocalVariablesSorter {
     }
 
     @Override
-    public void visitFieldInsn(int opcode, String owner, String name,
-            String desc) {
+    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));
+                remapper.mapFieldName(owner, name, desc), remapper.mapDesc(desc));
     }
 
     @Override
-    public void visitMethodInsn(int opcode, String owner, String name,
-            String desc) {
+    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));
+                remapper.mapMethodName(owner, name, desc), remapper.mapMethodDesc(desc));
     }
 
     @Override
-    public void visitInvokeDynamicInsn(String name, String desc, Handle bsm,
-            Object... bsmArgs) {
+    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);
+        super.visitInvokeDynamicInsn(remapper.mapInvokeDynamicMethodName(name, desc),
+                remapper.mapMethodDesc(desc), (Handle) remapper.mapValue(bsm), bsmArgs);
     }
 
     @Override
@@ -146,15 +127,13 @@ public class RemappingMethodAdapter extends LocalVariablesSorter {
     }
 
     @Override
-    public void visitTryCatchBlock(Label start, Label end, Label handler,
-            String type) {
-        super.visitTryCatchBlock(start, end, handler, type == null ? null
-                : remapper.mapType(type));
+    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) {
+    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
index 8550bb8..783bd7f 100644
--- a/src/main/asm/org/objectweb/asm/commons/RemappingSignatureAdapter.java
+++ b/src/main/asm/org/objectweb/asm/commons/RemappingSignatureAdapter.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
@@ -46,13 +38,12 @@ public class RemappingSignatureAdapter extends SignatureVisitor {
 
     private String className;
 
-    public RemappingSignatureAdapter(final SignatureVisitor v,
-            final Remapper remapper) {
+    public RemappingSignatureAdapter(final SignatureVisitor v, final Remapper remapper) {
         this(Opcodes.ASM4, v, remapper);
     }
 
-    protected RemappingSignatureAdapter(final int api,
-            final SignatureVisitor v, final Remapper remapper) {
+    protected RemappingSignatureAdapter(final int api, final SignatureVisitor v,
+            final Remapper remapper) {
         super(api);
         this.v = v;
         this.remapper = remapper;
@@ -69,8 +60,8 @@ public class RemappingSignatureAdapter extends SignatureVisitor {
         String remappedOuter = remapper.mapType(className) + '$';
         className = className + '$' + name;
         String remappedName = remapper.mapType(className);
-        int index = remappedName.startsWith(remappedOuter) ? remappedOuter
-                .length() : remappedName.lastIndexOf('$') + 1;
+        int index = remappedName.startsWith(remappedOuter) ? remappedOuter.length()
+                : remappedName.lastIndexOf('$') + 1;
         v.visitInnerClassType(remappedName.substring(index));
     }
 
diff --git a/src/main/asm/org/objectweb/asm/commons/SerialVersionUIDAdder.java b/src/main/asm/org/objectweb/asm/commons/SerialVersionUIDAdder.java
index c7caf88..17d18c3 100644
--- a/src/main/asm/org/objectweb/asm/commons/SerialVersionUIDAdder.java
+++ b/src/main/asm/org/objectweb/asm/commons/SerialVersionUIDAdder.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -44,8 +36,8 @@ 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:
+ * 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(...);
@@ -54,8 +46,8 @@ import java.util.Collection;
  *   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"
+ * 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>
@@ -113,8 +105,7 @@ import java.util.Collection;
 public class SerialVersionUIDAdder extends ClassVisitor {
 
     /**
-     * Collection of fields. (except private static and private transient
-     * fields)
+     * Collection of fields. (except private static and private transient fields)
      */
     private final Collection<Item> svuidFields;
     /**
@@ -151,12 +142,10 @@ public class SerialVersionUIDAdder extends ClassVisitor {
     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.
+     * 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.
+     * @param cv a {@link ClassVisitor} to which this visitor will delegate calls.
      */
     public SerialVersionUIDAdder(final ClassVisitor cv) {
         this(Opcodes.ASM4, cv);
@@ -165,10 +154,9 @@ public class SerialVersionUIDAdder extends ClassVisitor {
     /**
      * 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.
+     * @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);
@@ -185,31 +173,29 @@ public class SerialVersionUIDAdder extends ClassVisitor {
      * 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
+     * @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 {
+    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);
+            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.
+     * 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) {
+            final String signature, final String superName, final String[] interfaces) {
         computeSVUID = (access & Opcodes.ACC_INTERFACE) == 0;
 
         if (computeSVUID) {
@@ -222,27 +208,23 @@ public class SerialVersionUIDAdder extends ClassVisitor {
     }
 
     /*
-     * Visit the methods and get constructor and method information (step 5 and
-     * 7). Also determine if there is a class initializer (step 6).
+     * 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) {
+    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.
+             * 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
+            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
@@ -259,12 +241,12 @@ public class SerialVersionUIDAdder extends ClassVisitor {
     }
 
     /*
-     * Gets class field information for step 4 of the algorithm. Also determines
-     * if the class already has a SVUID.
+     * 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) {
+    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.
@@ -272,17 +254,15 @@ public class SerialVersionUIDAdder extends ClassVisitor {
                 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.
+             * 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);
+                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));
             }
         }
@@ -291,15 +271,14 @@ public class SerialVersionUIDAdder extends ClassVisitor {
     }
 
     /**
-     * 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.
+     * 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) {
+    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;
         }
@@ -320,8 +299,7 @@ public class SerialVersionUIDAdder extends ClassVisitor {
             try {
                 addSVUID(computeSVUID());
             } catch (Throwable e) {
-                throw new RuntimeException("Error while computing SVUID for "
-                        + name, e);
+                throw new RuntimeException("Error while computing SVUID for " + name, e);
             }
         }
 
@@ -329,8 +307,8 @@ public class SerialVersionUIDAdder extends ClassVisitor {
     }
 
     /**
-     * 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.
+     * 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.
      */
@@ -339,8 +317,8 @@ public class SerialVersionUIDAdder extends ClassVisitor {
     }
 
     protected void addSVUID(long svuid) {
-        FieldVisitor fv = super.visitField(Opcodes.ACC_FINAL
-                + Opcodes.ACC_STATIC, "serialVersionUID", "J", null, svuid);
+        FieldVisitor fv = super.visitField(Opcodes.ACC_FINAL + Opcodes.ACC_STATIC,
+                "serialVersionUID", "J", null, svuid);
         if (null != fv) {
             fv.visitEnd();
         }
@@ -369,13 +347,11 @@ public class SerialVersionUIDAdder extends ClassVisitor {
             /*
              * 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));
+            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.
+             * 3. The name of each interface sorted by name written using UTF encoding.
              */
             Arrays.sort(interfaces);
             for (String anInterface : interfaces) {
@@ -383,24 +359,22 @@ public class SerialVersionUIDAdder extends ClassVisitor {
             }
 
             /*
-             * 4. For each field of the class sorted by field name (except
-             * private static and private transient fields):
+             * 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
+             * 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...
+             * 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.
+             * 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>");
@@ -409,42 +383,37 @@ public class SerialVersionUIDAdder extends ClassVisitor {
             } // 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.
+             * 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.
+             * 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].
+             * 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:
+             * 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;
+             * 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);
diff --git a/src/main/asm/org/objectweb/asm/commons/SimpleRemapper.java b/src/main/asm/org/objectweb/asm/commons/SimpleRemapper.java
index 95b43e5..6938201 100644
--- a/src/main/asm/org/objectweb/asm/commons/SimpleRemapper.java
+++ b/src/main/asm/org/objectweb/asm/commons/SimpleRemapper.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
diff --git a/src/main/asm/org/objectweb/asm/commons/StaticInitMerger.java b/src/main/asm/org/objectweb/asm/commons/StaticInitMerger.java
index 86c5ae3..f200567 100644
--- a/src/main/asm/org/objectweb/asm/commons/StaticInitMerger.java
+++ b/src/main/asm/org/objectweb/asm/commons/StaticInitMerger.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -52,23 +44,21 @@ public class StaticInitMerger extends ClassVisitor {
         this(Opcodes.ASM4, prefix, cv);
     }
 
-    protected StaticInitMerger(final int api, final String prefix,
-            final ClassVisitor 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) {
+            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) {
+    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;
diff --git a/src/main/asm/org/objectweb/asm/commons/TableSwitchGenerator.java b/src/main/asm/org/objectweb/asm/commons/TableSwitchGenerator.java
index 52bd316..db14b4c 100644
--- a/src/main/asm/org/objectweb/asm/commons/TableSwitchGenerator.java
+++ b/src/main/asm/org/objectweb/asm/commons/TableSwitchGenerator.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -43,10 +35,8 @@ 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.
+     * @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);
 
diff --git a/src/main/asm/org/objectweb/asm/commons/TryCatchBlockSorter.java b/src/main/asm/org/objectweb/asm/commons/TryCatchBlockSorter.java
index 079c0cf..4c16549 100644
--- a/src/main/asm/org/objectweb/asm/commons/TryCatchBlockSorter.java
+++ b/src/main/asm/org/objectweb/asm/commons/TryCatchBlockSorter.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
@@ -39,30 +31,27 @@ 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.
+ * 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).
+ * 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) {
+    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) {
+    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;
     }
diff --git a/src/main/asm/org/objectweb/asm/signature/SignatureReader.java b/src/main/asm/org/objectweb/asm/signature/SignatureReader.java
index 1083b3d..517f897 100644
--- a/src/main/asm/org/objectweb/asm/signature/SignatureReader.java
+++ b/src/main/asm/org/objectweb/asm/signature/SignatureReader.java
@@ -1,37 +1,28 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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.
+ * A type signature parser to make a signature visitor visit an existing signature.
  * 
  * @author Thomas Hallgren
  * @author Eric Bruneton
@@ -46,28 +37,23 @@ public class SignatureReader {
     /**
      * Constructs a {@link SignatureReader} for the given signature.
      * 
-     * @param signature
-     *            A <i>ClassSignature</i>, <i>MethodTypeSignature</i>, or
-     *            <i>FieldTypeSignature</i>.
+     * @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).
+     * 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.
+     * @param v the visitor that must visit this signature.
      */
     public void accept(final SignatureVisitor v) {
         String signature = this.signature;
@@ -113,18 +99,15 @@ public class SignatureReader {
     }
 
     /**
-     * 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.
+     * 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.
+     * @param v the visitor that must visit this signature.
      */
     public void acceptType(final SignatureVisitor v) {
         parseType(this.signature, 0, v);
@@ -133,96 +116,90 @@ public class SignatureReader {
     /**
      * 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.
+     * @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) {
+    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 '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 '[':
+                return parseType(signature, pos, v.visitArrayType());
 
-        case 'T':
-            end = signature.indexOf(';', pos);
-            v.visitTypeVariable(signature.substring(pos, end));
-            return end + 1;
+            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();
+            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 '+':
-                        case '-':
-                            pos = parseType(signature, pos + 1,
-                                    v.visitTypeArgument(c));
-                            break;
-                        default:
-                            pos = parseType(signature, pos,
-                                    v.visitTypeArgument('='));
-                            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
index c0819ed..49e0765 100644
--- a/src/main/asm/org/objectweb/asm/signature/SignatureVisitor.java
+++ b/src/main/asm/org/objectweb/asm/signature/SignatureVisitor.java
@@ -1,54 +1,41 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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):
+ * 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>
+ * <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>
+ * <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
@@ -72,17 +59,16 @@ public abstract class SignatureVisitor {
     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}.
+     * 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}.
+     * @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;
@@ -91,11 +77,9 @@ public abstract class SignatureVisitor {
     /**
      * Visits a formal type parameter.
      * 
-     * @param name
-     *            the name of the formal parameter.
+     * @param name the name of the formal parameter.
      */
-    public void visitFormalTypeParameter(String name) {
-    }
+    public void visitFormalTypeParameter(String name) {}
 
     /**
      * Visits the class bound of the last visited formal type parameter.
@@ -118,8 +102,7 @@ public abstract class SignatureVisitor {
     /**
      * Visits the type of the super class.
      * 
-     * @return a non null visitor to visit the signature of the super class
-     *         type.
+     * @return a non null visitor to visit the signature of the super class type.
      */
     public SignatureVisitor visitSuperclass() {
         return this;
@@ -164,63 +147,49 @@ public abstract class SignatureVisitor {
     /**
      * Visits a signature corresponding to a primitive type.
      * 
-     * @param descriptor
-     *            the descriptor of the primitive type, or 'V' for <tt>void</tt>
-     *            .
+     * @param descriptor the descriptor of the primitive type, or 'V' for <tt>void</tt> .
      */
-    public void visitBaseType(char descriptor) {
-    }
+    public void visitBaseType(char descriptor) {}
 
     /**
      * Visits a signature corresponding to a type variable.
      * 
-     * @param name
-     *            the name of the type variable.
+     * @param name the name of the type variable.
      */
-    public void visitTypeVariable(String name) {
-    }
+    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.
+     * @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.
+     * Starts the visit of a signature corresponding to a class or interface type.
      * 
-     * @param name
-     *            the internal name of the class or interface.
+     * @param name the internal name of the class or interface.
      */
-    public void visitClassType(String name) {
-    }
+    public void visitClassType(String name) {}
 
     /**
      * Visits an inner class.
      * 
-     * @param name
-     *            the local name of the inner class in its enclosing class.
+     * @param name the local name of the inner class in its enclosing class.
      */
-    public void visitInnerClassType(String name) {
-    }
+    public void visitInnerClassType(String name) {}
 
     /**
-     * Visits an unbounded type argument of the last visited class or inner
-     * class type.
+     * Visits an unbounded type argument of the last visited class or inner class type.
      */
-    public void visitTypeArgument() {
-    }
+    public void visitTypeArgument() {}
 
     /**
      * Visits a type argument of the last visited class or inner class type.
      * 
-     * @param wildcard
-     *            '+', '-' or '='.
+     * @param wildcard '+', '-' or '='.
      * @return a non null visitor to visit the signature of the type argument.
      */
     public SignatureVisitor visitTypeArgument(char wildcard) {
@@ -230,6 +199,5 @@ public abstract class SignatureVisitor {
     /**
      * Ends the visit of a signature corresponding to a class or interface type.
      */
-    public void visitEnd() {
-    }
+    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
index 361b213..06cd9b0 100644
--- a/src/main/asm/org/objectweb/asm/signature/SignatureWriter.java
+++ b/src/main/asm/org/objectweb/asm/signature/SignatureWriter.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -55,10 +47,9 @@ public class SignatureWriter extends SignatureVisitor {
     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.
+     * 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;
 
@@ -224,4 +215,4 @@ public class SignatureWriter extends SignatureVisitor {
         }
         argumentStack /= 2;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/asm/org/objectweb/asm/tree/AbstractInsnNode.java b/src/main/asm/org/objectweb/asm/tree/AbstractInsnNode.java
index 1637210..423bcd1 100644
--- a/src/main/asm/org/objectweb/asm/tree/AbstractInsnNode.java
+++ b/src/main/asm/org/objectweb/asm/tree/AbstractInsnNode.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -35,8 +27,8 @@ 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>.
+ * 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
  */
@@ -138,18 +130,16 @@ public abstract class AbstractInsnNode {
     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}.
+     * 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.
+     * @param opcode the opcode of the instruction to be constructed.
      */
     protected AbstractInsnNode(final int opcode) {
         this.opcode = opcode;
@@ -168,28 +158,25 @@ public abstract class AbstractInsnNode {
     /**
      * Returns the type of this instruction.
      * 
-     * @return the type of this instruction, i.e. one the constants defined in
-     *         this class.
+     * @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.
+     * 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>.
+     * @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.
+     * 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>.
+     * @return the next instruction in the list to which this instruction belongs, if any. May be
+     *         <tt>null</tt>.
      */
     public AbstractInsnNode getNext() {
         return next;
@@ -198,47 +185,38 @@ public abstract class AbstractInsnNode {
     /**
      * Makes the given code visitor visit this instruction.
      * 
-     * @param cv
-     *            a code visitor.
+     * @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}.
+     * @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);
+    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.
+     * @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) {
+    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.
+     * @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) {
+    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));
diff --git a/src/main/asm/org/objectweb/asm/tree/AnnotationNode.java b/src/main/asm/org/objectweb/asm/tree/AnnotationNode.java
index b37023b..dab9d7b 100644
--- a/src/main/asm/org/objectweb/asm/tree/AnnotationNode.java
+++ b/src/main/asm/org/objectweb/asm/tree/AnnotationNode.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -35,247 +27,192 @@ import java.util.List;
 import org.objectweb.asm.AnnotationVisitor;
 import org.objectweb.asm.Opcodes;
 
-//import cn.edu.pku.dpartner.comm.api.context.DelayLogger;
+// import cn.edu.pku.dpartner.comm.api.context.DelayLogger;
 
 /**
  * A node that represents an annotationn.
  * 
  * @author Eric Bruneton
  */
-public class AnnotationNode extends AnnotationVisitor
-{
+public class AnnotationNode extends AnnotationVisitor {
 
-	/**
-	 * The class descriptor of the annotation class.
-	 */
-	public String desc;
+    /**
+     * 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;
+    /**
+     * 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}. <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}.
+     * 
+     * @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;
-	}
+    /**
+     * 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
-	// ------------------------------------------------------------------------
+    // ------------------------------------------------------------------------
+    // 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 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 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 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 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()
-	{
-	}
+    @Override
+    public void visitEnd() {}
 
-	// ------------------------------------------------------------------------
-	// Accept methods
-	// ------------------------------------------------------------------------
+    // ------------------------------------------------------------------------
+    // 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
-	}
+    /**
+     * 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 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);
-			}
-		}
-	}
+    /**
+     * 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
index 11fd3bf..b2bcca0 100644
--- a/src/main/asm/org/objectweb/asm/tree/ClassNode.java
+++ b/src/main/asm/org/objectweb/asm/tree/ClassNode.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -53,14 +45,14 @@ public class ClassNode extends ClassVisitor {
     public int version;
 
     /**
-     * The class's access flags (see {@link org.objectweb.asm.Opcodes}). This
-     * field also indicates if the class is deprecated.
+     * 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}).
+     * The internal name of the class (see {@link org.objectweb.asm.Type#getInternalName()
+     * getInternalName}).
      */
     public String name;
 
@@ -70,53 +62,50 @@ public class ClassNode extends ClassVisitor {
     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.
+     * 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.
+     * {@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>.
+     * 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>.
+     * 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>.
+     * 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.
+     * 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.
+     * 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>.
+     * 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
@@ -133,41 +122,38 @@ public class ClassNode extends ClassVisitor {
     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>.
+     * 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.
+     * 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.
+     * 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.
+     * 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.
+     * 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);
@@ -176,9 +162,8 @@ public class ClassNode extends ClassVisitor {
     /**
      * Constructs a new {@link ClassNode}.
      * 
-     * @param api
-     *            the ASM API version implemented by this visitor. Must be one
-     *            of {@link Opcodes#ASM4}.
+     * @param api the ASM API version implemented by this visitor. Must be one of
+     *        {@link Opcodes#ASM4}.
      */
     public ClassNode(final int api) {
         super(api);
@@ -194,8 +179,7 @@ public class ClassNode extends ClassVisitor {
 
     @Override
     public void visit(final int version, final int access, final String name,
-            final String signature, final String superName,
-            final String[] interfaces) {
+            final String signature, final String superName, final String[] interfaces) {
         this.version = version;
         this.access = access;
         this.name = name;
@@ -213,16 +197,14 @@ public class ClassNode extends ClassVisitor {
     }
 
     @Override
-    public void visitOuterClass(final String owner, final String name,
-            final String desc) {
+    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) {
+    public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
         AnnotationNode an = new AnnotationNode(desc);
         if (visible) {
             if (visibleAnnotations == null) {
@@ -247,46 +229,41 @@ public class ClassNode extends ClassVisitor {
     }
 
     @Override
-    public void visitInnerClass(final String name, final String outerName,
-            final String innerName, final int access) {
-        InnerClassNode icn = new InnerClassNode(name, outerName, innerName,
-                access);
+    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) {
+    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);
+    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() {
-    }
+    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.
+     * 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}.
+     * @param api an ASM API version. Must be one of {@link Opcodes#ASM4}.
      */
     public void check(final int api) {
         // nothing to do
@@ -295,8 +272,7 @@ public class ClassNode extends ClassVisitor {
     /**
      * Makes the given class visitor visit this class.
      * 
-     * @param cv
-     *            a class visitor.
+     * @param cv a class visitor.
      */
     public void accept(final ClassVisitor cv) {
         // visits header
diff --git a/src/main/asm/org/objectweb/asm/tree/FieldInsnNode.java b/src/main/asm/org/objectweb/asm/tree/FieldInsnNode.java
index a827e17..91f2c9a 100644
--- a/src/main/asm/org/objectweb/asm/tree/FieldInsnNode.java
+++ b/src/main/asm/org/objectweb/asm/tree/FieldInsnNode.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -34,8 +26,8 @@ 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.
+ * 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
  */
@@ -60,20 +52,15 @@ public class FieldInsnNode extends AbstractInsnNode {
     /**
      * 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}).
+     * @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) {
+    public FieldInsnNode(final int opcode, final String owner, final String name,
+            final String desc) {
         super(opcode);
         this.owner = owner;
         this.name = name;
@@ -83,9 +70,8 @@ public class FieldInsnNode extends AbstractInsnNode {
     /**
      * Sets the opcode of this instruction.
      * 
-     * @param opcode
-     *            the new instruction opcode. This opcode must be GETSTATIC,
-     *            PUTSTATIC, GETFIELD or PUTFIELD.
+     * @param opcode the new instruction opcode. This opcode must be GETSTATIC, PUTSTATIC, GETFIELD
+     *        or PUTFIELD.
      */
     public void setOpcode(final int opcode) {
         this.opcode = opcode;
diff --git a/src/main/asm/org/objectweb/asm/tree/FieldNode.java b/src/main/asm/org/objectweb/asm/tree/FieldNode.java
index 8f9a2cd..d872c0f 100644
--- a/src/main/asm/org/objectweb/asm/tree/FieldNode.java
+++ b/src/main/asm/org/objectweb/asm/tree/FieldNode.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -46,8 +38,8 @@ import org.objectweb.asm.Opcodes;
 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.
+     * 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;
 
@@ -67,15 +59,15 @@ public class FieldNode extends FieldVisitor {
     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}.
+     * 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>.
+     * 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
@@ -92,67 +84,48 @@ public class FieldNode extends FieldVisitor {
     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>.
+     * 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.
+     * 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}.
+     * @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) {
+    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.
+     * 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}.
+     * @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) {
+    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;
@@ -166,8 +139,7 @@ public class FieldNode extends FieldVisitor {
     // ------------------------------------------------------------------------
 
     @Override
-    public AnnotationVisitor visitAnnotation(final String desc,
-            final boolean visible) {
+    public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
         AnnotationNode an = new AnnotationNode(desc);
         if (visible) {
             if (visibleAnnotations == null) {
@@ -192,21 +164,18 @@ public class FieldNode extends FieldVisitor {
     }
 
     @Override
-    public void visitEnd() {
-    }
+    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.
+     * 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}.
+     * @param api an ASM API version. Must be one of {@link Opcodes#ASM4}.
      */
     public void check(final int api) {
         // nothing to do
@@ -215,8 +184,7 @@ public class FieldNode extends FieldVisitor {
     /**
      * Makes the given class visitor visit this field.
      * 
-     * @param cv
-     *            a class visitor.
+     * @param cv a class visitor.
      */
     public void accept(final ClassVisitor cv) {
         FieldVisitor fv = cv.visitField(access, name, desc, signature, value);
diff --git a/src/main/asm/org/objectweb/asm/tree/FrameNode.java b/src/main/asm/org/objectweb/asm/tree/FrameNode.java
index bd1ea70..27f65d8 100644
--- a/src/main/asm/org/objectweb/asm/tree/FrameNode.java
+++ b/src/main/asm/org/objectweb/asm/tree/FrameNode.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -38,42 +30,39 @@ 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>
+ * 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}.
+ * (*) 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.
+     * 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}).
+     * 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}).
+     * 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;
 
@@ -84,48 +73,40 @@ public class FrameNode extends AbstractInsnNode {
     /**
      * 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}).
+     * @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) {
+    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;
+            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;
         }
     }
 
@@ -137,29 +118,27 @@ public class FrameNode extends AbstractInsnNode {
     /**
      * Makes the given visitor visit this stack map frame.
      * 
-     * @param mv
-     *            a method visitor.
+     * @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;
+            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;
         }
     }
 
diff --git a/src/main/asm/org/objectweb/asm/tree/IincInsnNode.java b/src/main/asm/org/objectweb/asm/tree/IincInsnNode.java
index 179ec6e..a488944 100644
--- a/src/main/asm/org/objectweb/asm/tree/IincInsnNode.java
+++ b/src/main/asm/org/objectweb/asm/tree/IincInsnNode.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -54,10 +46,8 @@ public class IincInsnNode extends AbstractInsnNode {
     /**
      * 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.
+     * @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);
@@ -79,4 +69,4 @@ public class IincInsnNode extends AbstractInsnNode {
     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
index 5198cfb..335fcb2 100644
--- a/src/main/asm/org/objectweb/asm/tree/InnerClassNode.java
+++ b/src/main/asm/org/objectweb/asm/tree/InnerClassNode.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -39,50 +31,43 @@ import org.objectweb.asm.ClassVisitor;
 public class InnerClassNode {
 
     /**
-     * The internal name of an inner class (see
-     * {@link org.objectweb.asm.Type#getInternalName() getInternalName}).
+     * 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>.
+     * {@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.
+     * 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.
+     * 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.
+     * @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) {
+    public InnerClassNode(final String name, final String outerName, final String innerName,
+            final int access) {
         this.name = name;
         this.outerName = outerName;
         this.innerName = innerName;
@@ -92,8 +77,7 @@ public class InnerClassNode {
     /**
      * Makes the given class visitor visit this inner class.
      * 
-     * @param cv
-     *            a class visitor.
+     * @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
index e3630c5..7c71858 100644
--- a/src/main/asm/org/objectweb/asm/tree/InsnList.java
+++ b/src/main/asm/org/objectweb/asm/tree/InsnList.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -35,8 +27,8 @@ 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>.
+ * A doubly linked list of {@link AbstractInsnNode} objects. <i>This implementation is not thread
+ * safe</i>.
  */
 public class InsnList {
 
@@ -56,8 +48,8 @@ public class InsnList {
     private AbstractInsnNode last;
 
     /**
-     * A cache of the instructions of this list. This cache is used to improve
-     * the performance of the {@link #get} method.
+     * A cache of the instructions of this list. This cache is used to improve the performance of
+     * the {@link #get} method.
      */
     AbstractInsnNode[] cache;
 
@@ -73,8 +65,7 @@ public class InsnList {
     /**
      * Returns the first instruction in this list.
      * 
-     * @return the first instruction in this list, or <tt>null</tt> if the list
-     *         is empty.
+     * @return the first instruction in this list, or <tt>null</tt> if the list is empty.
      */
     public AbstractInsnNode getFirst() {
         return first;
@@ -83,24 +74,21 @@ public class InsnList {
     /**
      * Returns the last instruction in this list.
      * 
-     * @return the last instruction in this list, or <tt>null</tt> if the list
-     *         is empty.
+     * @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.
+     * 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.
+     * @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()).
+     * @throws IndexOutOfBoundsException if (index < 0 || index >= size()).
      */
     public AbstractInsnNode get(final int index) {
         if (index < 0 || index >= size) {
@@ -113,12 +101,11 @@ public class InsnList {
     }
 
     /**
-     * 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.
+     * 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.
+     * @param insn an instruction.
      * @return <tt>true</tt> if the given instruction belongs to this list.
      */
     public boolean contains(final AbstractInsnNode insn) {
@@ -130,18 +117,16 @@ public class InsnList {
     }
 
     /**
-     * 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.
+     * 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.
+     * @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) {
@@ -153,8 +138,7 @@ public class InsnList {
     /**
      * Makes the given visitor visit all of the instructions in this list.
      * 
-     * @param mv
-     *            the method visitor that must visit the instructions.
+     * @param mv the method visitor that must visit the instructions.
      */
     public void accept(final MethodVisitor mv) {
         AbstractInsnNode insn = first;
@@ -203,11 +187,8 @@ public class InsnList {
     /**
      * 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>.
+     * @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;
@@ -239,9 +220,7 @@ public class InsnList {
     /**
      * Adds the given instruction to the end of this list.
      * 
-     * @param insn
-     *            an instruction, <i>which must not belong to any
-     *            {@link InsnList}</i>.
+     * @param insn an instruction, <i>which must not belong to any {@link InsnList}</i>.
      */
     public void add(final AbstractInsnNode insn) {
         ++size;
@@ -260,9 +239,8 @@ public class 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'.
+     * @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) {
@@ -285,9 +263,7 @@ public class InsnList {
     /**
      * Inserts the given instruction at the begining of this list.
      * 
-     * @param insn
-     *            an instruction, <i>which must not belong to any
-     *            {@link InsnList}</i>.
+     * @param insn an instruction, <i>which must not belong to any {@link InsnList}</i>.
      */
     public void insert(final AbstractInsnNode insn) {
         ++size;
@@ -306,9 +282,8 @@ public class 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'.
+     * @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) {
@@ -331,15 +306,11 @@ public class InsnList {
     /**
      * 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>.
+     * @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) {
+    public void insert(final AbstractInsnNode location, final AbstractInsnNode insn) {
         ++size;
         AbstractInsnNode next = location.next;
         if (next == null) {
@@ -357,12 +328,10 @@ public class 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'.
+     * @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) {
@@ -387,15 +356,11 @@ public class InsnList {
     /**
      * 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>.
+     * @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) {
+    public void insertBefore(final AbstractInsnNode location, final AbstractInsnNode insn) {
         ++size;
         AbstractInsnNode prev = location.prev;
         if (prev == null) {
@@ -413,15 +378,12 @@ public class 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'.
+     * @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) {
+    public void insertBefore(final AbstractInsnNode location, final InsnList insns) {
         if (insns.size == 0) {
             return;
         }
@@ -444,8 +406,7 @@ public class InsnList {
     /**
      * Removes the given instruction from this list.
      * 
-     * @param insn
-     *            the instruction <i>of this list</i> that must be removed.
+     * @param insn the instruction <i>of this list</i> that must be removed.
      */
     public void remove(final AbstractInsnNode insn) {
         --size;
@@ -477,9 +438,8 @@ public class InsnList {
     /**
      * Removes all of the instructions of this list.
      * 
-     * @param mark
-     *            if the instructions must be marked as no longer belonging to
-     *            any {@link InsnList}.
+     * @param mark if the instructions must be marked as no longer belonging to any
+     *        {@link InsnList}.
      */
     void removeAll(final boolean mark) {
         if (mark) {
@@ -506,9 +466,8 @@ public class InsnList {
     }
 
     /**
-     * Reset all labels in the instruction list. This method should be called
-     * before reusing same instructions list between several
-     * <code>ClassWriter</code>s.
+     * 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;
diff --git a/src/main/asm/org/objectweb/asm/tree/InsnNode.java b/src/main/asm/org/objectweb/asm/tree/InsnNode.java
index 7221098..8c547c6 100644
--- a/src/main/asm/org/objectweb/asm/tree/InsnNode.java
+++ b/src/main/asm/org/objectweb/asm/tree/InsnNode.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -43,22 +35,17 @@ 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.
+     * @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);
@@ -72,8 +59,7 @@ public class InsnNode extends AbstractInsnNode {
     /**
      * Makes the given visitor visit this instruction.
      * 
-     * @param mv
-     *            a method visitor.
+     * @param mv a method visitor.
      */
     @Override
     public void accept(final MethodVisitor mv) {
diff --git a/src/main/asm/org/objectweb/asm/tree/IntInsnNode.java b/src/main/asm/org/objectweb/asm/tree/IntInsnNode.java
index 9fa80df..9d58df8 100644
--- a/src/main/asm/org/objectweb/asm/tree/IntInsnNode.java
+++ b/src/main/asm/org/objectweb/asm/tree/IntInsnNode.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -48,11 +40,9 @@ public class IntInsnNode extends AbstractInsnNode {
     /**
      * 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.
+     * @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);
@@ -62,9 +52,7 @@ public class IntInsnNode extends AbstractInsnNode {
     /**
      * Sets the opcode of this instruction.
      * 
-     * @param opcode
-     *            the new instruction opcode. This opcode must be BIPUSH, SIPUSH
-     *            or NEWARRAY.
+     * @param opcode the new instruction opcode. This opcode must be BIPUSH, SIPUSH or NEWARRAY.
      */
     public void setOpcode(final int opcode) {
         this.opcode = opcode;
diff --git a/src/main/asm/org/objectweb/asm/tree/InvokeDynamicInsnNode.java b/src/main/asm/org/objectweb/asm/tree/InvokeDynamicInsnNode.java
index 2ae1d97..2f6bb10 100644
--- a/src/main/asm/org/objectweb/asm/tree/InvokeDynamicInsnNode.java
+++ b/src/main/asm/org/objectweb/asm/tree/InvokeDynamicInsnNode.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -65,17 +57,13 @@ public class InvokeDynamicInsnNode extends AbstractInsnNode {
     /**
      * 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.
+     * @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) {
+    public InvokeDynamicInsnNode(final String name, final String desc, final Handle bsm,
+            final Object... bsmArgs) {
         super(Opcodes.INVOKEDYNAMIC);
         this.name = name;
         this.desc = desc;
@@ -97,4 +85,4 @@ public class InvokeDynamicInsnNode extends AbstractInsnNode {
     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
index 9cb1dcb..7d66bc7 100644
--- a/src/main/asm/org/objectweb/asm/tree/JumpInsnNode.java
+++ b/src/main/asm/org/objectweb/asm/tree/JumpInsnNode.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -34,31 +26,27 @@ 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.
+ * 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.
+     * 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.
+     * @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);
@@ -68,11 +56,9 @@ public class JumpInsnNode extends AbstractInsnNode {
     /**
      * 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.
+     * @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;
diff --git a/src/main/asm/org/objectweb/asm/tree/LabelNode.java b/src/main/asm/org/objectweb/asm/tree/LabelNode.java
index b6381bd..3d6f8d5 100644
--- a/src/main/asm/org/objectweb/asm/tree/LabelNode.java
+++ b/src/main/asm/org/objectweb/asm/tree/LabelNode.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -75,4 +67,4 @@ public class LabelNode extends AbstractInsnNode {
     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
index 9209f46..b42a54a 100644
--- a/src/main/asm/org/objectweb/asm/tree/LdcInsnNode.java
+++ b/src/main/asm/org/objectweb/asm/tree/LdcInsnNode.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -42,19 +34,18 @@ import org.objectweb.asm.Opcodes;
 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}.
+     * 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}.
+     * @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);
@@ -75,4 +66,4 @@ public class LdcInsnNode extends AbstractInsnNode {
     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
index cda1694..5aa9ac7 100644
--- a/src/main/asm/org/objectweb/asm/tree/LineNumberNode.java
+++ b/src/main/asm/org/objectweb/asm/tree/LineNumberNode.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -34,16 +26,15 @@ 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.
+ * 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.
+     * A line number. This number refers to the source file from which the class was compiled.
      */
     public int line;
 
@@ -55,11 +46,9 @@ public class LineNumberNode extends AbstractInsnNode {
     /**
      * 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.
+     * @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);
diff --git a/src/main/asm/org/objectweb/asm/tree/LocalVariableNode.java b/src/main/asm/org/objectweb/asm/tree/LocalVariableNode.java
index 033f83e..427be1e 100644
--- a/src/main/asm/org/objectweb/asm/tree/LocalVariableNode.java
+++ b/src/main/asm/org/objectweb/asm/tree/LocalVariableNode.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -54,14 +46,12 @@ public class LocalVariableNode {
     public String signature;
 
     /**
-     * The first instruction corresponding to the scope of this local variable
-     * (inclusive).
+     * 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).
+     * The last instruction corresponding to the scope of this local variable (exclusive).
      */
     public LabelNode end;
 
@@ -73,24 +63,17 @@ public class LocalVariableNode {
     /**
      * 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.
+     * @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) {
+    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;
@@ -102,11 +85,9 @@ public class LocalVariableNode {
     /**
      * Makes the given visitor visit this local variable declaration.
      * 
-     * @param mv
-     *            a method visitor.
+     * @param mv a method visitor.
      */
     public void accept(final MethodVisitor mv) {
-        mv.visitLocalVariable(name, desc, signature, start.getLabel(),
-                end.getLabel(), index);
+        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
index c44c5ef..4a71255 100644
--- a/src/main/asm/org/objectweb/asm/tree/LookupSwitchInsnNode.java
+++ b/src/main/asm/org/objectweb/asm/tree/LookupSwitchInsnNode.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -56,29 +48,23 @@ public class LookupSwitchInsnNode extends AbstractInsnNode {
     public List<Integer> keys;
 
     /**
-     * Beginnings of the handler blocks. This list is a list of
-     * {@link LabelNode} objects.
+     * 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.
+     * @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) {
+    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);
+        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]));
@@ -109,8 +95,8 @@ public class LookupSwitchInsnNode extends AbstractInsnNode {
 
     @Override
     public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
-        LookupSwitchInsnNode clone = new LookupSwitchInsnNode(clone(dflt,
-                labels), null, clone(this.labels, 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
index bd3d4a6..6d93e74 100644
--- a/src/main/asm/org/objectweb/asm/tree/MethodInsnNode.java
+++ b/src/main/asm/org/objectweb/asm/tree/MethodInsnNode.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -34,8 +26,8 @@ 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.
+ * A node that represents a method instruction. A method instruction is an instruction that invokes
+ * a method.
  * 
  * @author Eric Bruneton
  */
@@ -60,21 +52,15 @@ public class MethodInsnNode extends AbstractInsnNode {
     /**
      * 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}).
+     * @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) {
+    public MethodInsnNode(final int opcode, final String owner, final String name,
+            final String desc) {
         super(opcode);
         this.owner = owner;
         this.name = name;
@@ -84,9 +70,8 @@ public class MethodInsnNode extends AbstractInsnNode {
     /**
      * Sets the opcode of this instruction.
      * 
-     * @param opcode
-     *            the new instruction opcode. This opcode must be INVOKEVIRTUAL,
-     *            INVOKESPECIAL, INVOKESTATIC or INVOKEINTERFACE.
+     * @param opcode the new instruction opcode. This opcode must be INVOKEVIRTUAL, INVOKESPECIAL,
+     *        INVOKESTATIC or INVOKEINTERFACE.
      */
     public void setOpcode(final int opcode) {
         this.opcode = opcode;
@@ -106,4 +91,4 @@ public class MethodInsnNode extends AbstractInsnNode {
     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
index bf380cf..d82f9c9 100644
--- a/src/main/asm/org/objectweb/asm/tree/MethodNode.java
+++ b/src/main/asm/org/objectweb/asm/tree/MethodNode.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -50,8 +42,8 @@ import org.objectweb.asm.Type;
 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.
+     * The method's access flags (see {@link Opcodes}). This field also indicates if the method is
+     * synthetic and/or deprecated.
      */
     public int access;
 
@@ -71,15 +63,14 @@ public class MethodNode extends MethodVisitor {
     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.
+     * 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>.
+     * 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
@@ -96,26 +87,25 @@ public class MethodNode extends MethodVisitor {
     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>.
+     * 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>.
+     * 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>.
+     * 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
@@ -123,8 +113,8 @@ public class MethodNode extends MethodVisitor {
     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>.
+     * 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
@@ -132,8 +122,7 @@ public class MethodNode extends MethodVisitor {
     public List<AnnotationNode>[] invisibleParameterAnnotations;
 
     /**
-     * The instructions of this method. This list is a list of
-     * {@link AbstractInsnNode} objects.
+     * The instructions of this method. This list is a list of {@link AbstractInsnNode} objects.
      * 
      * @associates org.objectweb.asm.tree.AbstractInsnNode
      * @label instructions
@@ -141,8 +130,8 @@ public class MethodNode extends MethodVisitor {
     public InsnList instructions;
 
     /**
-     * The try catch blocks of this method. This list is a list of
-     * {@link TryCatchBlockNode} objects.
+     * The try catch blocks of this method. This list is a list of {@link TryCatchBlockNode}
+     * objects.
      * 
      * @associates org.objectweb.asm.tree.TryCatchBlockNode
      */
@@ -159,8 +148,8 @@ public class MethodNode extends MethodVisitor {
     public int maxLocals;
 
     /**
-     * The local variables of this method. This list is a list of
-     * {@link LocalVariableNode} objects. May be <tt>null</tt>
+     * 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
      */
@@ -172,9 +161,8 @@ public class MethodNode extends MethodVisitor {
     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.
+     * 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);
@@ -183,9 +171,8 @@ public class MethodNode extends MethodVisitor {
     /**
      * Constructs an uninitialized {@link MethodNode}.
      * 
-     * @param api
-     *            the ASM API version implemented by this visitor. Must be one
-     *            of {@link Opcodes#ASM4}.
+     * @param api the ASM API version implemented by this visitor. Must be one of
+     *        {@link Opcodes#ASM4}.
      */
     public MethodNode(final int api) {
         super(api);
@@ -193,24 +180,17 @@ public class MethodNode extends MethodVisitor {
     }
 
     /**
-     * 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.
+     * 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>.
+     * @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) {
@@ -220,33 +200,24 @@ public class MethodNode extends MethodVisitor {
     /**
      * 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>.
+     * @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) {
+    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);
+        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);
@@ -274,8 +245,7 @@ public class MethodNode extends MethodVisitor {
     }
 
     @Override
-    public AnnotationVisitor visitAnnotation(final String desc,
-            final boolean visible) {
+    public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
         AnnotationNode an = new AnnotationNode(desc);
         if (visible) {
             if (visibleAnnotations == null) {
@@ -292,8 +262,8 @@ public class MethodNode extends MethodVisitor {
     }
 
     @Override
-    public AnnotationVisitor visitParameterAnnotation(final int parameter,
-            final String desc, final boolean visible) {
+    public AnnotationVisitor visitParameterAnnotation(final int parameter, final String desc,
+            final boolean visible) {
         AnnotationNode an = new AnnotationNode(desc);
         if (visible) {
             if (visibleParameterAnnotations == null) {
@@ -301,8 +271,7 @@ public class MethodNode extends MethodVisitor {
                 visibleParameterAnnotations = (List<AnnotationNode>[]) new List<?>[params];
             }
             if (visibleParameterAnnotations[parameter] == null) {
-                visibleParameterAnnotations[parameter] = new ArrayList<AnnotationNode>(
-                        1);
+                visibleParameterAnnotations[parameter] = new ArrayList<AnnotationNode>(1);
             }
             visibleParameterAnnotations[parameter].add(an);
         } else {
@@ -311,8 +280,7 @@ public class MethodNode extends MethodVisitor {
                 invisibleParameterAnnotations = (List<AnnotationNode>[]) new List<?>[params];
             }
             if (invisibleParameterAnnotations[parameter] == null) {
-                invisibleParameterAnnotations[parameter] = new ArrayList<AnnotationNode>(
-                        1);
+                invisibleParameterAnnotations[parameter] = new ArrayList<AnnotationNode>(1);
             }
             invisibleParameterAnnotations[parameter].add(an);
         }
@@ -328,15 +296,13 @@ public class MethodNode extends MethodVisitor {
     }
 
     @Override
-    public void visitCode() {
-    }
+    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)));
+    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
@@ -360,20 +326,19 @@ public class MethodNode extends MethodVisitor {
     }
 
     @Override
-    public void visitFieldInsn(final int opcode, final String owner,
-            final String name, final String desc) {
+    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) {
+    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) {
+    public void visitInvokeDynamicInsn(String name, String desc, Handle bsm, Object... bsmArgs) {
         instructions.add(new InvokeDynamicInsnNode(name, desc, bsm, bsmArgs));
     }
 
@@ -398,17 +363,15 @@ public class MethodNode extends MethodVisitor {
     }
 
     @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)));
+    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)));
+    public void visitLookupSwitchInsn(final Label dflt, final int[] keys, final Label[] labels) {
+        instructions.add(new LookupSwitchInsnNode(getLabelNode(dflt), keys, getLabelNodes(labels)));
     }
 
     @Override
@@ -417,18 +380,17 @@ public class MethodNode extends MethodVisitor {
     }
 
     @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));
+    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));
+    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
@@ -443,17 +405,14 @@ public class MethodNode extends MethodVisitor {
     }
 
     @Override
-    public void visitEnd() {
-    }
+    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.
+     * 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.
+     * @param l a Label.
      * @return the LabelNode corresponding to l.
      */
     protected LabelNode getLabelNode(final Label l) {
@@ -488,13 +447,11 @@ public class MethodNode extends MethodVisitor {
     // ------------------------------------------------------------------------
 
     /**
-     * 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.
+     * 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}.
+     * @param api an ASM API version. Must be one of {@link Opcodes#ASM4}.
      */
     public void check(final int api) {
         // nothing to do
@@ -503,14 +460,12 @@ public class MethodNode extends MethodVisitor {
     /**
      * Makes the given class visitor visit this method.
      * 
-     * @param cv
-     *            a class visitor.
+     * @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);
+        MethodVisitor mv = cv.visitMethod(access, name, desc, signature, exceptions);
         if (mv != null) {
             accept(mv);
         }
@@ -519,8 +474,7 @@ public class MethodNode extends MethodVisitor {
     /**
      * Makes the given method visitor visit this method.
      * 
-     * @param mv
-     *            a method visitor.
+     * @param mv a method visitor.
      */
     public void accept(final MethodVisitor mv) {
         // visits the method attributes
@@ -542,8 +496,7 @@ public class MethodNode extends MethodVisitor {
             AnnotationNode an = invisibleAnnotations.get(i);
             an.accept(mv.visitAnnotation(an.desc, false));
         }
-        n = visibleParameterAnnotations == null ? 0
-                : visibleParameterAnnotations.length;
+        n = visibleParameterAnnotations == null ? 0 : visibleParameterAnnotations.length;
         for (i = 0; i < n; ++i) {
             List<?> l = visibleParameterAnnotations[i];
             if (l == null) {
@@ -554,8 +507,7 @@ public class MethodNode extends MethodVisitor {
                 an.accept(mv.visitParameterAnnotation(i, an.desc, true));
             }
         }
-        n = invisibleParameterAnnotations == null ? 0
-                : invisibleParameterAnnotations.length;
+        n = invisibleParameterAnnotations == null ? 0 : invisibleParameterAnnotations.length;
         for (i = 0; i < n; ++i) {
             List<?> l = invisibleParameterAnnotations[i];
             if (l == null) {
diff --git a/src/main/asm/org/objectweb/asm/tree/MultiANewArrayInsnNode.java b/src/main/asm/org/objectweb/asm/tree/MultiANewArrayInsnNode.java
index 4954890..0e656a6 100644
--- a/src/main/asm/org/objectweb/asm/tree/MultiANewArrayInsnNode.java
+++ b/src/main/asm/org/objectweb/asm/tree/MultiANewArrayInsnNode.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -54,10 +46,8 @@ public class MultiANewArrayInsnNode extends AbstractInsnNode {
     /**
      * 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.
+     * @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);
@@ -80,4 +70,4 @@ public class MultiANewArrayInsnNode extends AbstractInsnNode {
         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
index 3b47340..2e73b7d 100644
--- a/src/main/asm/org/objectweb/asm/tree/TableSwitchInsnNode.java
+++ b/src/main/asm/org/objectweb/asm/tree/TableSwitchInsnNode.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -61,26 +53,21 @@ public class TableSwitchInsnNode extends AbstractInsnNode {
     public LabelNode dflt;
 
     /**
-     * Beginnings of the handler blocks. This list is a list of
-     * {@link LabelNode} objects.
+     * 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.
+     * @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) {
+    public TableSwitchInsnNode(final int min, final int max, final LabelNode dflt,
+            final LabelNode... labels) {
         super(Opcodes.TABLESWITCH);
         this.min = min;
         this.max = max;
@@ -107,7 +94,6 @@ public class TableSwitchInsnNode extends AbstractInsnNode {
 
     @Override
     public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
-        return new TableSwitchInsnNode(min, max, clone(dflt, labels), clone(
-                this.labels, 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
index e859d2b..cc8fe58 100644
--- a/src/main/asm/org/objectweb/asm/tree/TryCatchBlockNode.java
+++ b/src/main/asm/org/objectweb/asm/tree/TryCatchBlockNode.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -54,27 +46,22 @@ public class TryCatchBlockNode {
     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).
+     * 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).
+     * @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) {
+    public TryCatchBlockNode(final LabelNode start, final LabelNode end, final LabelNode handler,
+            final String type) {
         this.start = start;
         this.end = end;
         this.handler = handler;
@@ -84,8 +71,7 @@ public class TryCatchBlockNode {
     /**
      * Makes the given visitor visit this try catch block.
      * 
-     * @param mv
-     *            a method visitor.
+     * @param mv a method visitor.
      */
     public void accept(final MethodVisitor mv) {
         mv.visitTryCatchBlock(start.getLabel(), end.getLabel(),
diff --git a/src/main/asm/org/objectweb/asm/tree/TypeInsnNode.java b/src/main/asm/org/objectweb/asm/tree/TypeInsnNode.java
index 85e0dc1..0051daf 100644
--- a/src/main/asm/org/objectweb/asm/tree/TypeInsnNode.java
+++ b/src/main/asm/org/objectweb/asm/tree/TypeInsnNode.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -34,8 +26,8 @@ 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.
+ * A node that represents a type instruction. A type instruction is an instruction that takes a type
+ * descriptor as parameter.
  * 
  * @author Eric Bruneton
  */
@@ -50,12 +42,10 @@ public class TypeInsnNode extends AbstractInsnNode {
     /**
      * 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}).
+     * @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);
@@ -65,9 +55,8 @@ public class TypeInsnNode extends AbstractInsnNode {
     /**
      * Sets the opcode of this instruction.
      * 
-     * @param opcode
-     *            the new instruction opcode. This opcode must be NEW,
-     *            ANEWARRAY, CHECKCAST or INSTANCEOF.
+     * @param opcode the new instruction opcode. This opcode must be NEW, ANEWARRAY, CHECKCAST or
+     *        INSTANCEOF.
      */
     public void setOpcode(final int opcode) {
         this.opcode = opcode;
@@ -87,4 +76,4 @@ public class TypeInsnNode extends AbstractInsnNode {
     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
index a82266d..fb41084 100644
--- a/src/main/asm/org/objectweb/asm/tree/VarInsnNode.java
+++ b/src/main/asm/org/objectweb/asm/tree/VarInsnNode.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -34,30 +26,26 @@ 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.
+ * 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.
+     * 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.
+     * @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);
@@ -67,10 +55,8 @@ public class VarInsnNode extends AbstractInsnNode {
     /**
      * 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.
+     * @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;
@@ -90,4 +76,4 @@ public class VarInsnNode extends AbstractInsnNode {
     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
index 90aed9b..463e198 100644
--- a/src/main/asm/org/objectweb/asm/tree/analysis/Analyzer.java
+++ b/src/main/asm/org/objectweb/asm/tree/analysis/Analyzer.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -48,11 +40,10 @@ 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>
+ * 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.
+ * @param <V> type of the Value used for the analysis.
  * 
  * @author Eric Bruneton
  */
@@ -79,9 +70,8 @@ public class Analyzer<V extends Value> implements Opcodes {
     /**
      * Constructs a new {@link Analyzer}.
      * 
-     * @param interpreter
-     *            the interpreter to be used to symbolically interpret the
-     *            bytecode instructions.
+     * @param interpreter the interpreter to be used to symbolically interpret the bytecode
+     *        instructions.
      */
     public Analyzer(final Interpreter<V> interpreter) {
         this.interpreter = interpreter;
@@ -90,20 +80,15 @@ public class Analyzer<V extends Value> implements Opcodes {
     /**
      * 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.
+     * @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 {
+    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;
@@ -190,8 +175,7 @@ public class Analyzer<V extends Value> implements Opcodes {
                 int insnOpcode = insnNode.getOpcode();
                 int insnType = insnNode.getType();
 
-                if (insnType == AbstractInsnNode.LABEL
-                        || insnType == AbstractInsnNode.LINE
+                if (insnType == AbstractInsnNode.LABEL || insnType == AbstractInsnNode.LINE
                         || insnType == AbstractInsnNode.FRAME) {
                     merge(insn + 1, f, subroutine);
                     newControlFlowEdge(insn, insn + 1);
@@ -207,8 +191,7 @@ public class Analyzer<V extends Value> implements Opcodes {
                         }
                         int jump = insns.indexOf(j.label);
                         if (insnOpcode == JSR) {
-                            merge(jump, current, new Subroutine(j.label,
-                                    m.maxLocals, j));
+                            merge(jump, current, new Subroutine(j.label, m.maxLocals, j));
                         } else {
                             merge(jump, current, subroutine);
                         }
@@ -244,8 +227,8 @@ public class Analyzer<V extends Value> implements Opcodes {
                             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);
+                                merge(call + 1, frames[call], current, subroutines[call],
+                                        subroutine.access);
                                 newControlFlowEdge(insn, call + 1);
                             }
                         }
@@ -256,8 +239,7 @@ public class Analyzer<V extends Value> implements Opcodes {
                                 int var = ((VarInsnNode) insnNode).var;
                                 subroutine.access[var] = true;
                                 if (insnOpcode == LLOAD || insnOpcode == DLOAD
-                                        || insnOpcode == LSTORE
-                                        || insnOpcode == DSTORE) {
+                                        || insnOpcode == LSTORE || insnOpcode == DSTORE) {
                                     subroutine.access[var + 1] = true;
                                 }
                             } else if (insnNode instanceof IincInsnNode) {
@@ -290,23 +272,22 @@ public class Analyzer<V extends Value> implements Opcodes {
                     }
                 }
             } catch (AnalyzerException e) {
-                throw new AnalyzerException(e.node, "Error at instruction "
-                        + insn + ": " + e.getMessage(), 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);
+                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 {
+    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");
+                throw new AnalyzerException(null, "Execution can fall off end of the code");
             }
             if (subroutines[insn] != null) {
                 return;
@@ -350,33 +331,31 @@ public class Analyzer<V extends Value> implements Opcodes {
 
             // 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;
+                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.
+     * 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.
+     * @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;
@@ -385,9 +364,7 @@ public class Analyzer<V extends Value> implements Opcodes {
     /**
      * Returns the exception handlers for the given instruction.
      * 
-     * @param insn
-     *            the index of an instruction of the last recently analyzed
-     *            method.
+     * @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) {
@@ -395,27 +372,20 @@ public class Analyzer<V extends Value> implements Opcodes {
     }
 
     /**
-     * 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.
+     * 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.
+     * @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 {
-    }
+    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.
+     * @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) {
@@ -425,8 +395,7 @@ public class Analyzer<V extends Value> implements Opcodes {
     /**
      * Constructs a new frame that is identical to the given frame.
      * 
-     * @param src
-     *            a frame.
+     * @param src a frame.
      * @return the created frame.
      */
     protected Frame<V> newFrame(final Frame<? extends V> src) {
@@ -434,67 +403,52 @@ public class Analyzer<V extends Value> implements Opcodes {
     }
 
     /**
-     * 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).
+     * 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.
+     * @param insn an instruction index.
+     * @param successor index of a successor instruction.
      */
-    protected void newControlFlowEdge(final int insn, final int successor) {
-    }
+    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).
+     * 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.
+     * @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) {
+    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).
+     * 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)}.
+     * @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) {
+    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 {
+    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;
@@ -522,9 +476,8 @@ public class Analyzer<V extends Value> implements Opcodes {
         }
     }
 
-    private void merge(final int insn, final Frame<V> beforeJSR,
-            final Frame<V> afterRET, final Subroutine subroutineBeforeJSR,
-            final boolean[] access) throws AnalyzerException {
+    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;
diff --git a/src/main/asm/org/objectweb/asm/tree/analysis/AnalyzerException.java b/src/main/asm/org/objectweb/asm/tree/analysis/AnalyzerException.java
index 5be70da..d9609f5 100644
--- a/src/main/asm/org/objectweb/asm/tree/analysis/AnalyzerException.java
+++ b/src/main/asm/org/objectweb/asm/tree/analysis/AnalyzerException.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -52,10 +44,10 @@ public class AnalyzerException extends 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);
+    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
index 119bec2..44eba5d 100644
--- a/src/main/asm/org/objectweb/asm/tree/analysis/BasicInterpreter.java
+++ b/src/main/asm/org/objectweb/asm/tree/analysis/BasicInterpreter.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -49,8 +41,7 @@ import org.objectweb.asm.tree.TypeInsnNode;
  * @author Eric Bruneton
  * @author Bing Ran
  */
-public class BasicInterpreter extends Interpreter<BasicValue> implements
-        Opcodes {
+public class BasicInterpreter extends Interpreter<BasicValue> implements Opcodes {
 
     public BasicInterpreter() {
         super(ASM4);
@@ -66,265 +57,258 @@ public class BasicInterpreter extends Interpreter<BasicValue> implements
             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) {
+            case Type.VOID:
+                return null;
+            case Type.BOOLEAN:
+            case Type.CHAR:
+            case Type.BYTE:
+            case Type.SHORT:
+            case Type.INT:
                 return BasicValue.INT_VALUE;
-            } else if (cst instanceof Float) {
+            case Type.FLOAT:
                 return BasicValue.FLOAT_VALUE;
-            } else if (cst instanceof Long) {
+            case Type.LONG:
                 return BasicValue.LONG_VALUE;
-            } else if (cst instanceof Double) {
+            case Type.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.");
+            case Type.ARRAY:
+            case Type.OBJECT:
+                return BasicValue.REFERENCE_VALUE;
+            default:
+                throw new Error("Internal error");
         }
     }
 
     @Override
-    public BasicValue copyOperation(final AbstractInsnNode insn,
-            final BasicValue value) throws AnalyzerException {
+    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)
+    public BasicValue unaryOperation(final AbstractInsnNode insn, final BasicValue value)
             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.");
+            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 ternaryOperation(final AbstractInsnNode insn,
-            final BasicValue value1, final BasicValue value2,
-            final BasicValue value3) throws AnalyzerException {
+    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;
     }
 
@@ -335,18 +319,15 @@ public class BasicInterpreter extends Interpreter<BasicValue> implements
         if (opcode == MULTIANEWARRAY) {
             return newValue(Type.getType(((MultiANewArrayInsnNode) insn).desc));
         } else if (opcode == INVOKEDYNAMIC) {
-            return newValue(Type
-                    .getReturnType(((InvokeDynamicInsnNode) insn).desc));
+            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 {
-    }
+    public void returnOperation(final AbstractInsnNode insn, final BasicValue value,
+            final BasicValue expected) throws AnalyzerException {}
 
     @Override
     public BasicValue merge(final BasicValue v, final BasicValue w) {
diff --git a/src/main/asm/org/objectweb/asm/tree/analysis/BasicValue.java b/src/main/asm/org/objectweb/asm/tree/analysis/BasicValue.java
index 78316ae..1a411e1 100644
--- a/src/main/asm/org/objectweb/asm/tree/analysis/BasicValue.java
+++ b/src/main/asm/org/objectweb/asm/tree/analysis/BasicValue.java
@@ -1,40 +1,31 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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.
+ * 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
  */
@@ -48,14 +39,12 @@ public class BasicValue implements Value {
 
     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 DOUBLE_VALUE = new BasicValue(Type.DOUBLE_TYPE);
 
-    public static final BasicValue REFERENCE_VALUE = new BasicValue(
-            Type.getObjectType("java/lang/Object"));
+    public static final BasicValue REFERENCE_VALUE =
+            new BasicValue(Type.getObjectType("java/lang/Object"));
 
-    public static final BasicValue RETURNADDRESS_VALUE = new BasicValue(
-            Type.VOID_TYPE);
+    public static final BasicValue RETURNADDRESS_VALUE = new BasicValue(Type.VOID_TYPE);
 
     private final Type type;
 
@@ -72,8 +61,7 @@ public class BasicValue implements Value {
     }
 
     public boolean isReference() {
-        return type != null
-                && (type.getSort() == Type.OBJECT || type.getSort() == Type.ARRAY);
+        return type != null && (type.getSort() == Type.OBJECT || type.getSort() == Type.ARRAY);
     }
 
     @Override
diff --git a/src/main/asm/org/objectweb/asm/tree/analysis/BasicVerifier.java b/src/main/asm/org/objectweb/asm/tree/analysis/BasicVerifier.java
index 68ab2f5..cd60ef5 100644
--- a/src/main/asm/org/objectweb/asm/tree/analysis/BasicVerifier.java
+++ b/src/main/asm/org/objectweb/asm/tree/analysis/BasicVerifier.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -38,8 +30,7 @@ import org.objectweb.asm.tree.InvokeDynamicInsnNode;
 import org.objectweb.asm.tree.MethodInsnNode;
 
 /**
- * An extended {@link BasicInterpreter} that checks that bytecode instructions
- * are correctly used.
+ * An extended {@link BasicInterpreter} that checks that bytecode instructions are correctly used.
  * 
  * @author Eric Bruneton
  * @author Bing Ran
@@ -55,41 +46,39 @@ public class BasicVerifier extends BasicInterpreter {
     }
 
     @Override
-    public BasicValue copyOperation(final AbstractInsnNode insn,
-            final BasicValue value) throws AnalyzerException {
+    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;
+            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);
@@ -98,85 +87,81 @@ public class BasicVerifier extends BasicInterpreter {
     }
 
     @Override
-    public BasicValue unaryOperation(final AbstractInsnNode insn,
-            final BasicValue value) throws AnalyzerException {
+    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.");
+            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);
@@ -185,125 +170,122 @@ public class BasicVerifier extends BasicInterpreter {
     }
 
     @Override
-    public BasicValue binaryOperation(final AbstractInsnNode insn,
-            final BasicValue value1, final BasicValue value2)
-            throws AnalyzerException {
+    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.");
+            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);
+            throw new AnalyzerException(insn, "First argument", expected1, value1);
         } else if (!isSubTypeOf(value2, expected2)) {
-            throw new AnalyzerException(insn, "Second argument", expected2,
-                    value2);
+            throw new AnalyzerException(insn, "Second argument", expected2, value2);
         }
         if (insn.getOpcode() == AALOAD) {
             return getElementValue(value1);
@@ -313,60 +295,57 @@ public class BasicVerifier extends BasicInterpreter {
     }
 
     @Override
-    public BasicValue ternaryOperation(final AbstractInsnNode insn,
-            final BasicValue value1, final BasicValue value2,
-            final BasicValue value3) throws AnalyzerException {
+    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.");
+            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);
+            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);
+            throw new AnalyzerException(insn, "Second argument", BasicValue.INT_VALUE, value2);
         } else if (!isSubTypeOf(value3, expected3)) {
-            throw new AnalyzerException(insn, "Third argument", expected3,
-                    value3);
+            throw new AnalyzerException(insn, "Third argument", expected3, value3);
         }
         return null;
     }
@@ -378,8 +357,7 @@ public class BasicVerifier extends BasicInterpreter {
         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));
+                    throw new AnalyzerException(insn, null, BasicValue.INT_VALUE, values.get(i));
                 }
             }
         } else {
@@ -388,8 +366,8 @@ public class BasicVerifier extends BasicInterpreter {
             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));
+                    throw new AnalyzerException(insn, "Method owner", newValue(owner),
+                            values.get(0));
                 }
             }
             String desc = (opcode == INVOKEDYNAMIC) ? ((InvokeDynamicInsnNode) insn).desc
@@ -399,8 +377,7 @@ public class BasicVerifier extends BasicInterpreter {
                 BasicValue expected = newValue(args[j++]);
                 BasicValue encountered = values.get(i++);
                 if (!isSubTypeOf(encountered, expected)) {
-                    throw new AnalyzerException(insn, "Argument " + j,
-                            expected, encountered);
+                    throw new AnalyzerException(insn, "Argument " + j, expected, encountered);
                 }
             }
         }
@@ -408,12 +385,10 @@ public class BasicVerifier extends BasicInterpreter {
     }
 
     @Override
-    public void returnOperation(final AbstractInsnNode insn,
-            final BasicValue value, final BasicValue expected)
-            throws AnalyzerException {
+    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);
+            throw new AnalyzerException(insn, "Incompatible return type", expected, value);
         }
     }
 
@@ -426,8 +401,7 @@ public class BasicVerifier extends BasicInterpreter {
         return BasicValue.REFERENCE_VALUE;
     }
 
-    protected boolean isSubTypeOf(final BasicValue value,
-            final BasicValue expected) {
+    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
index 4428933..345ddf2 100644
--- a/src/main/asm/org/objectweb/asm/tree/analysis/Frame.java
+++ b/src/main/asm/org/objectweb/asm/tree/analysis/Frame.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -42,10 +34,9 @@ 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.
+ * 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.
  * 
@@ -53,652 +44,654 @@ import org.objectweb.asm.tree.VarInsnNode;
  */
 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 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 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 local variables of this frame.
+     */
+    private int locals;
 
-	/**
-	 * The number of elements in the operand stack.
-	 */
-	private int top;
+    /**
+     * 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 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);
-	}
+    /**
+     * 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;
-	}
+    /**
+     * 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;
-	}
+    /**
+     * 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 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];
-	}
+    /**
+     * 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;
-	}
+    /**
+     * 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 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];
-	}
+    /**
+     * 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;
-	}
+    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;
-	}
+    /**
+     * 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];
-	}
+    /**
+     * 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;
-	}
+    /**
+     * 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;
+    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());
-		}
-	}
+        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.
+     * 
+     * @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;
-	}
+    /**
+     * 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();
-	}
+    /**
+     * 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
index 94e08ea..e4753b5 100644
--- a/src/main/asm/org/objectweb/asm/tree/analysis/Interpreter.java
+++ b/src/main/asm/org/objectweb/asm/tree/analysis/Interpreter.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -35,15 +27,13 @@ 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.
+ * 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.
+ * @param <V> type of the Value used for the analysis.
  * 
  * @author Eric Bruneton
  */
@@ -58,169 +48,133 @@ public abstract class Interpreter<V extends Value> {
     /**
      * 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.
+     * 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.
+     * @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:
+     * 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
+     * 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.
+     * @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.
+     * @throws AnalyzerException if an error occured during the interpretation.
      */
-    public abstract V newOperation(AbstractInsnNode insn)
-            throws AnalyzerException;
+    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:
+     * 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
+     * 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.
+     * @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;
+    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:
+     * 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
+     * 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.
+     * @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.
+     * @throws AnalyzerException if an error occured during the interpretation.
      */
-    public abstract V unaryOperation(AbstractInsnNode insn, V value)
-            throws AnalyzerException;
+    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:
+     * 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
+     * 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.
+     * @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.
+     * @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:
+     * 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.
+     * @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.
+     * @throws AnalyzerException if an error occured during the interpretation.
      */
-    public abstract V ternaryOperation(AbstractInsnNode insn, V value1,
-            V value2, V value3) throws AnalyzerException;
+    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:
+     * 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
+     * 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.
+     * @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.
+     * @throws AnalyzerException if an error occured during the interpretation.
      */
-    public abstract V naryOperation(AbstractInsnNode insn,
-            List<? extends V> values) throws AnalyzerException;
+    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:
+     * 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.
+     * @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;
+    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).
+     * 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>.
+     * @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
index a127c17..e336e6e 100644
--- a/src/main/asm/org/objectweb/asm/tree/analysis/SimpleVerifier.java
+++ b/src/main/asm/org/objectweb/asm/tree/analysis/SimpleVerifier.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -34,9 +26,9 @@ 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}).
+ * 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
@@ -76,43 +68,33 @@ public class SimpleVerifier extends BasicVerifier {
     }
 
     /**
-     * Constructs a new {@link SimpleVerifier} to verify a specific class. This
-     * class will not be loaded into the JVM since it may be incorrect.
+     * 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.
+     * @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) {
+    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.
+     * 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.
+     * @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,
+    public SimpleVerifier(final Type currentClass, final Type currentSuperClass,
             final List<Type> currentClassInterfaces, final boolean isInterface) {
-        this(ASM4, currentClass, currentSuperClass, currentClassInterfaces,
-                isInterface);
+        this(ASM4, currentClass, currentSuperClass, currentClassInterfaces, isInterface);
     }
 
-    protected SimpleVerifier(final int api, final Type currentClass,
-            final Type currentSuperClass,
+    protected SimpleVerifier(final int api, final Type currentClass, final Type currentSuperClass,
             final List<Type> currentClassInterfaces, final boolean isInterface) {
         super(api);
         this.currentClass = currentClass;
@@ -122,12 +104,10 @@ public class SimpleVerifier extends BasicVerifier {
     }
 
     /**
-     * Set the <code>ClassLoader</code> which will be used to load referenced
-     * classes. This is useful if you are verifying multiple interdependent
-     * classes.
+     * 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
+     * @param loader a <code>ClassLoader</code> to use
      */
     public void setClassLoader(final ClassLoader loader) {
         this.loader = loader;
@@ -142,11 +122,11 @@ public class SimpleVerifier extends BasicVerifier {
         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);
+                case Type.BOOLEAN:
+                case Type.CHAR:
+                case Type.BYTE:
+                case Type.SHORT:
+                    return new BasicValue(type);
             }
         }
 
@@ -169,8 +149,7 @@ public class SimpleVerifier extends BasicVerifier {
     @Override
     protected boolean isArrayValue(final BasicValue value) {
         Type t = value.getType();
-        return t != null
-                && ("Lnull;".equals(t.getDescriptor()) || t.getSort() == Type.ARRAY);
+        return t != null && ("Lnull;".equals(t.getDescriptor()) || t.getSort() == Type.ARRAY);
     }
 
     @Override
@@ -179,8 +158,7 @@ public class SimpleVerifier extends BasicVerifier {
         Type arrayType = objectArrayValue.getType();
         if (arrayType != null) {
             if (arrayType.getSort() == Type.ARRAY) {
-                return newValue(Type.getType(arrayType.getDescriptor()
-                        .substring(1)));
+                return newValue(Type.getType(arrayType.getDescriptor().substring(1)));
             } else if ("Lnull;".equals(arrayType.getDescriptor())) {
                 return objectArrayValue;
             }
@@ -189,28 +167,26 @@ public class SimpleVerifier extends BasicVerifier {
     }
 
     @Override
-    protected boolean isSubTypeOf(final BasicValue value,
-            final BasicValue expected) {
+    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");
+            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");
         }
     }
 
@@ -219,10 +195,8 @@ public class SimpleVerifier extends BasicVerifier {
         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 (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;
                     }
@@ -279,8 +253,7 @@ public class SimpleVerifier extends BasicVerifier {
                 return false;
             } else {
                 if (isInterface) {
-                    return u.getSort() == Type.OBJECT
-                            || u.getSort() == Type.ARRAY;
+                    return u.getSort() == Type.OBJECT || u.getSort() == Type.ARRAY;
                 }
                 return isAssignableFrom(t, getSuperClass(u));
             }
@@ -309,8 +282,7 @@ public class SimpleVerifier extends BasicVerifier {
     protected Class<?> getClass(final Type t) {
         try {
             if (t.getSort() == Type.ARRAY) {
-                return Class.forName(t.getDescriptor().replace('/', '.'),
-                        false, loader);
+                return Class.forName(t.getDescriptor().replace('/', '.'), false, loader);
             }
             return Class.forName(t.getClassName(), false, loader);
         } catch (ClassNotFoundException e) {
diff --git a/src/main/asm/org/objectweb/asm/tree/analysis/SmallSet.java b/src/main/asm/org/objectweb/asm/tree/analysis/SmallSet.java
index 0cf6ccf..26c5181 100644
--- a/src/main/asm/org/objectweb/asm/tree/analysis/SmallSet.java
+++ b/src/main/asm/org/objectweb/asm/tree/analysis/SmallSet.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -87,8 +79,7 @@ class SmallSet<E> extends AbstractSet<E> implements Iterator<E> {
         return e;
     }
 
-    public void remove() {
-    }
+    public void remove() {}
 
     // -------------------------------------------------------------------------
     // Utility methods
diff --git a/src/main/asm/org/objectweb/asm/tree/analysis/SourceInterpreter.java b/src/main/asm/org/objectweb/asm/tree/analysis/SourceInterpreter.java
index 60969b3..2fb9583 100644
--- a/src/main/asm/org/objectweb/asm/tree/analysis/SourceInterpreter.java
+++ b/src/main/asm/org/objectweb/asm/tree/analysis/SourceInterpreter.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -46,8 +38,7 @@ import org.objectweb.asm.tree.MethodInsnNode;
  * 
  * @author Eric Bruneton
  */
-public class SourceInterpreter extends Interpreter<SourceValue> implements
-        Opcodes {
+public class SourceInterpreter extends Interpreter<SourceValue> implements Opcodes {
 
     public SourceInterpreter() {
         super(ASM4);
@@ -69,90 +60,87 @@ public class SourceInterpreter extends Interpreter<SourceValue> implements
     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;
+            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) {
+    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) {
+    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;
+            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) {
+    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;
+            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) {
+    public SourceValue ternaryOperation(final AbstractInsnNode insn, final SourceValue value1,
+            final SourceValue value2, final SourceValue value3) {
         return new SourceValue(1, insn);
     }
 
@@ -172,9 +160,8 @@ public class SourceInterpreter extends Interpreter<SourceValue> implements
     }
 
     @Override
-    public void returnOperation(final AbstractInsnNode insn,
-            final SourceValue value, final SourceValue expected) {
-    }
+    public void returnOperation(final AbstractInsnNode insn, final SourceValue value,
+            final SourceValue expected) {}
 
     @Override
     public SourceValue merge(final SourceValue d, final SourceValue w) {
diff --git a/src/main/asm/org/objectweb/asm/tree/analysis/SourceValue.java b/src/main/asm/org/objectweb/asm/tree/analysis/SourceValue.java
index f87fc9e..64b48fa 100644
--- a/src/main/asm/org/objectweb/asm/tree/analysis/SourceValue.java
+++ b/src/main/asm/org/objectweb/asm/tree/analysis/SourceValue.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -34,8 +26,8 @@ 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.
+ * 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
  */
@@ -47,9 +39,9 @@ public class SourceValue implements 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:
+     * 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;
@@ -64,7 +56,7 @@ public class SourceValue implements Value {
     public final Set<AbstractInsnNode> insns;
 
     public SourceValue(final int size) {
-        this(size, SmallSet.<AbstractInsnNode> emptySet());
+        this(size, SmallSet.<AbstractInsnNode>emptySet());
     }
 
     public SourceValue(final int size, final AbstractInsnNode insn) {
diff --git a/src/main/asm/org/objectweb/asm/tree/analysis/Subroutine.java b/src/main/asm/org/objectweb/asm/tree/analysis/Subroutine.java
index 2739671..6b31e26 100644
--- a/src/main/asm/org/objectweb/asm/tree/analysis/Subroutine.java
+++ b/src/main/asm/org/objectweb/asm/tree/analysis/Subroutine.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -48,11 +40,9 @@ class Subroutine {
 
     List<JumpInsnNode> callers;
 
-    private Subroutine() {
-    }
+    private Subroutine() {}
 
-    Subroutine(final LabelNode start, final int maxLocals,
-            final JumpInsnNode caller) {
+    Subroutine(final LabelNode start, final int maxLocals, final JumpInsnNode caller) {
         this.start = start;
         this.access = new boolean[maxLocals];
         this.callers = new ArrayList<JumpInsnNode>();
@@ -87,4 +77,4 @@ class Subroutine {
         }
         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
index 7545dce..034b7e4 100644
--- a/src/main/asm/org/objectweb/asm/tree/analysis/Value.java
+++ b/src/main/asm/org/objectweb/asm/tree/analysis/Value.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
diff --git a/src/main/asm/org/objectweb/asm/util/ASMifiable.java b/src/main/asm/org/objectweb/asm/util/ASMifiable.java
index dcefe67..2405d67 100644
--- a/src/main/asm/org/objectweb/asm/util/ASMifiable.java
+++ b/src/main/asm/org/objectweb/asm/util/ASMifiable.java
@@ -1,31 +1,23 @@
 /**
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -34,8 +26,8 @@ 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.
+ * An {@link org.objectweb.asm.Attribute Attribute} that can print the ASM code to create an
+ * equivalent attribute.
  * 
  * @author Eugene Kuleshov
  */
@@ -44,13 +36,9 @@ 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.
+     * @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
index e08db92..7a5db19 100644
--- a/src/main/asm/org/objectweb/asm/util/ASMifier.java
+++ b/src/main/asm/org/objectweb/asm/util/ASMifier.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -63,15 +55,14 @@ public class ASMifier extends Printer {
      */
     protected final int id;
     /**
-     * The label names. This map associates String values to Label keys. It is
-     * used only in ASMifierMethodVisitor.
+     * 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.
+     * 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);
@@ -80,11 +71,10 @@ public class ASMifier extends Printer {
     /**
      * Constructs a new {@link ASMifier}.
      *
-     * @param api  the ASM API version implemented by this class. Must be one of
-     *             {@link Opcodes#ASM4}.
+     * @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.
+     * @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);
@@ -93,8 +83,7 @@ public class ASMifier extends Printer {
     }
 
     /**
-     * Prints the ASM source code to generate the given class to the standard
-     * output.
+     * 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;
      *
@@ -117,21 +106,18 @@ public class ASMifier extends Printer {
             }
         }
         if (!ok) {
-            System.err
-                    .println("Prints the ASM code to generate the given class.");
+            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) {
+        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);
+        cr.accept(new TraceClassVisitor(null, new ASMifier(), new PrintWriter(System.out)), flags);
     }
 
     // ------------------------------------------------------------------------
@@ -139,12 +125,11 @@ public class ASMifier extends Printer {
     // ------------------------------------------------------------------------
 
     /**
-     * Appends a string representation of the given constant to the given
-     * buffer.
+     * 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>.
+     * @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) {
@@ -158,16 +143,14 @@ public class ASMifier extends Printer {
         } else if (cst instanceof Handle) {
             buf.append("new Handle(");
             Handle h = (Handle) cst;
-            buf.append("Opcodes.").append(HANDLE_TAG[h.getTag()])
-                    .append(", \"");
+            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");
+            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) {
@@ -206,8 +189,7 @@ public class ASMifier extends Printer {
             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(i == 0 ? "" : ",").append("(char)").append((int) v[i]);
             }
             buf.append('}');
         } else if (cst instanceof int[]) {
@@ -243,15 +225,13 @@ public class ASMifier extends Printer {
 
     @Override
     public void visit(final int version, final int access, final String name,
-                      final String signature, final String superName,
-                      final String[] interfaces) {
+            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");
+            text.add("package asm." + name.substring(0, n).replace('/', '.') + ";\n");
             simpleName = name.substring(n + 1);
         }
         text.add("import java.util.*;\n");
@@ -327,8 +307,7 @@ public class ASMifier extends Printer {
     }
 
     @Override
-    public void visitOuterClass(final String owner, final String name,
-                                final String desc) {
+    public void visitOuterClass(final String owner, final String name, final String desc) {
         buf.setLength(0);
         buf.append("cw.visitOuterClass(");
         appendConstant(owner);
@@ -341,8 +320,7 @@ public class ASMifier extends Printer {
     }
 
     @Override
-    public ASMifier visitClassAnnotation(final String desc,
-                                         final boolean visible) {
+    public ASMifier visitClassAnnotation(final String desc, final boolean visible) {
         return visitAnnotation(desc, visible);
     }
 
@@ -352,8 +330,8 @@ public class ASMifier extends Printer {
     }
 
     @Override
-    public void visitInnerClass(final String name, final String outerName,
-                                final String innerName, final int access) {
+    public void visitInnerClass(final String name, final String outerName, final String innerName,
+            final int access) {
         buf.setLength(0);
         buf.append("cw.visitInnerClass(");
         appendConstant(name);
@@ -368,8 +346,8 @@ public class ASMifier extends Printer {
     }
 
     @Override
-    public ASMifier visitField(final int access, final String name,
-                               final String desc, final String signature, final Object value) {
+    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(");
@@ -391,8 +369,8 @@ public class ASMifier extends Printer {
     }
 
     @Override
-    public ASMifier visitMethod(final int access, final String name,
-                                final String desc, final String signature, final String[] exceptions) {
+    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(");
@@ -446,8 +424,7 @@ public class ASMifier extends Printer {
     }
 
     @Override
-    public void visitEnum(final String name, final String desc,
-                          final String value) {
+    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);
@@ -503,8 +480,7 @@ public class ASMifier extends Printer {
     }
 
     @Override
-    public ASMifier visitFieldAnnotation(final String desc,
-                                         final boolean visible) {
+    public ASMifier visitFieldAnnotation(final String desc, final boolean visible) {
         return visitAnnotation(desc, visible);
     }
 
@@ -527,8 +503,7 @@ public class ASMifier extends Printer {
     @Override
     public ASMifier visitAnnotationDefault() {
         buf.setLength(0);
-        buf.append("{\n").append("av0 = ").append(name)
-                .append(".visitAnnotationDefault();\n");
+        buf.append("{\n").append("av0 = ").append(name).append(".visitAnnotationDefault();\n");
         text.add(buf.toString());
         ASMifier a = createASMifier("av", 0);
         text.add(a.getText());
@@ -537,18 +512,16 @@ public class ASMifier extends Printer {
     }
 
     @Override
-    public ASMifier visitMethodAnnotation(final String desc,
-                                          final boolean visible) {
+    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) {
+    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(", ");
+        buf.append("{\n").append("av0 = ").append(name).append(".visitParameterAnnotation(")
+                .append(parameter).append(", ");
         appendConstant(desc);
         buf.append(", ").append(visible).append(");\n");
         text.add(buf.toString());
@@ -569,8 +542,8 @@ public class ASMifier extends Printer {
     }
 
     @Override
-    public void visitFrame(final int type, final int nLocal,
-                           final Object[] local, final int nStack, final Object[] stack) {
+    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:
@@ -590,23 +563,21 @@ public class ASMifier extends Printer {
                 break;
             case Opcodes.F_APPEND:
                 declareFrameTypes(nLocal, local);
-                buf.append(name).append(".visitFrame(Opcodes.F_APPEND,")
-                        .append(nLocal).append(", new Object[] {");
+                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");
+                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");
+                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[] {");
+                buf.append(name).append(".visitFrame(Opcodes.F_SAME1, 0, null, 1, new Object[] {");
                 appendFrameTypes(1, stack);
                 buf.append('}');
                 break;
@@ -618,47 +589,41 @@ public class ASMifier extends Printer {
     @Override
     public void visitInsn(final int opcode) {
         buf.setLength(0);
-        buf.append(name).append(".visitInsn(").append(OPCODES[opcode])
-                .append(");\n");
+        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");
+        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");
+        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(", ");
+        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) {
+    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(", ");
+        buf.append(this.name).append(".visitFieldInsn(").append(OPCODES[opcode]).append(", ");
         appendConstant(owner);
         buf.append(", ");
         appendConstant(name);
@@ -669,11 +634,10 @@ public class ASMifier extends Printer {
     }
 
     @Override
-    public void visitMethodInsn(final int opcode, final String owner,
-                                final String name, final String desc) {
+    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(", ");
+        buf.append(this.name).append(".visitMethodInsn(").append(OPCODES[opcode]).append(", ");
         appendConstant(owner);
         buf.append(", ");
         appendConstant(name);
@@ -684,8 +648,7 @@ public class ASMifier extends Printer {
     }
 
     @Override
-    public void visitInvokeDynamicInsn(String name, String desc, Handle bsm,
-                                       Object... bsmArgs) {
+    public void visitInvokeDynamicInsn(String name, String desc, Handle bsm, Object... bsmArgs) {
         buf.setLength(0);
         buf.append(this.name).append(".visitInvokeDynamicInsn(");
         appendConstant(name);
@@ -708,8 +671,7 @@ public class ASMifier extends Printer {
     public void visitJumpInsn(final int opcode, final Label label) {
         buf.setLength(0);
         declareLabel(label);
-        buf.append(name).append(".visitJumpInsn(").append(OPCODES[opcode])
-                .append(", ");
+        buf.append(name).append(".visitJumpInsn(").append(OPCODES[opcode]).append(", ");
         appendLabel(label);
         buf.append(");\n");
         text.add(buf.toString());
@@ -737,22 +699,22 @@ public class ASMifier extends Printer {
     @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");
+        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) {
+    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(", ");
+        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) {
@@ -764,8 +726,7 @@ public class ASMifier extends Printer {
     }
 
     @Override
-    public void visitLookupSwitchInsn(final Label dflt, final int[] keys,
-                                      final Label[] labels) {
+    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]);
@@ -797,8 +758,8 @@ public class ASMifier extends Printer {
     }
 
     @Override
-    public void visitTryCatchBlock(final Label start, final Label end,
-                                   final Label handler, final String type) {
+    public void visitTryCatchBlock(final Label start, final Label end, final Label handler,
+            final String type) {
         buf.setLength(0);
         declareLabel(start);
         declareLabel(end);
@@ -816,9 +777,8 @@ public class ASMifier extends Printer {
     }
 
     @Override
-    public void visitLocalVariable(final String name, final String desc,
-                                   final String signature, final Label start, final Label end,
-                                   final int index) {
+    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);
@@ -846,8 +806,8 @@ public class ASMifier extends Printer {
     @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");
+        buf.append(name).append(".visitMaxs(").append(maxStack).append(", ").append(maxLocals)
+                .append(");\n");
         text.add(buf.toString());
     }
 
@@ -864,8 +824,7 @@ public class ASMifier extends Printer {
 
     public ASMifier visitAnnotation(final String desc, final boolean visible) {
         buf.setLength(0);
-        buf.append("{\n").append("av0 = ").append(name)
-                .append(".visitAnnotation(");
+        buf.append("{\n").append("av0 = ").append(name).append(".visitAnnotation(");
         appendConstant(desc);
         buf.append(", ").append(visible).append(");\n");
         text.add(buf.toString());
@@ -899,8 +858,7 @@ public class ASMifier extends Printer {
     }
 
     /**
-     * Appends a string representation of the given access modifiers to
-     * {@link #buf buf}.
+     * Appends a string representation of the given access modifiers to {@link #buf buf}.
      *
      * @param access some access modifiers.
      */
@@ -943,8 +901,7 @@ public class ASMifier extends Printer {
             }
             first = false;
         }
-        if ((access & Opcodes.ACC_VOLATILE) != 0
-                && (access & ACCESS_FIELD) != 0) {
+        if ((access & Opcodes.ACC_VOLATILE) != 0 && (access & ACCESS_FIELD) != 0) {
             if (!first) {
                 buf.append(" + ");
             }
@@ -967,8 +924,7 @@ public class ASMifier extends Printer {
             buf.append("ACC_VARARGS");
             first = false;
         }
-        if ((access & Opcodes.ACC_TRANSIENT) != 0
-                && (access & ACCESS_FIELD) != 0) {
+        if ((access & Opcodes.ACC_TRANSIENT) != 0 && (access & ACCESS_FIELD) != 0) {
             if (!first) {
                 buf.append(" + ");
             }
@@ -983,8 +939,7 @@ public class ASMifier extends Printer {
             buf.append("ACC_NATIVE");
             first = false;
         }
-        if ((access & Opcodes.ACC_ENUM) != 0
-                && ((access & ACCESS_CLASS) != 0
+        if ((access & Opcodes.ACC_ENUM) != 0 && ((access & ACCESS_CLASS) != 0
                 || (access & ACCESS_FIELD) != 0 || (access & ACCESS_INNER) != 0)) {
             if (!first) {
                 buf.append(" + ");
@@ -1041,11 +996,10 @@ public class ASMifier extends Printer {
     }
 
     /**
-     * Appends a string representation of the given constant to the given
-     * buffer.
+     * 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>.
+     * @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);
@@ -1097,9 +1051,8 @@ public class ASMifier extends Printer {
     }
 
     /**
-     * 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.
+     * 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.
      */
@@ -1116,9 +1069,9 @@ public class ASMifier extends Printer {
     }
 
     /**
-     * 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.
+     * 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.
      */
diff --git a/src/main/asm/org/objectweb/asm/util/CheckAnnotationAdapter.java b/src/main/asm/org/objectweb/asm/util/CheckAnnotationAdapter.java
index c59ecf2..5e48cd5 100644
--- a/src/main/asm/org/objectweb/asm/util/CheckAnnotationAdapter.java
+++ b/src/main/asm/org/objectweb/asm/util/CheckAnnotationAdapter.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -57,15 +49,13 @@ public class CheckAnnotationAdapter extends AnnotationVisitor {
     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[])) {
+        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) {
@@ -80,8 +70,7 @@ public class CheckAnnotationAdapter extends AnnotationVisitor {
     }
 
     @Override
-    public void visitEnum(final String name, final String desc,
-            final String value) {
+    public void visitEnum(final String name, final String desc, final String value) {
         checkEnd();
         checkName(name);
         CheckMethodAdapter.checkDesc(desc, false);
@@ -94,21 +83,18 @@ public class CheckAnnotationAdapter extends AnnotationVisitor {
     }
 
     @Override
-    public AnnotationVisitor visitAnnotation(final String name,
-            final String desc) {
+    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));
+        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);
+        return new CheckAnnotationAdapter(av == null ? null : av.visitArray(name), false);
     }
 
     @Override
@@ -129,8 +115,7 @@ public class CheckAnnotationAdapter extends AnnotationVisitor {
 
     private void checkName(final String name) {
         if (named && name == null) {
-            throw new IllegalArgumentException(
-                    "Annotation value name must not be 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
index 0d0041b..cbbba39 100644
--- a/src/main/asm/org/objectweb/asm/util/CheckClassAdapter.java
+++ b/src/main/asm/org/objectweb/asm/util/CheckClassAdapter.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -42,17 +34,15 @@ 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
+ * 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:
+ * <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
@@ -67,16 +57,14 @@ import java.util.*;
  *   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.
+ * 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):
+ * 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 .
@@ -98,15 +86,13 @@ import java.util.*;
  * ...
  * </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.
+ * 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>.
+ * 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
  */
@@ -137,8 +123,7 @@ public class CheckClassAdapter extends ClassVisitor {
     private boolean end;
 
     /**
-     * The already visited labels. This map associate Integer values to Label
-     * keys.
+     * The already visited labels. This map associate Integer values to Label keys.
      */
     private Map<Label, Integer> labels;
 
@@ -148,9 +133,8 @@ public class CheckClassAdapter extends ClassVisitor {
     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.
+     * 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.
      */
@@ -159,15 +143,13 @@ public class CheckClassAdapter extends ClassVisitor {
     }
 
     /**
-     * Constructs a new {@link CheckClassAdapter}. <i>Subclasses must not use
-     * this constructor</i>. Instead, they must use the
-     * {@link #CheckClassAdapter(int, ClassVisitor, boolean)} version.
+     * 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.
+     * @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);
@@ -176,16 +158,14 @@ public class CheckClassAdapter extends ClassVisitor {
     /**
      * 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.
+     * @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) {
+    protected CheckClassAdapter(final int api, final ClassVisitor cv, final boolean checkDataFlow) {
         super(api, cv);
         this.labels = new HashMap<Label, Integer>();
         this.checkDataFlow = checkDataFlow;
@@ -219,34 +199,29 @@ public class CheckClassAdapter extends ClassVisitor {
     /**
      * 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
+     * @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) {
+    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);
+        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(); ) {
+        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);
+            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);
@@ -267,19 +242,16 @@ public class CheckClassAdapter extends ClassVisitor {
     /**
      * 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
+     * @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) {
+    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) {
+            final PrintWriter pw) {
         Frame<BasicValue>[] frames = a.getFrames();
         Textifier t = new Textifier();
         TraceMethodVisitor mv = new TraceMethodVisitor(t);
@@ -294,13 +266,11 @@ public class CheckClassAdapter extends ClassVisitor {
                 s.append('?');
             } else {
                 for (int k = 0; k < f.getLocals(); ++k) {
-                    s.append(getShortName(f.getLocal(k).toString()))
-                            .append(' ');
+                    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(' ');
+                    s.append(getShortName(f.getStack(k).toString())).append(' ');
                 }
             }
             while (s.length() < method.maxStack + method.maxLocals + 1) {
@@ -330,25 +300,22 @@ public class CheckClassAdapter extends ClassVisitor {
     // ------------------------------------------------------------------------
 
     /**
-     * Checks that the given access flags do not contain invalid flags. This
-     * method also checks that mutually incompatible flags are not set
-     * simultaneously.
+     * 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 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);
+            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);
+                    "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;
@@ -376,8 +343,7 @@ public class CheckClassAdapter extends ClassVisitor {
             pos = checkClassTypeSignature(signature, pos);
         }
         if (pos != signature.length()) {
-            throw new IllegalArgumentException(signature + ": error at index "
-                    + pos);
+            throw new IllegalArgumentException(signature + ": error at index " + pos);
         }
     }
 
@@ -414,8 +380,7 @@ public class CheckClassAdapter extends ClassVisitor {
             }
         }
         if (pos != signature.length()) {
-            throw new IllegalArgumentException(signature + ": error at index "
-                    + pos);
+            throw new IllegalArgumentException(signature + ": error at index " + pos);
         }
     }
 
@@ -427,8 +392,7 @@ public class CheckClassAdapter extends ClassVisitor {
     public static void checkFieldSignature(final String signature) {
         int pos = checkFieldTypeSignature(signature, 0);
         if (pos != signature.length()) {
-            throw new IllegalArgumentException(signature + ": error at index "
-                    + pos);
+            throw new IllegalArgumentException(signature + ": error at index " + pos);
         }
     }
 
@@ -436,7 +400,7 @@ public class CheckClassAdapter extends ClassVisitor {
      * 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.
+     * @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) {
@@ -455,7 +419,7 @@ public class CheckClassAdapter extends ClassVisitor {
      * 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.
+     * @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) {
@@ -477,7 +441,7 @@ public class CheckClassAdapter extends ClassVisitor {
      * 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.
+     * @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) {
@@ -501,7 +465,7 @@ public class CheckClassAdapter extends ClassVisitor {
      * 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.
+     * @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) {
@@ -530,7 +494,7 @@ public class CheckClassAdapter extends ClassVisitor {
      * 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.
+     * @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) {
@@ -553,7 +517,7 @@ public class CheckClassAdapter extends ClassVisitor {
      * 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.
+     * @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) {
@@ -573,11 +537,10 @@ public class CheckClassAdapter extends ClassVisitor {
      * 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.
+     * @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) {
+    private static int checkTypeVariableSignature(final String signature, int pos) {
         // TypeVariableSignature:
         // T Identifier ;
 
@@ -590,7 +553,7 @@ public class CheckClassAdapter extends ClassVisitor {
      * Checks a type signature.
      *
      * @param signature a string containing the signature that must be checked.
-     * @param pos       index of first character to 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) {
@@ -616,13 +579,12 @@ public class CheckClassAdapter extends ClassVisitor {
      * Checks an identifier.
      *
      * @param signature a string containing the signature that must be checked.
-     * @param pos       index of first character to 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);
+            throw new IllegalArgumentException(signature + ": identifier expected at index " + pos);
         }
         ++pos;
         while (Character.isJavaIdentifierPart(getChar(signature, pos))) {
@@ -635,24 +597,22 @@ public class CheckClassAdapter extends ClassVisitor {
      * Checks a single character.
      *
      * @param signature a string containing the signature that must be checked.
-     * @param pos       index of first character to 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);
+        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.
+     * @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;
@@ -660,18 +620,16 @@ public class CheckClassAdapter extends ClassVisitor {
 
     @Override
     public void visit(final int version, final int access, final String name,
-                      final String signature, final String superName,
-                      final String[] interfaces) {
+            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
+        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");
         }
@@ -694,8 +652,7 @@ public class CheckClassAdapter extends ClassVisitor {
         }
         if (interfaces != null) {
             for (int i = 0; i < interfaces.length; ++i) {
-                CheckMethodAdapter.checkInternalName(interfaces[i],
-                        "interface name at index " + i);
+                CheckMethodAdapter.checkInternalName(interfaces[i], "interface name at index " + i);
             }
         }
         this.version = version;
@@ -706,20 +663,17 @@ public class CheckClassAdapter extends ClassVisitor {
     public void visitSource(final String file, final String debug) {
         checkState();
         if (source) {
-            throw new IllegalStateException(
-                    "visitSource can be called only once.");
+            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) {
+    public void visitOuterClass(final String owner, final String name, final String desc) {
         checkState();
         if (outer) {
-            throw new IllegalStateException(
-                    "visitOuterClass can be called only once.");
+            throw new IllegalStateException("visitOuterClass can be called only once.");
         }
         outer = true;
         if (owner == null) {
@@ -732,8 +686,8 @@ public class CheckClassAdapter extends ClassVisitor {
     }
 
     @Override
-    public void visitInnerClass(final String name, final String outerName,
-                                final String innerName, final int access) {
+    public void visitInnerClass(final String name, final String outerName, final String innerName,
+            final int access) {
         checkState();
         CheckMethodAdapter.checkInternalName(name, "class name");
         if (outerName != null) {
@@ -741,32 +695,30 @@ public class CheckClassAdapter extends ClassVisitor {
         }
         if (innerName != null) {
             int start = 0;
-            while (start < innerName.length()
-                    && Character.isDigit(innerName.charAt(start))) {
+            while (start < innerName.length() && Character.isDigit(innerName.charAt(start))) {
                 start++;
             }
             if (start == 0 || start < innerName.length()) {
-                CheckMethodAdapter.checkIdentifier(innerName, start, -1,
-                        "inner class name");
+                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);
+        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) {
+    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
+        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) {
@@ -775,24 +727,22 @@ public class CheckClassAdapter extends ClassVisitor {
         if (value != null) {
             CheckMethodAdapter.checkConstant(value);
         }
-        FieldVisitor av = super
-                .visitField(access, name, desc, signature, 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) {
+    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
+        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.checkMethodIdentifier(version, name, "method name");
         }
         CheckMethodAdapter.checkMethodDesc(desc);
         if (signature != null) {
@@ -800,25 +750,23 @@ public class CheckClassAdapter extends ClassVisitor {
         }
         if (exceptions != null) {
             for (int i = 0; i < exceptions.length; ++i) {
-                CheckMethodAdapter.checkInternalName(exceptions[i],
-                        "exception name at index " + 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);
+            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 = 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) {
+    public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
         checkState();
         CheckMethodAdapter.checkDesc(desc, false);
         return new CheckAnnotationAdapter(super.visitAnnotation(desc, visible));
@@ -828,8 +776,7 @@ public class CheckClassAdapter extends ClassVisitor {
     public void visitAttribute(final Attribute attr) {
         checkState();
         if (attr == null) {
-            throw new IllegalArgumentException(
-                    "Invalid attribute (must not be null)");
+            throw new IllegalArgumentException("Invalid attribute (must not be null)");
         }
         super.visitAttribute(attr);
     }
@@ -842,17 +789,14 @@ public class CheckClassAdapter extends ClassVisitor {
     }
 
     /**
-     * Checks that the visit method has been called and that visitEnd has not
-     * been called.
+     * 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.");
+            throw new IllegalStateException("Cannot visit member before visit has been called.");
         }
         if (end) {
-            throw new IllegalStateException(
-                    "Cannot visit member after visitEnd has been called.");
+            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
index a7bf81a..e71cc88 100644
--- a/src/main/asm/org/objectweb/asm/util/CheckFieldAdapter.java
+++ b/src/main/asm/org/objectweb/asm/util/CheckFieldAdapter.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -42,12 +34,10 @@ 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.
+     * 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.
+     * @param fv the field visitor to which this adapter must delegate calls.
      */
     public CheckFieldAdapter(final FieldVisitor fv) {
         this(Opcodes.ASM4, fv);
@@ -56,19 +46,16 @@ public class CheckFieldAdapter extends FieldVisitor {
     /**
      * 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.
+     * @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) {
+    public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
         checkEnd();
         CheckMethodAdapter.checkDesc(desc, false);
         return new CheckAnnotationAdapter(super.visitAnnotation(desc, visible));
@@ -78,8 +65,7 @@ public class CheckFieldAdapter extends FieldVisitor {
     public void visitAttribute(final Attribute attr) {
         checkEnd();
         if (attr == null) {
-            throw new IllegalArgumentException(
-                    "Invalid attribute (must not be null)");
+            throw new IllegalArgumentException("Invalid attribute (must not be null)");
         }
         super.visitAttribute(attr);
     }
diff --git a/src/main/asm/org/objectweb/asm/util/CheckMethodAdapter.java b/src/main/asm/org/objectweb/asm/util/CheckMethodAdapter.java
index 9340dc5..d3e2dcf 100644
--- a/src/main/asm/org/objectweb/asm/util/CheckMethodAdapter.java
+++ b/src/main/asm/org/objectweb/asm/util/CheckMethodAdapter.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -52,18 +44,16 @@ 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
+ * 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.
+ * {@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
  */
@@ -100,14 +90,13 @@ public class CheckMethodAdapter extends MethodVisitor {
     private int insnCount;
 
     /**
-     * The already visited labels. This map associate Integer values to pseudo
-     * code offsets.
+     * 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).
+     * 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;
 
@@ -127,8 +116,8 @@ public class CheckMethodAdapter extends MethodVisitor {
     private int lastFrame = -1;
 
     /**
-     * The exception handler ranges. Each pair of list element contains the
-     * start and end labels of an exception handler block.
+     * The exception handler ranges. Each pair of list element contains the start and end labels of
+     * an exception handler block.
      */
     private List<Label> handlers;
 
@@ -366,45 +355,36 @@ public class CheckMethodAdapter extends MethodVisitor {
     // }
 
     /**
-     * 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.
+     * 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 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.
+     * 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).
+     * @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) {
+    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)}).
+     * 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).
+     * @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) {
@@ -415,35 +395,26 @@ public class CheckMethodAdapter extends MethodVisitor {
     }
 
     /**
-     * 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.
+     * 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).
+     * @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) {
+    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());
+                Analyzer<BasicValue> a = new Analyzer<BasicValue>(new BasicVerifier());
                 try {
                     a.analyze("dummy", this);
                 } catch (Exception e) {
-                    if (e instanceof IndexOutOfBoundsException
-                            && maxLocals == 0 && maxStack == 0) {
+                    if (e instanceof IndexOutOfBoundsException && maxLocals == 0 && maxStack == 0) {
                         throw new RuntimeException(
                                 "Data flow checking option requires valid, non zero maxLocals and maxStack values.");
                     }
@@ -452,8 +423,7 @@ public class CheckMethodAdapter extends MethodVisitor {
                     PrintWriter pw = new PrintWriter(sw, true);
                     CheckClassAdapter.printAnalyzerResult(this, a, pw);
                     pw.close();
-                    throw new RuntimeException(e.getMessage() + ' '
-                            + sw.toString());
+                    throw new RuntimeException(e.getMessage() + ' ' + sw.toString());
                 }
                 accept(cmv);
             }
@@ -462,8 +432,7 @@ public class CheckMethodAdapter extends MethodVisitor {
     }
 
     @Override
-    public AnnotationVisitor visitAnnotation(final String desc,
-            final boolean visible) {
+    public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
         checkEndMethod();
         checkDesc(desc, false);
         return new CheckAnnotationAdapter(super.visitAnnotation(desc, visible));
@@ -476,20 +445,18 @@ public class CheckMethodAdapter extends MethodVisitor {
     }
 
     @Override
-    public AnnotationVisitor visitParameterAnnotation(final int parameter,
-            final String desc, final boolean visible) {
+    public AnnotationVisitor visitParameterAnnotation(final int parameter, final String desc,
+            final boolean visible) {
         checkEndMethod();
         checkDesc(desc, false);
-        return new CheckAnnotationAdapter(super.visitParameterAnnotation(
-                parameter, desc, visible));
+        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)");
+            throw new IllegalArgumentException("Invalid attribute (must not be null)");
         }
         super.visitAttribute(attr);
     }
@@ -504,8 +471,8 @@ public class CheckMethodAdapter extends MethodVisitor {
     }
 
     @Override
-    public void visitFrame(final int type, final int nLocal,
-            final Object[] local, final int nStack, final Object[] stack) {
+    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.");
@@ -514,53 +481,51 @@ public class CheckMethodAdapter extends MethodVisitor {
         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_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_SAME:
+                mLocal = 0;
+                mStack = 0;
+                break;
 
-        case Opcodes.F_SAME1:
-            mLocal = 0;
-            mStack = 1;
-            break;
+            case Opcodes.F_SAME1:
+                mLocal = 0;
+                mStack = 1;
+                break;
 
-        case Opcodes.F_APPEND:
-        case Opcodes.F_CHOP:
-            mLocal = 3;
-            mStack = 0;
-            break;
+            case Opcodes.F_APPEND:
+            case Opcodes.F_CHOP:
+                mLocal = 3;
+                mStack = 0;
+                break;
 
-        default:
-            throw new IllegalArgumentException("Invalid frame type " + type);
+            default:
+                throw new IllegalArgumentException("Invalid frame type " + type);
         }
 
         if (nLocal > mLocal) {
-            throw new IllegalArgumentException("Invalid nLocal=" + nLocal
-                    + " for frame type " + type);
+            throw new IllegalArgumentException(
+                    "Invalid nLocal=" + nLocal + " for frame type " + type);
         }
         if (nStack > mStack) {
-            throw new IllegalArgumentException("Invalid nStack=" + nStack
-                    + " for frame type " + type);
+            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");
+                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");
+            throw new IllegalArgumentException("Array stack[] is shorter than nStack");
         }
         for (int i = 0; i < nStack; ++i) {
             checkFrameValue(stack[i]);
@@ -571,8 +536,7 @@ public class CheckMethodAdapter extends MethodVisitor {
             ++compressedFrames;
         }
         if (expandedFrames > 0 && compressedFrames > 0) {
-            throw new RuntimeException(
-                    "Expanded and compressed frames must not be mixed.");
+            throw new RuntimeException("Expanded and compressed frames must not be mixed.");
         }
         super.visitFrame(type, nLocal, local, nStack, stack);
     }
@@ -592,19 +556,18 @@ public class CheckMethodAdapter extends MethodVisitor {
         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);
-            }
+            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;
@@ -627,16 +590,15 @@ public class CheckMethodAdapter extends MethodVisitor {
         checkOpcode(opcode, 3);
         checkInternalName(type, "type");
         if (opcode == Opcodes.NEW && type.charAt(0) == '[') {
-            throw new IllegalArgumentException(
-                    "NEW cannot be used to create arrays: " + type);
+            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) {
+    public void visitFieldInsn(final int opcode, final String owner, final String name,
+            final String desc) {
         checkStartCode();
         checkEndCode();
         checkOpcode(opcode, 4);
@@ -648,8 +610,8 @@ public class CheckMethodAdapter extends MethodVisitor {
     }
 
     @Override
-    public void visitMethodInsn(final int opcode, final String owner,
-            final String name, final String desc) {
+    public void visitMethodInsn(final int opcode, final String owner, final String name,
+            final String desc) {
         checkStartCode();
         checkEndCode();
         checkOpcode(opcode, 5);
@@ -663,16 +625,13 @@ public class CheckMethodAdapter extends MethodVisitor {
     }
 
     @Override
-    public void visitInvokeDynamicInsn(String name, String desc, Handle bsm,
-            Object... bsmArgs) {
+    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());
+        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]);
@@ -725,19 +684,18 @@ public class CheckMethodAdapter extends MethodVisitor {
     }
 
     @Override
-    public void visitTableSwitchInsn(final int min, final int max,
-            final Label dflt, final Label... labels) {
+    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);
+            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");
+            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);
@@ -751,15 +709,13 @@ public class CheckMethodAdapter extends MethodVisitor {
     }
 
     @Override
-    public void visitLookupSwitchInsn(final Label dflt, final int[] keys,
-            final Label[] labels) {
+    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");
+            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);
@@ -780,8 +736,7 @@ public class CheckMethodAdapter extends MethodVisitor {
         checkDesc(desc, false);
         if (desc.charAt(0) != '[') {
             throw new IllegalArgumentException(
-                    "Invalid descriptor (must be an array type descriptor): "
-                            + desc);
+                    "Invalid descriptor (must be an array type descriptor): " + desc);
         }
         if (dims < 1) {
             throw new IllegalArgumentException(
@@ -789,16 +744,15 @@ public class CheckMethodAdapter extends MethodVisitor {
         }
         if (dims > desc.lastIndexOf('[') + 1) {
             throw new IllegalArgumentException(
-                    "Invalid dimensions (must not be greater than dims(desc)): "
-                            + dims);
+                    "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) {
+    public void visitTryCatchBlock(final Label start, final Label end, final Label handler,
+            final String type) {
         checkStartCode();
         checkEndCode();
         checkLabel(start, false, "start label");
@@ -807,10 +761,8 @@ public class CheckMethodAdapter extends MethodVisitor {
         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 (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");
@@ -821,9 +773,8 @@ public class CheckMethodAdapter extends MethodVisitor {
     }
 
     @Override
-    public void visitLocalVariable(final String name, final String desc,
-            final String signature, final Label start, final Label end,
-            final int index) {
+    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");
@@ -863,12 +814,10 @@ public class CheckMethodAdapter extends MethodVisitor {
             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");
+                throw new IllegalStateException("Undefined try catch block labels");
             }
             if (end.intValue() <= start.intValue()) {
-                throw new IllegalStateException(
-                        "Emty try catch block handler range");
+                throw new IllegalStateException("Emty try catch block handler range");
             }
         }
         checkUnsignedShort(maxStack, "Invalid max stack");
@@ -918,13 +867,11 @@ public class CheckMethodAdapter extends MethodVisitor {
     /**
      * Checks a stack frame value.
      * 
-     * @param value
-     *            the value to be checked.
+     * @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
+        if (value == Opcodes.TOP || value == Opcodes.INTEGER || value == Opcodes.FLOAT
+                || value == Opcodes.LONG || value == Opcodes.DOUBLE || value == Opcodes.NULL
                 || value == Opcodes.UNINITIALIZED_THIS) {
             return;
         }
@@ -933,8 +880,7 @@ public class CheckMethodAdapter extends MethodVisitor {
             return;
         }
         if (!(value instanceof Label)) {
-            throw new IllegalArgumentException("Invalid stack frame value: "
-                    + value);
+            throw new IllegalArgumentException("Invalid stack frame value: " + value);
         } else {
             usedLabels.add((Label) value);
         }
@@ -943,10 +889,8 @@ public class CheckMethodAdapter extends MethodVisitor {
     /**
      * 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.
+     * @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) {
@@ -957,59 +901,48 @@ public class CheckMethodAdapter extends MethodVisitor {
     /**
      * 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.
+     * @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);
+            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.
+     * @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);
+            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.
+     * @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);
+            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}.
+     * 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.
+     * @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)) {
+        if (!(cst instanceof Integer) && !(cst instanceof Float) && !(cst instanceof Long)
+                && !(cst instanceof Double) && !(cst instanceof String)) {
             throw new IllegalArgumentException("Invalid constant: " + cst);
         }
     }
@@ -1030,8 +963,7 @@ public class CheckMethodAdapter extends MethodVisitor {
             }
         } else if (cst instanceof Handle) {
             if ((version & 0xFFFF) < Opcodes.V1_7) {
-                throw new IllegalArgumentException(
-                        "ldc of a handle requires at least version 1.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) {
@@ -1045,22 +977,18 @@ public class CheckMethodAdapter extends MethodVisitor {
     /**
      * 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.
+     * @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) {
+    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);
+                    throw new IllegalArgumentException(
+                            "Invalid " + msg + " (must be a valid unqualified name): " + name);
                 }
             }
         }
@@ -1069,10 +997,8 @@ public class CheckMethodAdapter extends MethodVisitor {
     /**
      * 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.
+     * @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);
@@ -1081,32 +1007,26 @@ public class CheckMethodAdapter extends MethodVisitor {
     /**
      * 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.
+     * @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) {
+    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)");
+            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);
+            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);
+                throw new IllegalArgumentException(
+                        "Invalid " + msg + " (must be a valid Java identifier): " + name);
             }
         }
     }
@@ -1114,42 +1034,31 @@ public class CheckMethodAdapter extends MethodVisitor {
     /**
      * 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.
+     * @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) {
+    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)");
+            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);
+                    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);
+            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);
+                throw new IllegalArgumentException("Invalid " + msg
+                        + " (must be '<init>' or '<clinit>' or a valid Java identifier): " + name);
             }
         }
     }
@@ -1157,15 +1066,12 @@ public class CheckMethodAdapter extends MethodVisitor {
     /**
      * 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.
+     * @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)");
+            throw new IllegalArgumentException("Invalid " + msg + " (must not be null or empty)");
         }
         if (name.charAt(0) == '[') {
             checkDesc(name, false);
@@ -1177,19 +1083,14 @@ public class CheckMethodAdapter extends MethodVisitor {
     /**
      * 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.
+     * @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) {
+    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;
@@ -1203,21 +1104,16 @@ public class CheckMethodAdapter extends MethodVisitor {
                 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);
+            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.
+     * @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);
@@ -1229,72 +1125,63 @@ public class CheckMethodAdapter extends MethodVisitor {
     /**
      * 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.
+     * @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) {
+    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) {
+            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;
-            } 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);
+            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.
+     * @param desc the string to be checked.
      */
     static void checkMethodDesc(final String desc) {
         if (desc == null || desc.length() == 0) {
@@ -1308,8 +1195,7 @@ public class CheckMethodAdapter extends MethodVisitor {
         if (desc.charAt(start) != ')') {
             do {
                 if (desc.charAt(start) == 'V') {
-                    throw new IllegalArgumentException("Invalid descriptor: "
-                            + desc);
+                    throw new IllegalArgumentException("Invalid descriptor: " + desc);
                 }
                 start = checkDesc(desc, start, false);
             } while (start < desc.length() && desc.charAt(start) != ')');
@@ -1321,33 +1207,26 @@ public class CheckMethodAdapter extends MethodVisitor {
     }
 
     /**
-     * Checks that the given label is not null. This method can also check that
-     * the label has been visited.
+     * 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.
+     * @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) {
+    void checkLabel(final Label label, final boolean checkVisited, final String msg) {
         if (label == null) {
-            throw new IllegalArgumentException("Invalid " + msg
-                    + " (must not be 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)");
+            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.
+     * @param label the label to be checked.
      */
     private static void checkNonDebugLabel(final Label label) {
         Field f = getLabelStatusField();
@@ -1381,8 +1260,7 @@ public class CheckMethodAdapter extends MethodVisitor {
     /**
      * Returns the field of the Label class whose name is given.
      * 
-     * @param name
-     *            a field name.
+     * @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) {
diff --git a/src/main/asm/org/objectweb/asm/util/CheckSignatureAdapter.java b/src/main/asm/org/objectweb/asm/util/CheckSignatureAdapter.java
index 450d64c..17d6b8e 100644
--- a/src/main/asm/org/objectweb/asm/util/CheckSignatureAdapter.java
+++ b/src/main/asm/org/objectweb/asm/util/CheckSignatureAdapter.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -41,22 +33,19 @@ public class CheckSignatureAdapter extends SignatureVisitor {
 
     /**
      * Type to be used to check class signatures. See
-     * {@link #CheckSignatureAdapter(int, SignatureVisitor)
-     * CheckSignatureAdapter}.
+     * {@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}.
+     * {@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}.
+     * {@link #CheckSignatureAdapter(int, SignatureVisitor) CheckSignatureAdapter}.
      */
     public static final int TYPE_SIGNATURE = 2;
 
@@ -94,23 +83,18 @@ public class CheckSignatureAdapter extends SignatureVisitor {
     private boolean canBeVoid;
 
     /**
-     * The visitor to which this adapter must delegate calls. May be
-     * <tt>null</tt>.
+     * 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
+     * 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>.
+     * @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);
@@ -119,19 +103,13 @@ public class CheckSignatureAdapter extends SignatureVisitor {
     /**
      * 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>.
+     * @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) {
+    protected CheckSignatureAdapter(final int api, final int type, final SignatureVisitor sv) {
         super(api);
         this.type = type;
         this.state = EMPTY;
@@ -142,8 +120,7 @@ public class CheckSignatureAdapter extends SignatureVisitor {
 
     @Override
     public void visitFormalTypeParameter(final String name) {
-        if (type == TYPE_SIGNATURE
-                || (state != EMPTY && state != FORMAL && state != BOUND)) {
+        if (type == TYPE_SIGNATURE || (state != EMPTY && state != FORMAL && state != BOUND)) {
             throw new IllegalStateException();
         }
         CheckMethodAdapter.checkIdentifier(name, "formal type parameter");
@@ -197,8 +174,7 @@ public class CheckSignatureAdapter extends SignatureVisitor {
 
     @Override
     public SignatureVisitor visitParameterType() {
-        if (type != METHOD_SIGNATURE
-                || (state & (EMPTY | FORMAL | BOUND | PARAM)) == 0) {
+        if (type != METHOD_SIGNATURE || (state & (EMPTY | FORMAL | BOUND | PARAM)) == 0) {
             throw new IllegalArgumentException();
         }
         state = PARAM;
@@ -208,8 +184,7 @@ public class CheckSignatureAdapter extends SignatureVisitor {
 
     @Override
     public SignatureVisitor visitReturnType() {
-        if (type != METHOD_SIGNATURE
-                || (state & (EMPTY | FORMAL | BOUND | PARAM)) == 0) {
+        if (type != METHOD_SIGNATURE || (state & (EMPTY | FORMAL | BOUND | PARAM)) == 0) {
             throw new IllegalArgumentException();
         }
         state = RETURN;
diff --git a/src/main/asm/org/objectweb/asm/util/Printer.java b/src/main/asm/org/objectweb/asm/util/Printer.java
index ffc7470..c8994ad 100644
--- a/src/main/asm/org/objectweb/asm/util/Printer.java
+++ b/src/main/asm/org/objectweb/asm/util/Printer.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -52,14 +44,13 @@ public abstract class Printer {
 
     /**
      * 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>.
+     * {@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}.
+     * The names of the <code>tag</code> field values for {@link org.objectweb.asm.Handle}.
      */
     public static final String[] HANDLE_TAG;
 
@@ -115,8 +106,8 @@ public abstract class Printer {
     }
 
     /**
-     * The ASM API version implemented by this class. The value of this field
-     * must be one of {@link Opcodes#ASM4}.
+     * The ASM API version implemented by this class. The value of this field must be one of
+     * {@link Opcodes#ASM4}.
      */
     protected final int api;
 
@@ -126,16 +117,14 @@ public abstract class Printer {
     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.
+     * 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;
 
@@ -151,9 +140,8 @@ public abstract class Printer {
     /**
      * 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);
+    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}.
@@ -161,43 +149,37 @@ public abstract class Printer {
     public abstract void visitSource(final String file, final String debug);
 
     /**
-     * Class outer class. See
-     * {@link org.objectweb.asm.ClassVisitor#visitOuterClass}.
+     * Class outer class. See {@link org.objectweb.asm.ClassVisitor#visitOuterClass}.
      */
-    public abstract void visitOuterClass(final String owner, final String name,
-            final String desc);
+    public abstract void visitOuterClass(final String owner, final String name, final String desc);
 
     /**
-     * Class annotation. See
-     * {@link org.objectweb.asm.ClassVisitor#visitAnnotation}.
+     * Class annotation. See {@link org.objectweb.asm.ClassVisitor#visitAnnotation}.
      */
-    public abstract Printer visitClassAnnotation(final String desc,
-            final boolean visible);
+    public abstract Printer visitClassAnnotation(final String desc, final boolean visible);
 
     /**
-     * Class attribute. See
-     * {@link org.objectweb.asm.ClassVisitor#visitAttribute}.
+     * 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}.
+     * 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);
+    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);
+    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);
+    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}.
@@ -214,21 +196,17 @@ public abstract class Printer {
     public abstract void visit(final String name, final Object value);
 
     /**
-     * Annotation enum value. See
-     * {@link org.objectweb.asm.AnnotationVisitor#visitEnum}.
+     * Annotation enum value. See {@link org.objectweb.asm.AnnotationVisitor#visitEnum}.
      */
-    public abstract void visitEnum(final String name, final String desc,
-            final String value);
+    public abstract void visitEnum(final String name, final String desc, final String value);
 
     /**
-     * Nested annotation value. See
-     * {@link org.objectweb.asm.AnnotationVisitor#visitAnnotation}.
+     * 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}.
+     * Annotation array value. See {@link org.objectweb.asm.AnnotationVisitor#visitArray}.
      */
     public abstract Printer visitArray(final String name);
 
@@ -242,15 +220,12 @@ public abstract class Printer {
     // ------------------------------------------------------------------------
 
     /**
-     * Field annotation. See
-     * {@link org.objectweb.asm.FieldVisitor#visitAnnotation}.
+     * Field annotation. See {@link org.objectweb.asm.FieldVisitor#visitAnnotation}.
      */
-    public abstract Printer visitFieldAnnotation(final String desc,
-            final boolean visible);
+    public abstract Printer visitFieldAnnotation(final String desc, final boolean visible);
 
     /**
-     * Field attribute. See
-     * {@link org.objectweb.asm.FieldVisitor#visitAttribute}.
+     * Field attribute. See {@link org.objectweb.asm.FieldVisitor#visitAttribute}.
      */
     public abstract void visitFieldAttribute(final Attribute attr);
 
@@ -270,22 +245,19 @@ public abstract class Printer {
     public abstract Printer visitAnnotationDefault();
 
     /**
-     * Method annotation. See
-     * {@link org.objectweb.asm.MethodVisitor#visitAnnotation}.
+     * Method annotation. See {@link org.objectweb.asm.MethodVisitor#visitAnnotation}.
      */
-    public abstract Printer visitMethodAnnotation(final String desc,
-            final boolean visible);
+    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);
+    public abstract Printer visitParameterAnnotation(final int parameter, final String desc,
+            final boolean visible);
 
     /**
-     * Method attribute. See
-     * {@link org.objectweb.asm.MethodVisitor#visitAttribute}.
+     * Method attribute. See {@link org.objectweb.asm.MethodVisitor#visitAttribute}.
      */
     public abstract void visitMethodAttribute(final Attribute attr);
 
@@ -295,60 +267,51 @@ public abstract class Printer {
     public abstract void visitCode();
 
     /**
-     * Method stack frame. See
-     * {@link org.objectweb.asm.MethodVisitor#visitFrame}.
+     * 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);
+    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}
-     * .
+     * 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}.
+     * 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}.
+     * 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}.
+     * 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}.
+     * 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);
+    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}.
+     * 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);
+    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}.
+     * Method instruction. See {@link org.objectweb.asm.MethodVisitor#visitInvokeDynamicInsn}.
      */
-    public abstract void visitInvokeDynamicInsn(String name, String desc,
-            Handle bsm, Object... bsmArgs);
+    public abstract void visitInvokeDynamicInsn(String name, String desc, Handle bsm,
+            Object... bsmArgs);
 
     /**
-     * Method instruction. See
-     * {@link org.objectweb.asm.MethodVisitor#visitJumpInsn}.
+     * Method instruction. See {@link org.objectweb.asm.MethodVisitor#visitJumpInsn}.
      */
     public abstract void visitJumpInsn(final int opcode, final Label label);
 
@@ -358,62 +321,51 @@ public abstract class Printer {
     public abstract void visitLabel(final Label label);
 
     /**
-     * Method instruction. See
-     * {@link org.objectweb.asm.MethodVisitor#visitLdcInsn}.
+     * 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}.
+     * 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}.
+     * 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);
+    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}.
+     * Method instruction. See {@link org.objectweb.asm.MethodVisitor#visitLookupSwitchInsn}.
      */
-    public abstract void visitLookupSwitchInsn(final Label dflt,
-            final int[] keys, final Label[] labels);
+    public abstract void visitLookupSwitchInsn(final Label dflt, final int[] keys,
+            final Label[] labels);
 
     /**
-     * Method instruction. See
-     * {@link org.objectweb.asm.MethodVisitor#visitMultiANewArrayInsn}.
+     * Method instruction. See {@link org.objectweb.asm.MethodVisitor#visitMultiANewArrayInsn}.
      */
-    public abstract void visitMultiANewArrayInsn(final String desc,
-            final int dims);
+    public abstract void visitMultiANewArrayInsn(final String desc, final int dims);
 
     /**
-     * Method exception handler. See
-     * {@link org.objectweb.asm.MethodVisitor#visitTryCatchBlock}.
+     * 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);
+    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}.
+     * 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);
+    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}.
+     * 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}.
+     * Method max stack and max locals. See {@link org.objectweb.asm.MethodVisitor#visitMaxs}.
      */
     public abstract void visitMaxs(final int maxStack, final int maxLocals);
 
@@ -434,8 +386,7 @@ public abstract class Printer {
     /**
      * Prints the text constructed by this visitor.
      * 
-     * @param pw
-     *            the print writer to be used.
+     * @param pw the print writer to be used.
      */
     public void print(final PrintWriter pw) {
         printList(pw, text);
@@ -444,10 +395,8 @@ public abstract class Printer {
     /**
      * 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.
+     * @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('\"');
@@ -481,11 +430,9 @@ public abstract class Printer {
     /**
      * 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.
+     * @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) {
diff --git a/src/main/asm/org/objectweb/asm/util/Textifiable.java b/src/main/asm/org/objectweb/asm/util/Textifiable.java
index aad97ba..bd7e1e5 100644
--- a/src/main/asm/org/objectweb/asm/util/Textifiable.java
+++ b/src/main/asm/org/objectweb/asm/util/Textifiable.java
@@ -1,31 +1,23 @@
 /**
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -34,11 +26,11 @@ import java.util.Map;
 import org.objectweb.asm.Label;
 
 /**
- * An {@link org.objectweb.asm.Attribute Attribute} that can print a readable
- * representation of itself.
+ * 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.
+ * Implementations should construct readable output from an attribute data structure. Such
+ * representation could be used in unit test assertions.
  * 
  * @author Eugene Kuleshov
  */
@@ -47,10 +39,8 @@ 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.
+     * @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
index 8f14474..24e01d3 100644
--- a/src/main/asm/org/objectweb/asm/util/Textifier.java
+++ b/src/main/asm/org/objectweb/asm/util/Textifier.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -44,63 +36,62 @@ import java.util.Map;
  */
 public class Textifier extends Printer {
     /**
-     * Constant used in {@link #appendDescriptor appendDescriptor} for internal
-     * type names in bytecode notation.
+     * 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
+     * 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
+     * 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
+     * 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
+     * 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
+     * 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)
+     * 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)
+     * 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)
+     * 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
+     * Constant used in {@link #appendDescriptor appendDescriptor} for handle descriptors, formatted
+     * in bytecode notation
      */
     public static final int HANDLE_DESCRIPTOR = 9;
 
@@ -132,9 +123,8 @@ public class Textifier extends Printer {
     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.
+     * 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);
@@ -143,8 +133,8 @@ public class Textifier extends Printer {
     /**
      * Constructs a new {@link Textifier}.
      *
-     * @param api the ASM API version implemented by this visitor. Must be one
-     *            of {@link Opcodes#ASM4}.
+     * @param api the ASM API version implemented by this visitor. Must be one of
+     *        {@link Opcodes#ASM4}.
      */
     protected Textifier(final int api) {
         super(api);
@@ -174,15 +164,13 @@ public class Textifier extends Printer {
             }
         }
         if (!ok) {
-            System.err
-                    .println("Prints a disassembled view of the given class.");
+            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) {
+        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]);
@@ -196,26 +184,24 @@ public class Textifier extends Printer {
 
     @Override
     public void visit(final int version, final int access, final String name,
-                      final String signature, final String superName,
-                      final String[] interfaces) {
+            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");
+        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');
+        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');
+            buf.append("// declaration: ").append(name).append(sv.getDeclaration()).append('\n');
         }
 
         appendAccess(access & ~Opcodes.ACC_SUPER);
@@ -249,12 +235,10 @@ public class Textifier extends Printer {
     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');
+            buf.append(tab).append("// compiled from: ").append(file).append('\n');
         }
         if (debug != null) {
-            buf.append(tab).append("// debug info: ").append(debug)
-                    .append('\n');
+            buf.append(tab).append("// debug info: ").append(debug).append('\n');
         }
         if (buf.length() > 0) {
             text.add(buf.toString());
@@ -262,8 +246,7 @@ public class Textifier extends Printer {
     }
 
     @Override
-    public void visitOuterClass(final String owner, final String name,
-                                final String desc) {
+    public void visitOuterClass(final String owner, final String name, final String desc) {
         buf.setLength(0);
         buf.append(tab).append("OUTERCLASS ");
         appendDescriptor(INTERNAL_NAME, owner);
@@ -277,8 +260,7 @@ public class Textifier extends Printer {
     }
 
     @Override
-    public Textifier visitClassAnnotation(final String desc,
-                                          final boolean visible) {
+    public Textifier visitClassAnnotation(final String desc, final boolean visible) {
         text.add("\n");
         return visitAnnotation(desc, visible);
     }
@@ -290,13 +272,11 @@ public class Textifier extends Printer {
     }
 
     @Override
-    public void visitInnerClass(final String name, final String outerName,
-                                final String innerName, final int access) {
+    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(Integer.toHexString(access & ~Opcodes.ACC_SUPER).toUpperCase()).append('\n');
         buf.append(tab);
         appendAccess(access);
         buf.append("INNERCLASS ");
@@ -310,8 +290,8 @@ public class Textifier extends Printer {
     }
 
     @Override
-    public Textifier visitField(final int access, final String name,
-                                final String desc, final String signature, final Object value) {
+    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) {
@@ -326,8 +306,7 @@ public class Textifier extends Printer {
             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).append("// declaration: ").append(sv.getDeclaration()).append('\n');
         }
 
         buf.append(tab);
@@ -353,8 +332,8 @@ public class Textifier extends Printer {
     }
 
     @Override
-    public Textifier visitMethod(final int access, final String name,
-                                 final String desc, final String signature, final String[] exceptions) {
+    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) {
@@ -374,8 +353,8 @@ public class Textifier extends Printer {
             String genericReturn = v.getReturnType();
             String genericExceptions = v.getExceptions();
 
-            buf.append(tab).append("// declaration: ").append(genericReturn)
-                    .append(' ').append(name).append(genericDecl);
+            buf.append(tab).append("// declaration: ").append(genericReturn).append(' ')
+                    .append(name).append(genericDecl);
             if (genericExceptions != null) {
                 buf.append(" throws ").append(genericExceptions);
             }
@@ -548,8 +527,7 @@ public class Textifier extends Printer {
     }
 
     @Override
-    public void visitEnum(final String name, final String desc,
-                          final String value) {
+    public void visitEnum(final String name, final String desc, final String value) {
         buf.setLength(0);
         appendComa(valueNumber++);
         if (name != null) {
@@ -593,16 +571,14 @@ public class Textifier extends Printer {
     }
 
     @Override
-    public void visitAnnotationEnd() {
-    }
+    public void visitAnnotationEnd() {}
 
     // ------------------------------------------------------------------------
     // Fields
     // ------------------------------------------------------------------------
 
     @Override
-    public Textifier visitFieldAnnotation(final String desc,
-                                          final boolean visible) {
+    public Textifier visitFieldAnnotation(final String desc, final boolean visible) {
         return visitAnnotation(desc, visible);
     }
 
@@ -612,8 +588,7 @@ public class Textifier extends Printer {
     }
 
     @Override
-    public void visitFieldEnd() {
-    }
+    public void visitFieldEnd() {}
 
     // ------------------------------------------------------------------------
     // Methods
@@ -629,14 +604,13 @@ public class Textifier extends Printer {
     }
 
     @Override
-    public Textifier visitMethodAnnotation(final String desc,
-                                           final boolean visible) {
+    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) {
+    public Textifier visitParameterAnnotation(final int parameter, final String desc,
+            final boolean visible) {
         buf.setLength(0);
         buf.append(tab2).append('@');
         appendDescriptor(FIELD_DESCRIPTOR, desc);
@@ -666,12 +640,11 @@ public class Textifier extends Printer {
     }
 
     @Override
-    public void visitCode() {
-    }
+    public void visitCode() {}
 
     @Override
-    public void visitFrame(final int type, final int nLocal,
-                           final Object[] local, final int nStack, final Object[] stack) {
+    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 ");
@@ -714,19 +687,16 @@ public class Textifier extends Printer {
     @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');
+        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');
+        buf.append(tab2).append(OPCODES[opcode]).append(' ').append(var).append('\n');
         text.add(buf.toString());
     }
 
@@ -740,8 +710,8 @@ public class Textifier extends Printer {
     }
 
     @Override
-    public void visitFieldInsn(final int opcode, final String owner,
-                               final String name, final String desc) {
+    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);
@@ -752,8 +722,8 @@ public class Textifier extends Printer {
     }
 
     @Override
-    public void visitMethodInsn(final int opcode, final String owner,
-                                final String name, final String desc) {
+    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);
@@ -764,8 +734,7 @@ public class Textifier extends Printer {
     }
 
     @Override
-    public void visitInvokeDynamicInsn(String name, String desc, Handle bsm,
-                                       Object... bsmArgs) {
+    public void visitInvokeDynamicInsn(String name, String desc, Handle bsm, Object... bsmArgs) {
         buf.setLength(0);
         buf.append(tab2).append("INVOKEDYNAMIC").append(' ');
         buf.append(name);
@@ -833,14 +802,13 @@ public class Textifier extends Printer {
     @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');
+        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) {
+    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) {
@@ -855,8 +823,7 @@ public class Textifier extends Printer {
     }
 
     @Override
-    public void visitLookupSwitchInsn(final Label dflt, final int[] keys,
-                                      final Label[] labels) {
+    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) {
@@ -880,8 +847,8 @@ public class Textifier extends Printer {
     }
 
     @Override
-    public void visitTryCatchBlock(final Label start, final Label end,
-                                   final Label handler, final String type) {
+    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);
@@ -896,9 +863,8 @@ public class Textifier extends Printer {
     }
 
     @Override
-    public void visitLocalVariable(final String name, final String desc,
-                                   final String signature, final Label start, final Label end,
-                                   final int index) {
+    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);
@@ -915,8 +881,7 @@ public class Textifier extends Printer {
             TraceSignatureVisitor sv = new TraceSignatureVisitor(0);
             SignatureReader r = new SignatureReader(signature);
             r.acceptType(sv);
-            buf.append(tab2).append("// declaration: ")
-                    .append(sv.getDeclaration()).append('\n');
+            buf.append(tab2).append("// declaration: ").append(sv.getDeclaration()).append('\n');
         }
         text.add(buf.toString());
     }
@@ -942,8 +907,7 @@ public class Textifier extends Printer {
     }
 
     @Override
-    public void visitMethodEnd() {
-    }
+    public void visitMethodEnd() {}
 
     // ------------------------------------------------------------------------
     // Common methods
@@ -952,7 +916,7 @@ public class Textifier extends Printer {
     /**
      * Prints a disassembled view of the given annotation.
      *
-     * @param desc    the class descriptor of the annotation 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.
      */
@@ -1001,17 +965,14 @@ public class Textifier extends Printer {
     }
 
     /**
-     * Appends an internal name, a type descriptor or a type signature to
-     * {@link #buf buf}.
+     * 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>.
+     * @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 (type == CLASS_SIGNATURE || type == FIELD_SIGNATURE || type == METHOD_SIGNATURE) {
             if (desc != null) {
                 buf.append("// signature ").append(desc).append('\n');
             }
@@ -1021,8 +982,8 @@ public class Textifier extends Printer {
     }
 
     /**
-     * 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.
+     * 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.
      */
@@ -1046,8 +1007,7 @@ public class Textifier extends Printer {
     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(" : ");
+        buf.append("// handle kind 0x").append(Integer.toHexString(tag)).append(" : ");
         switch (tag) {
             case Opcodes.H_GETFIELD:
                 buf.append("GETFIELD");
@@ -1088,8 +1048,7 @@ public class Textifier extends Printer {
     }
 
     /**
-     * Appends a string representation of the given access modifiers to
-     * {@link #buf buf}.
+     * Appends a string representation of the given access modifiers to {@link #buf buf}.
      *
      * @param access some access modifiers.
      */
diff --git a/src/main/asm/org/objectweb/asm/util/TraceAnnotationVisitor.java b/src/main/asm/org/objectweb/asm/util/TraceAnnotationVisitor.java
index 9c2259d..b7a3de9 100644
--- a/src/main/asm/org/objectweb/asm/util/TraceAnnotationVisitor.java
+++ b/src/main/asm/org/objectweb/asm/util/TraceAnnotationVisitor.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -33,8 +25,7 @@ import org.objectweb.asm.AnnotationVisitor;
 import org.objectweb.asm.Opcodes;
 
 /**
- * An {@link AnnotationVisitor} that prints the annotations it visits with a
- * {@link Printer}.
+ * An {@link AnnotationVisitor} that prints the annotations it visits with a {@link Printer}.
  * 
  * @author Eric Bruneton
  */
@@ -58,26 +49,22 @@ public final class TraceAnnotationVisitor extends AnnotationVisitor {
     }
 
     @Override
-    public void visitEnum(final String name, final String desc,
-            final String value) {
+    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) {
+    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);
+        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);
+        AnnotationVisitor av = this.av == null ? null : this.av.visitArray(name);
         return new TraceAnnotationVisitor(av, p);
     }
 
diff --git a/src/main/asm/org/objectweb/asm/util/TraceClassVisitor.java b/src/main/asm/org/objectweb/asm/util/TraceClassVisitor.java
index ccfeeb6..43fde90 100644
--- a/src/main/asm/org/objectweb/asm/util/TraceClassVisitor.java
+++ b/src/main/asm/org/objectweb/asm/util/TraceClassVisitor.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -39,10 +31,9 @@ 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.
+ * 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>
@@ -95,8 +86,7 @@ public final class TraceClassVisitor extends ClassVisitor {
     /**
      * Constructs a new {@link TraceClassVisitor}.
      * 
-     * @param pw
-     *            the print writer to be used to print the class.
+     * @param pw the print writer to be used to print the class.
      */
     public TraceClassVisitor(final PrintWriter pw) {
         this(null, pw);
@@ -105,11 +95,9 @@ public final class TraceClassVisitor extends ClassVisitor {
     /**
      * 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.
+     * @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);
@@ -118,18 +106,13 @@ public final class TraceClassVisitor extends ClassVisitor {
     /**
      * 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.
+     * @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) {
+    public TraceClassVisitor(final ClassVisitor cv, final Printer p, final PrintWriter pw) {
         super(Opcodes.ASM4, cv);
         this.pw = pw;
         this.p = p;
@@ -137,8 +120,7 @@ public final class TraceClassVisitor extends ClassVisitor {
 
     @Override
     public void visit(final int version, final int access, final String name,
-            final String signature, final String superName,
-            final String[] interfaces) {
+            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);
     }
@@ -150,18 +132,15 @@ public final class TraceClassVisitor extends ClassVisitor {
     }
 
     @Override
-    public void visitOuterClass(final String owner, final String name,
-            final String desc) {
+    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) {
+    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);
+        AnnotationVisitor av = cv == null ? null : cv.visitAnnotation(desc, visible);
         return new TraceAnnotationVisitor(av, p);
     }
 
@@ -172,28 +151,26 @@ public final class TraceClassVisitor extends ClassVisitor {
     }
 
     @Override
-    public void visitInnerClass(final String name, final String outerName,
-            final String innerName, final int access) {
+    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) {
+    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);
+        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);
+    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);
     }
 
diff --git a/src/main/asm/org/objectweb/asm/util/TraceFieldVisitor.java b/src/main/asm/org/objectweb/asm/util/TraceFieldVisitor.java
index 2158a72..5e2d363 100644
--- a/src/main/asm/org/objectweb/asm/util/TraceFieldVisitor.java
+++ b/src/main/asm/org/objectweb/asm/util/TraceFieldVisitor.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -35,8 +27,7 @@ import org.objectweb.asm.FieldVisitor;
 import org.objectweb.asm.Opcodes;
 
 /**
- * A {@link FieldVisitor} that prints the fields it visits with a
- * {@link Printer}.
+ * A {@link FieldVisitor} that prints the fields it visits with a {@link Printer}.
  * 
  * @author Eric Bruneton
  */
@@ -54,11 +45,9 @@ public final class TraceFieldVisitor extends FieldVisitor {
     }
 
     @Override
-    public AnnotationVisitor visitAnnotation(final String desc,
-            final boolean visible) {
+    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);
+        AnnotationVisitor av = fv == null ? null : fv.visitAnnotation(desc, visible);
         return new TraceAnnotationVisitor(av, p);
     }
 
diff --git a/src/main/asm/org/objectweb/asm/util/TraceMethodVisitor.java b/src/main/asm/org/objectweb/asm/util/TraceMethodVisitor.java
index 5462bd6..a6f446e 100644
--- a/src/main/asm/org/objectweb/asm/util/TraceMethodVisitor.java
+++ b/src/main/asm/org/objectweb/asm/util/TraceMethodVisitor.java
@@ -1,39 +1,30 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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}.
+ * A {@link MethodVisitor} that prints the methods it visits with a {@link Printer}.
  *
  * @author Eric Bruneton
  */
@@ -50,11 +41,9 @@ public final class TraceMethodVisitor extends MethodVisitor {
     }
 
     @Override
-    public AnnotationVisitor visitAnnotation(final String desc,
-                                             final boolean visible) {
+    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);
+        AnnotationVisitor av = mv == null ? null : mv.visitAnnotation(desc, visible);
         return new TraceAnnotationVisitor(av, p);
     }
 
@@ -72,11 +61,11 @@ public final class TraceMethodVisitor extends MethodVisitor {
     }
 
     @Override
-    public AnnotationVisitor visitParameterAnnotation(final int parameter,
-                                                      final String desc, final boolean visible) {
+    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);
+        AnnotationVisitor av =
+                mv == null ? null : mv.visitParameterAnnotation(parameter, desc, visible);
         return new TraceAnnotationVisitor(av, p);
     }
 
@@ -87,8 +76,8 @@ public final class TraceMethodVisitor extends MethodVisitor {
     }
 
     @Override
-    public void visitFrame(final int type, final int nLocal,
-                           final Object[] local, final int nStack, final Object[] stack) {
+    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);
     }
@@ -118,22 +107,21 @@ public final class TraceMethodVisitor extends MethodVisitor {
     }
 
     @Override
-    public void visitFieldInsn(final int opcode, final String owner,
-                               final String name, final String desc) {
+    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) {
+    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) {
+    public void visitInvokeDynamicInsn(String name, String desc, Handle bsm, Object... bsmArgs) {
         p.visitInvokeDynamicInsn(name, desc, bsm, bsmArgs);
         super.visitInvokeDynamicInsn(name, desc, bsm, bsmArgs);
     }
@@ -163,15 +151,14 @@ public final class TraceMethodVisitor extends MethodVisitor {
     }
 
     @Override
-    public void visitTableSwitchInsn(final int min, final int max,
-                                     final Label dflt, final Label... labels) {
+    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) {
+    public void visitLookupSwitchInsn(final Label dflt, final int[] keys, final Label[] labels) {
         p.visitLookupSwitchInsn(dflt, keys, labels);
         super.visitLookupSwitchInsn(dflt, keys, labels);
     }
@@ -183,16 +170,15 @@ public final class TraceMethodVisitor extends MethodVisitor {
     }
 
     @Override
-    public void visitTryCatchBlock(final Label start, final Label end,
-                                   final Label handler, final String type) {
+    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) {
+    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);
     }
diff --git a/src/main/asm/org/objectweb/asm/util/TraceSignatureVisitor.java b/src/main/asm/org/objectweb/asm/util/TraceSignatureVisitor.java
index 3fdda92..68a8da2 100644
--- a/src/main/asm/org/objectweb/asm/util/TraceSignatureVisitor.java
+++ b/src/main/asm/org/objectweb/asm/util/TraceSignatureVisitor.java
@@ -1,31 +1,23 @@
 /***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -33,8 +25,7 @@ import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.signature.SignatureVisitor;
 
 /**
- * A {@link SignatureVisitor} that prints a disassembled view of the signature
- * it visits.
+ * A {@link SignatureVisitor} that prints a disassembled view of the signature it visits.
  *
  * @author Eugene Kuleshov
  * @author Eric Bruneton
@@ -57,17 +48,16 @@ public final class TraceSignatureVisitor extends SignatureVisitor {
     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.
+     * 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.
+     * 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;
 
@@ -116,8 +106,7 @@ public final class TraceSignatureVisitor extends SignatureVisitor {
 
     @Override
     public SignatureVisitor visitInterface() {
-        separator = seenInterface ? ", " : isInterface ? " extends "
-                : " implements ";
+        separator = seenInterface ? ", " : isInterface ? " extends " : " implements ";
         seenInterface = true;
         startType();
         return this;
diff --git a/src/main/asm/org/objectweb/asm/xml/ASMContentHandler.java b/src/main/asm/org/objectweb/asm/xml/ASMContentHandler.java
index 16bec2c..4c04697 100644
--- a/src/main/asm/org/objectweb/asm/xml/ASMContentHandler.java
+++ b/src/main/asm/org/objectweb/asm/xml/ASMContentHandler.java
@@ -1,31 +1,22 @@
 /***
- * ASM XML Adapter
- * Copyright (c) 2004-2011, Eugene Kuleshov
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -40,9 +31,9 @@ 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.
+ * 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
@@ -208,8 +199,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
         addOpcode("INSTANCEOF", INSTANCEOF, OpcodeGroup.INSN_TYPE);
         addOpcode("MONITORENTER", MONITORENTER, OpcodeGroup.INSN);
         addOpcode("MONITOREXIT", MONITOREXIT, OpcodeGroup.INSN);
-        addOpcode("MULTIANEWARRAY", MULTIANEWARRAY,
-                OpcodeGroup.INSN_MULTIANEWARRAY);
+        addOpcode("MULTIANEWARRAY", MULTIANEWARRAY, OpcodeGroup.INSN_MULTIANEWARRAY);
         addOpcode("IFNULL", IFNULL, OpcodeGroup.INSN_JUMP);
         addOpcode("IFNONNULL", IFNONNULL, OpcodeGroup.INSN_JUMP);
     }
@@ -227,8 +217,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
     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.
+     * Current instance of the {@link ClassVisitor ClassVisitor} used to visit classfile bytecode.
      */
     protected ClassVisitor cv;
     /**
@@ -253,8 +242,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
         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/annotationDefault", new AnnotationDefaultRule());
 
         RULES.add(BASE + "/method/code/*", new OpcodesRule()); // opcodes
 
@@ -263,15 +251,12 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
         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/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/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/INVOKEDYNAMIC/bsmArg", new InvokeDynamicBsmArgumentsRule());
 
         RULES.add(BASE + "/method/code/Label", new LabelRule());
         RULES.add(BASE + "/method/code/TryCatch", new TryCatchRule());
@@ -282,8 +267,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
         RULES.add("*/annotation", new AnnotationRule());
         RULES.add("*/parameterAnnotation", new AnnotationParameterRule());
         RULES.add("*/annotationValue", new AnnotationValueRule());
-        RULES.add("*/annotationValueAnnotation",
-                new AnnotationValueAnnotationRule());
+        RULES.add("*/annotationValueAnnotation", new AnnotationValueAnnotationRule());
         RULES.add("*/annotationValueEnum", new AnnotationValueEnumRule());
         RULES.add("*/annotationValueArray", new AnnotationValueArrayRule());
     }
@@ -291,8 +275,8 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
     /**
      * Constructs a new {@link ASMContentHandler ASMContentHandler} object.
      *
-     * @param cv class visitor that will be called to reconstruct the classfile
-     *           using the XML stream.
+     * @param cv class visitor that will be called to reconstruct the classfile using the XML
+     *        stream.
      */
     public ASMContentHandler(final ClassVisitor cv) {
         this.cv = cv;
@@ -305,20 +289,19 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
     /**
      * 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.
+     * @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 {
+    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;
@@ -341,18 +324,17 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
     /**
      * 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.
+     * @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 {
+    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;
@@ -373,8 +355,8 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
     }
 
     /**
-     * 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. If there are no objects on the stack,
+     * return <code>null</code>.
      *
      * @return the top object on the stack without removing it.
      */
@@ -384,8 +366,8 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
     }
 
     /**
-     * Pop the top object off of the stack, and return it. If there are no
-     * objects on the stack, return <code>null</code>.
+     * 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.
      */
@@ -442,14 +424,14 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
             }
 
             int n = path.lastIndexOf('/');
-            for (Iterator<String> it = lpatterns.iterator(); it.hasNext(); ) {
+            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(); ) {
+            for (Iterator<String> it = rpatterns.iterator(); it.hasNext();) {
                 String pattern = it.next();
                 if (path.startsWith(pattern)) {
                     return rules.get(pattern);
@@ -480,22 +462,17 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
      */
     protected abstract class Rule {
 
-        public void begin(final String name, final Attributes attrs)
-                throws SAXException {
-        }
+        public void begin(final String name, final Attributes attrs) throws SAXException {}
 
-        public void end(final String name) {
-        }
+        public void end(final String name) {}
 
-        protected final Object getValue(final String desc, final String val)
-                throws SAXException {
+        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)
+                } 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);
 
@@ -515,8 +492,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
                     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)) {
+                } 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);
@@ -526,8 +502,8 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
 
                 } else {
                     // TODO use of default toString().
-                    throw new SAXException("Invalid value:" + val + " desc:"
-                            + desc + " ctx:" + this);
+                    throw new SAXException(
+                            "Invalid value:" + val + " desc:" + desc + " ctx:" + this);
                 }
             }
             return value;
@@ -539,8 +515,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
                 int descIndex = val.indexOf('(', dotIndex + 1);
                 int tagIndex = val.lastIndexOf('(');
 
-                int tag = Integer.parseInt(val.substring(tagIndex + 1,
-                        val.length() - 1));
+                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);
@@ -564,8 +539,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
                             sb.append('\\');
                         } else {
                             n++; // skip 'u'
-                            sb.append((char) Integer.parseInt(
-                                    val.substring(n, n + 4), 16));
+                            sb.append((char) Integer.parseInt(val.substring(n, n + 4), 16));
                             n += 3;
                         }
                     } else {
@@ -756,8 +730,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
     final class FieldRule extends Rule {
 
         @Override
-        public final void begin(final String element, final Attributes attrs)
-                throws SAXException {
+        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");
@@ -904,8 +877,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
         @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<Label>) vals.get("labels")).add(getLabel(attrs.getValue("name")));
             ((ArrayList<String>) vals.get("keys")).add(attrs.getValue("key"));
         }
     }
@@ -921,8 +893,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
             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(attrs.getValue("count") == null ? "0" : attrs.getValue("count"));
             push(typeLists);
         }
 
@@ -938,16 +909,13 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
             String count = (String) pop();
             String type = (String) pop();
             if ("NEW".equals(type)) {
-                getCodeVisitor()
-                        .visitFrame(F_NEW, nLocal, local, nStack, stack);
+                getCodeVisitor().visitFrame(F_NEW, nLocal, local, nStack, stack);
             } else if ("FULL".equals(type)) {
-                getCodeVisitor().visitFrame(F_FULL, nLocal, local, nStack,
-                        stack);
+                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);
+                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)) {
@@ -960,8 +928,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
 
         @Override
         public void begin(final String name, final Attributes attrs) {
-            ArrayList<Object> types = (ArrayList<Object>) ((HashMap<?, ?>) peek())
-                    .get(name);
+            ArrayList<Object> types = (ArrayList<Object>) ((HashMap<?, ?>) peek()).get(name);
             String type = attrs.getValue("type");
             if ("uninitialized".equals(type)) {
                 types.add(getLabel(attrs.getValue("label")));
@@ -1028,8 +995,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
             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);
+            getCodeVisitor().visitLocalVariable(name, desc, signature, start, end, var);
         }
     }
 
@@ -1038,8 +1004,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
      */
     final class InvokeDynamicRule extends Rule {
         @Override
-        public final void begin(final String element, final Attributes attrs)
-                throws SAXException {
+        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")));
@@ -1052,8 +1017,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
             Handle bsm = (Handle) pop();
             String desc = (String) pop();
             String name = (String) pop();
-            getCodeVisitor().visitInvokeDynamicInsn(name, desc, bsm,
-                    bsmArgs.toArray());
+            getCodeVisitor().visitInvokeDynamicInsn(name, desc, bsm, bsmArgs.toArray());
         }
     }
 
@@ -1062,8 +1026,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
      */
     final class InvokeDynamicBsmArgumentsRule extends Rule {
         @Override
-        public final void begin(final String element, final Attributes attrs)
-                throws SAXException {
+        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")));
         }
@@ -1079,12 +1042,10 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
         // }
 
         @Override
-        public final void begin(final String element, final Attributes attrs)
-                throws SAXException {
+        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);
+                throw new SAXException("Invalid element: " + element + " at " + match);
             }
 
             switch (o.type) {
@@ -1093,9 +1054,8 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
                     break;
 
                 case OpcodeGroup.INSN_FIELD:
-                    getCodeVisitor().visitFieldInsn(o.opcode,
-                            attrs.getValue("owner"), attrs.getValue("name"),
-                            attrs.getValue("desc"));
+                    getCodeVisitor().visitFieldInsn(o.opcode, attrs.getValue("owner"),
+                            attrs.getValue("name"), attrs.getValue("desc"));
                     break;
 
                 case OpcodeGroup.INSN_INT:
@@ -1104,19 +1064,16 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
                     break;
 
                 case OpcodeGroup.INSN_JUMP:
-                    getCodeVisitor().visitJumpInsn(o.opcode,
-                            getLabel(attrs.getValue("label")));
+                    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"));
+                    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"));
+                    getCodeVisitor().visitTypeInsn(o.opcode, attrs.getValue("desc"));
                     break;
 
                 case OpcodeGroup.INSN_VAR:
@@ -1125,21 +1082,17 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
                     break;
 
                 case OpcodeGroup.INSN_IINC:
-                    getCodeVisitor().visitIincInsn(
-                            Integer.parseInt(attrs.getValue("var")),
+                    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")));
+                            .visitLdcInsn(getValue(attrs.getValue("desc"), attrs.getValue("cst")));
                     break;
 
                 case OpcodeGroup.INSN_MULTIANEWARRAY:
-                    getCodeVisitor().visitMultiANewArrayInsn(
-                            attrs.getValue("desc"),
+                    getCodeVisitor().visitMultiANewArrayInsn(attrs.getValue("desc"),
                             Integer.parseInt(attrs.getValue("dims")));
                     break;
 
@@ -1168,8 +1121,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
         @Override
         public void begin(final String name, final Attributes attrs) {
             String desc = attrs.getValue("desc");
-            boolean visible = Boolean.valueOf(attrs.getValue("visible"))
-                    .booleanValue();
+            boolean visible = Boolean.valueOf(attrs.getValue("visible")).booleanValue();
 
             Object v = peek();
             if (v instanceof ClassVisitor) {
@@ -1196,11 +1148,9 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
         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();
+            boolean visible = Boolean.valueOf(attrs.getValue("visible")).booleanValue();
 
-            push(((MethodVisitor) peek()).visitParameterAnnotation(parameter,
-                    desc, visible));
+            push(((MethodVisitor) peek()).visitParameterAnnotation(parameter, desc, visible));
         }
 
         @Override
@@ -1215,14 +1165,11 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
     final class AnnotationValueRule extends Rule {
 
         @Override
-        public void begin(final String nm, final Attributes attrs)
-                throws SAXException {
+        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")));
+                av.visit(attrs.getValue("name"),
+                        getValue(attrs.getValue("desc"), attrs.getValue("value")));
             }
         }
     }
@@ -1244,8 +1191,8 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
         @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")));
+            push(av == null ? null
+                    : av.visitAnnotation(attrs.getValue("name"), attrs.getValue("desc")));
         }
 
         @Override
diff --git a/src/main/asm/org/objectweb/asm/xml/Processor.java b/src/main/asm/org/objectweb/asm/xml/Processor.java
index aafa861..75a7747 100644
--- a/src/main/asm/org/objectweb/asm/xml/Processor.java
+++ b/src/main/asm/org/objectweb/asm/xml/Processor.java
@@ -1,31 +1,22 @@
 /***
- * ASM XML Adapter
- * Copyright (c) 2004-2011, Eugene Kuleshov
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -49,12 +40,11 @@ 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.
+ * 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.
+ * <tt>javax.xml.transform.TransformerFactory</tt> must be set to one of the following values.
  *
  * <blockquote>
  * <table border="1" cellspacing="0" cellpadding="3">
@@ -110,8 +100,7 @@ public class Processor {
     private int n = 0;
 
     public Processor(final int inRepresenation, final int outRepresentation,
-                     final InputStream input, final OutputStream output,
-                     final Source xslt) {
+            final InputStream input, final OutputStream output, final Source xslt) {
         this.inRepresentation = inRepresenation;
         this.outRepresentation = outRepresentation;
         this.input = input;
@@ -119,8 +108,7 @@ public class Processor {
         this.xslt = xslt;
     }
 
-    private static byte[] readEntry(final InputStream zis, final ZipEntry ze)
-            throws IOException {
+    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];
@@ -181,15 +169,13 @@ public class Processor {
             return;
         }
 
-        Processor m = new Processor(inRepresentation, outRepresentation, is,
-                os, xslt);
+        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");
+        System.err.println((l2 - l1) + "ms  " + 1000f * n / (l2 - l1) + " resources/sec");
     }
 
     private static int getRepresentation(final String s) {
@@ -204,12 +190,10 @@ public class Processor {
     }
 
     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");
+        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 {
@@ -217,12 +201,10 @@ public class Processor {
         final ZipOutputStream zos = new ZipOutputStream(output);
         final OutputStreamWriter osw = new OutputStreamWriter(zos);
 
-        Thread.currentThread().setContextClassLoader(
-                getClass().getClassLoader());
+        Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
 
         TransformerFactory tf = TransformerFactory.newInstance();
-        if (!tf.getFeature(SAXSource.FEATURE)
-                || !tf.getFeature(SAXResult.FEATURE)) {
+        if (!tf.getFeature(SAXSource.FEATURE) || !tf.getFeature(SAXResult.FEATURE)) {
             return 0;
         }
 
@@ -240,13 +222,13 @@ public class Processor {
         ContentHandler outDocHandler = null;
         switch (outRepresentation) {
             case BYTECODE:
-                outDocHandler = new OutputSlicingHandler(
-                        new ASMContentHandlerFactory(zos), entryElement, false);
+                outDocHandler = new OutputSlicingHandler(new ASMContentHandlerFactory(zos),
+                        entryElement, false);
                 break;
 
             case MULTI_XML:
-                outDocHandler = new OutputSlicingHandler(new SAXWriterFactory(osw,
-                        true), entryElement, true);
+                outDocHandler = new OutputSlicingHandler(new SAXWriterFactory(osw, true),
+                        entryElement, true);
                 break;
 
             case SINGLE_XML:
@@ -264,16 +246,13 @@ public class Processor {
             inDocHandler = outDocHandler;
         } else {
             inDocHandler = new InputSlicingHandler("class", outDocHandler,
-                    new TransformerHandlerFactory(saxtf, templates,
-                            outDocHandler));
+                    new TransformerHandlerFactory(saxtf, templates, outDocHandler));
         }
-        ContentHandlerFactory inDocHandlerFactory = new SubdocumentHandlerFactory(
-                inDocHandler);
+        ContentHandlerFactory inDocHandlerFactory = new SubdocumentHandlerFactory(inDocHandler);
 
         if (inDocHandler != null && inRepresentation != SINGLE_XML) {
             inDocHandler.startDocument();
-            inDocHandler.startElement("", "classes", "classes",
-                    new AttributesImpl());
+            inDocHandler.startElement("", "classes", "classes", new AttributesImpl());
         }
 
         int i = 0;
@@ -335,8 +314,7 @@ public class Processor {
     // return factory;
     // }
 
-    private void copyEntry(final InputStream is, final OutputStream os)
-            throws IOException {
+    private void copyEntry(final InputStream is, final OutputStream os) throws IOException {
         if (outRepresentation == SINGLE_XML) {
             return;
         }
@@ -355,7 +333,7 @@ public class Processor {
     }
 
     private void processEntry(final ZipInputStream zis, final ZipEntry ze,
-                              final ContentHandlerFactory handlerFactory) {
+            final ContentHandlerFactory handlerFactory) {
         ContentHandler handler = handlerFactory.createContentHandler();
         try {
 
@@ -376,9 +354,8 @@ public class Processor {
                 XMLReader reader = XMLReaderFactory.createXMLReader();
                 reader.setContentHandler(handler);
                 reader.parse(new InputSource(
-                        singleInputDocument ? (InputStream) new ProtectedInputStream(
-                                zis) : new ByteArrayInputStream(readEntry(zis,
-                                ze))));
+                        singleInputDocument ? (InputStream) new ProtectedInputStream(zis)
+                                : new ByteArrayInputStream(readEntry(zis, ze))));
 
             }
         } catch (Exception ex) {
@@ -400,8 +377,7 @@ public class Processor {
             if (inRepresentation != BYTECODE && outRepresentation == BYTECODE) {
                 name = name.substring(0, name.length() - 4); // .class.xml to
                 // .class
-            } else if (inRepresentation == BYTECODE
-                    && outRepresentation != BYTECODE) {
+            } else if (inRepresentation == BYTECODE && outRepresentation != BYTECODE) {
                 name += ".xml"; // .class to .class.xml
             }
             // } else if( CODE2ASM.equals( command)) {
@@ -427,8 +403,7 @@ public class Processor {
 
     /**
      * A {@link ContentHandlerFactory ContentHandlerFactory} is used to create
-     * {@link org.xml.sax.ContentHandler ContentHandler} instances for concrete
-     * context.
+     * {@link org.xml.sax.ContentHandler ContentHandler} instances for concrete context.
      */
     private static interface ContentHandlerFactory {
 
@@ -450,8 +425,8 @@ public class Processor {
     }
 
     /**
-     * IputStream wrapper class used to protect input streams from being closed
-     * by some stupid XML parsers.
+     * 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;
@@ -461,8 +436,7 @@ public class Processor {
         }
 
         @Override
-        public final void close() throws IOException {
-        }
+        public final void close() throws IOException {}
 
         @Override
         public final int read() throws IOException {
@@ -470,8 +444,7 @@ public class Processor {
         }
 
         @Override
-        public final int read(final byte[] b, final int off, final int len)
-                throws IOException {
+        public final int read(final byte[] b, final int off, final int len) throws IOException {
             return is.read(b, off, len);
         }
 
@@ -484,8 +457,7 @@ public class Processor {
     /**
      * SAXWriterFactory
      */
-    private static final class SAXWriterFactory implements
-            ContentHandlerFactory {
+    private static final class SAXWriterFactory implements ContentHandlerFactory {
         private final Writer w;
 
         private final boolean optimizeEmptyElements;
@@ -504,8 +476,7 @@ public class Processor {
     /**
      * ASMContentHandlerFactory
      */
-    private static final class ASMContentHandlerFactory implements
-            ContentHandlerFactory {
+    private static final class ASMContentHandlerFactory implements ContentHandlerFactory {
         final OutputStream os;
 
         ASMContentHandlerFactory(final OutputStream os) {
@@ -531,14 +502,13 @@ public class Processor {
     /**
      * TransformerHandlerFactory
      */
-    private static final class TransformerHandlerFactory implements
-            ContentHandlerFactory {
+    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) {
+        TransformerHandlerFactory(final SAXTransformerFactory saxtf, final Templates templates,
+                final ContentHandler outputHandler) {
             this.saxtf = saxtf;
             this.templates = templates;
             this.outputHandler = outputHandler;
@@ -546,8 +516,7 @@ public class Processor {
 
         public final ContentHandler createContentHandler() {
             try {
-                TransformerHandler handler = saxtf
-                        .newTransformerHandler(templates);
+                TransformerHandler handler = saxtf.newTransformerHandler(templates);
                 handler.setResult(new SAXResult(outputHandler));
                 return handler;
             } catch (TransformerConfigurationException ex) {
@@ -559,8 +528,7 @@ public class Processor {
     /**
      * SubdocumentHandlerFactory
      */
-    private static final class SubdocumentHandlerFactory implements
-            ContentHandlerFactory {
+    private static final class SubdocumentHandlerFactory implements ContentHandlerFactory {
         private final ContentHandler subdocumentHandler;
 
         SubdocumentHandlerFactory(final ContentHandler subdocumentHandler) {
@@ -574,17 +542,16 @@ public class Processor {
     }
 
     /**
-     * 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}.
+     * 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>
+     * <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 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;
@@ -594,9 +561,9 @@ public class Processor {
         /**
          * Creates <code>SAXWriter</code>.
          *
-         * @param w                     writer
+         * @param w writer
          * @param optimizeEmptyElements if set to <code>true</code>, short XML syntax will be used
-         *                              for empty elements
+         *        for empty elements
          */
         SAXWriter(final Writer w, final boolean optimizeEmptyElements) {
             this.w = w;
@@ -632,8 +599,7 @@ public class Processor {
 
                     default:
                         if (ch > 0x7f) {
-                            sb.append("&#").append(Integer.toString(ch))
-                                    .append(';');
+                            sb.append("&#").append(Integer.toString(ch)).append(';');
                         } else {
                             sb.append(ch);
                         }
@@ -644,8 +610,8 @@ public class Processor {
         }
 
         @Override
-        public final void startElement(final String ns, final String localName,
-                                       final String qName, final Attributes atts) throws SAXException {
+        public final void startElement(final String ns, final String localName, final String qName,
+                final Attributes atts) throws SAXException {
             try {
                 closeElement();
 
@@ -669,8 +635,8 @@ public class Processor {
         }
 
         @Override
-        public final void endElement(final String ns, final String localName,
-                                     final String qName) throws SAXException {
+        public final void endElement(final String ns, final String localName, final String qName)
+                throws SAXException {
             ident -= 2;
             try {
                 if (openElement) {
@@ -714,27 +680,20 @@ public class Processor {
             }
         }
 
-        public final void startDTD(final String arg0, final String arg1,
-                                   final String arg2) throws SAXException {
-        }
+        public final void startDTD(final String arg0, final String arg1, final String arg2)
+                throws SAXException {}
 
-        public final void endDTD() throws SAXException {
-        }
+        public final void endDTD() throws SAXException {}
 
-        public final void startEntity(final String arg0) throws SAXException {
-        }
+        public final void startEntity(final String arg0) throws SAXException {}
 
-        public final void endEntity(final String arg0) throws SAXException {
-        }
+        public final void endEntity(final String arg0) throws SAXException {}
 
-        public final void startCDATA() throws SAXException {
-        }
+        public final void startCDATA() throws SAXException {}
 
-        public final void endCDATA() throws SAXException {
-        }
+        public final void endCDATA() throws SAXException {}
 
-        private final void writeAttributes(final Attributes atts)
-                throws IOException {
+        private final void writeAttributes(final Attributes atts) throws IOException {
             StringBuffer sb = new StringBuffer();
             int len = atts.getLength();
             for (int i = 0; i < len; i++) {
@@ -767,12 +726,11 @@ public class Processor {
     }
 
     /**
-     * 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.
+     * 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
      */
@@ -786,37 +744,29 @@ public class Processor {
         private ContentHandler subdocumentHandler;
 
         /**
-         * Constructs a new {@link InputSlicingHandler SubdocumentHandler}
-         * object.
+         * 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.
+         * @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) {
+        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 {
+        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);
+                subdocumentHandler.startElement(namespaceURI, localName, qName, list);
             } else if (localName.equals(subdocumentRoot)) {
-                subdocumentHandler = subdocumentHandlerFactory
-                        .createContentHandler();
+                subdocumentHandler = subdocumentHandlerFactory.createContentHandler();
                 subdocumentHandler.startDocument();
-                subdocumentHandler.startElement(namespaceURI, localName, qName,
-                        list);
+                subdocumentHandler.startElement(namespaceURI, localName, qName, list);
                 subdocument = true;
             } else if (rootHandler != null) {
                 rootHandler.startElement(namespaceURI, localName, qName, list);
@@ -824,8 +774,8 @@ public class Processor {
         }
 
         @Override
-        public final void endElement(final String namespaceURI,
-                                     final String localName, final String qName) throws SAXException {
+        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)) {
@@ -853,8 +803,8 @@ public class Processor {
         }
 
         @Override
-        public final void characters(final char[] buff, final int offset,
-                                     final int size) throws SAXException {
+        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) {
@@ -865,12 +815,11 @@ public class Processor {
     }
 
     /**
-     * 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.
+     * 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
@@ -886,17 +835,14 @@ public class Processor {
         private ContentHandler subdocumentHandler;
 
         /**
-         * Constructs a new {@link OutputSlicingHandler SubdocumentHandler}
-         * object.
+         * 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.
+         * @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,
+        OutputSlicingHandler(final ContentHandlerFactory subdocumentHandlerFactory,
                 final EntryElement entryElement, final boolean isXml) {
             this.subdocumentRoot = "class";
             this.subdocumentHandlerFactory = subdocumentHandlerFactory;
@@ -905,36 +851,30 @@ public class Processor {
         }
 
         @Override
-        public final void startElement(final String namespaceURI,
-                                       final String localName, final String qName,
-                                       final Attributes list) throws SAXException {
+        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);
+                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.");
+                    throw new SAXException("Class element without name attribute.");
                 }
                 try {
-                    entryElement.openEntry(isXml ? name + ".class.xml" : name
-                            + ".class");
+                    entryElement.openEntry(isXml ? name + ".class.xml" : name + ".class");
                 } catch (IOException ex) {
                     throw new SAXException(ex.toString(), ex);
                 }
-                subdocumentHandler = subdocumentHandlerFactory
-                        .createContentHandler();
+                subdocumentHandler = subdocumentHandlerFactory.createContentHandler();
                 subdocumentHandler.startDocument();
-                subdocumentHandler.startElement(namespaceURI, localName, qName,
-                        list);
+                subdocumentHandler.startElement(namespaceURI, localName, qName, list);
                 subdocument = true;
             }
         }
 
         @Override
-        public final void endElement(final String namespaceURI,
-                                     final String localName, final String qName) throws SAXException {
+        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)) {
@@ -950,16 +890,14 @@ public class Processor {
         }
 
         @Override
-        public final void startDocument() throws SAXException {
-        }
+        public final void startDocument() throws SAXException {}
 
         @Override
-        public final void endDocument() throws SAXException {
-        }
+        public final void endDocument() throws SAXException {}
 
         @Override
-        public final void characters(final char[] buff, final int offset,
-                                     final int size) throws SAXException {
+        public final void characters(final char[] buff, final int offset, final int size)
+                throws SAXException {
             if (subdocument) {
                 subdocumentHandler.characters(buff, offset, size);
             }
diff --git a/src/main/asm/org/objectweb/asm/xml/SAXAdapter.java b/src/main/asm/org/objectweb/asm/xml/SAXAdapter.java
index 1eef234..f9479d0 100644
--- a/src/main/asm/org/objectweb/asm/xml/SAXAdapter.java
+++ b/src/main/asm/org/objectweb/asm/xml/SAXAdapter.java
@@ -1,31 +1,22 @@
 /***
- * ASM XML Adapter
- * Copyright (c) 2004-2011, Eugene Kuleshov
- * All rights reserved.
+ * 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.
+ * 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 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;
 
diff --git a/src/main/asm/org/objectweb/asm/xml/SAXAnnotationAdapter.java b/src/main/asm/org/objectweb/asm/xml/SAXAnnotationAdapter.java
index e8b587f..985e1e7 100644
--- a/src/main/asm/org/objectweb/asm/xml/SAXAnnotationAdapter.java
+++ b/src/main/asm/org/objectweb/asm/xml/SAXAnnotationAdapter.java
@@ -1,31 +1,22 @@
 /***
- * ASM XML Adapter
- * Copyright (c) 2004-2011, Eugene Kuleshov
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -43,19 +34,18 @@ 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) {
+    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) {
+    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) {
+    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;
@@ -65,12 +55,10 @@ public final class SAXAnnotationAdapter extends AnnotationVisitor {
             att.addAttribute("", "name", "name", "", name);
         }
         if (visible != 0) {
-            att.addAttribute("", "visible", "visible", "", visible > 0 ? "true"
-                    : "false");
+            att.addAttribute("", "visible", "visible", "", visible > 0 ? "true" : "false");
         }
         if (parameter != -1) {
-            att.addAttribute("", "parameter", "parameter", "",
-                    Integer.toString(parameter));
+            att.addAttribute("", "parameter", "parameter", "", Integer.toString(parameter));
         }
         if (desc != null) {
             att.addAttribute("", "desc", "desc", "", desc);
@@ -135,28 +123,23 @@ public final class SAXAnnotationAdapter extends AnnotationVisitor {
             }
             av.visitEnd();
         } else {
-            addValueElement("annotationValue", name, Type.getDescriptor(c),
-                    value.toString());
+            addValueElement("annotationValue", name, Type.getDescriptor(c), value.toString());
         }
     }
 
     @Override
-    public void visitEnum(final String name, final String desc,
-                          final String value) {
+    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);
+    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);
+        return new SAXAnnotationAdapter(sa, "annotationValueArray", 0, name, null);
     }
 
     @Override
@@ -164,8 +147,8 @@ public final class SAXAnnotationAdapter extends AnnotationVisitor {
         sa.addEnd(elementName);
     }
 
-    private void addValueElement(final String element, final String name,
-                                 final String desc, final String value) {
+    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);
@@ -174,8 +157,7 @@ public final class SAXAnnotationAdapter extends AnnotationVisitor {
             att.addAttribute("", "desc", "desc", "", desc);
         }
         if (value != null) {
-            att.addAttribute("", "value", "value", "",
-                    SAXClassAdapter.encode(value));
+            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
index 64e330e..88552f8 100644
--- a/src/main/asm/org/objectweb/asm/xml/SAXClassAdapter.java
+++ b/src/main/asm/org/objectweb/asm/xml/SAXClassAdapter.java
@@ -1,31 +1,22 @@
 /***
- * ASM XML Adapter
- * Copyright (c) 2004-2011, Eugene Kuleshov
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -34,10 +25,9 @@ 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.
+ * 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
@@ -62,10 +52,10 @@ public final class SAXClassAdapter extends ClassVisitor {
     /**
      * Constructs a new {@link SAXClassAdapter SAXClassAdapter} object.
      *
-     * @param h              content handler that will be used to send SAX 2.0 events.
+     * @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.
+     *        {@link ContentHandler#startDocument() startDocument()} and
+     *        {@link ContentHandler#endDocument() endDocument()} events.
      */
     public SAXClassAdapter(final ContentHandler h, boolean singleDocument) {
         super(Opcodes.ASM4);
@@ -176,8 +166,7 @@ public final class SAXClassAdapter extends ClassVisitor {
     }
 
     @Override
-    public void visitOuterClass(final String owner, final String name,
-                                final String desc) {
+    public void visitOuterClass(final String owner, final String name, final String desc) {
         AttributesImpl att = new AttributesImpl();
         att.addAttribute("", "owner", "owner", "", owner);
         if (name != null) {
@@ -191,16 +180,13 @@ public final class SAXClassAdapter extends ClassVisitor {
     }
 
     @Override
-    public AnnotationVisitor visitAnnotation(final String desc,
-                                             final boolean visible) {
-        return new SAXAnnotationAdapter(sa, "annotation", visible ? 1 : -1,
-                null, desc);
+    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) {
+            final String signature, final String superName, final String[] interfaces) {
         StringBuffer sb = new StringBuffer();
         appendAccess(access | ACCESS_CLASS, sb);
 
@@ -210,16 +196,13 @@ public final class SAXClassAdapter extends ClassVisitor {
             att.addAttribute("", "name", "name", "", name);
         }
         if (signature != null) {
-            att.addAttribute("", "signature", "signature", "",
-                    encode(signature));
+            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));
+        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());
@@ -234,8 +217,8 @@ public final class SAXClassAdapter extends ClassVisitor {
     }
 
     @Override
-    public FieldVisitor visitField(final int access, final String name,
-                                   final String desc, final String signature, final Object value) {
+    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);
 
@@ -244,8 +227,7 @@ public final class SAXClassAdapter extends ClassVisitor {
         att.addAttribute("", "name", "name", "", name);
         att.addAttribute("", "desc", "desc", "", desc);
         if (signature != null) {
-            att.addAttribute("", "signature", "signature", "",
-                    encode(signature));
+            att.addAttribute("", "signature", "signature", "", encode(signature));
         }
         if (value != null) {
             att.addAttribute("", "value", "value", "", encode(value.toString()));
@@ -255,8 +237,8 @@ public final class SAXClassAdapter extends ClassVisitor {
     }
 
     @Override
-    public MethodVisitor visitMethod(final int access, final String name,
-                                     final String desc, final String signature, final String[] exceptions) {
+    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);
 
@@ -283,8 +265,8 @@ public final class SAXClassAdapter extends ClassVisitor {
     }
 
     @Override
-    public final void visitInnerClass(final String name,
-                                      final String outerName, final String innerName, final int access) {
+    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);
 
diff --git a/src/main/asm/org/objectweb/asm/xml/SAXCodeAdapter.java b/src/main/asm/org/objectweb/asm/xml/SAXCodeAdapter.java
index c575df6..abf0732 100644
--- a/src/main/asm/org/objectweb/asm/xml/SAXCodeAdapter.java
+++ b/src/main/asm/org/objectweb/asm/xml/SAXCodeAdapter.java
@@ -1,31 +1,22 @@
 /***
- * ASM XML Adapter
- * Copyright (c) 2004-2011, Eugene Kuleshov
- * All rights reserved.
+ * 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.
+ * 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 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;
 
@@ -37,16 +28,15 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * A {@link MethodVisitor} that generates SAX 2.0 events from the visited
- * method.
+ * 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"};
+    static final String[] TYPES =
+            {"top", "int", "float", "double", "long", "null", "uninitializedThis"};
 
     private final Map<Label, String> labelNames;
     SAXAdapter sa;
@@ -68,20 +58,17 @@ public final class SAXCodeAdapter extends MethodVisitor {
 
     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()));
+        attrs.addAttribute("", "cst", "cst", "", SAXClassAdapter.encode(cst.toString()));
+        attrs.addAttribute("", "desc", "desc", "", Type.getDescriptor(cst.getClass()));
         return attrs;
     }
 
     @Override
-    public final void visitCode() {
-    }
+    public final void visitCode() {}
 
     @Override
-    public void visitFrame(final int type, final int nLocal,
-                           final Object[] local, final int nStack, final Object[] stack) {
+    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:
@@ -102,8 +89,7 @@ public final class SAXCodeAdapter extends MethodVisitor {
                 break;
             case Opcodes.F_CHOP:
                 attrs.addAttribute("", "type", "type", "", "CHOP");
-                attrs.addAttribute("", "count", "count", "",
-                        Integer.toString(nLocal));
+                attrs.addAttribute("", "count", "count", "", Integer.toString(nLocal));
                 sa.addStart("frame", attrs);
                 break;
             case Opcodes.F_SAME:
@@ -119,20 +105,17 @@ public final class SAXCodeAdapter extends MethodVisitor {
         sa.addEnd("frame");
     }
 
-    private void appendFrameTypes(final boolean local, final int n,
-                                  final Object[] types) {
+    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()]);
+                attrs.addAttribute("", "type", "type", "", TYPES[((Integer) type).intValue()]);
             } else {
                 attrs.addAttribute("", "type", "type", "", "uninitialized");
-                attrs.addAttribute("", "label", "label", "",
-                        getLabel((Label) type));
+                attrs.addAttribute("", "label", "label", "", getLabel((Label) type));
             }
             sa.addElement(local ? "local" : "stack", attrs);
         }
@@ -165,8 +148,8 @@ public final class SAXCodeAdapter extends MethodVisitor {
     }
 
     @Override
-    public final void visitFieldInsn(final int opcode, final String owner,
-                                     final String name, final String desc) {
+    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);
@@ -175,8 +158,8 @@ public final class SAXCodeAdapter extends MethodVisitor {
     }
 
     @Override
-    public final void visitMethodInsn(final int opcode, final String owner,
-                                      final String name, final String desc) {
+    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);
@@ -185,13 +168,11 @@ public final class SAXCodeAdapter extends MethodVisitor {
     }
 
     @Override
-    public void visitInvokeDynamicInsn(String name, String desc, Handle bsm,
-                                       Object... bsmArgs) {
+    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()));
+        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]));
@@ -227,8 +208,8 @@ public final class SAXCodeAdapter extends MethodVisitor {
     }
 
     @Override
-    public final void visitTableSwitchInsn(final int min, final int max,
-                                           final Label dflt, final Label... labels) {
+    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));
@@ -245,7 +226,7 @@ public final class SAXCodeAdapter extends MethodVisitor {
 
     @Override
     public final void visitLookupSwitchInsn(final Label dflt, final int[] keys,
-                                            final Label[] labels) {
+            final Label[] labels) {
         AttributesImpl att = new AttributesImpl();
         att.addAttribute("", "dflt", "dflt", "", getLabel(dflt));
         String o = Printer.OPCODES[Opcodes.LOOKUPSWITCH];
@@ -268,8 +249,8 @@ public final class SAXCodeAdapter extends MethodVisitor {
     }
 
     @Override
-    public final void visitTryCatchBlock(final Label start, final Label end,
-                                         final Label handler, final String type) {
+    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));
@@ -283,25 +264,21 @@ public final class SAXCodeAdapter extends MethodVisitor {
     @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));
+        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) {
+    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("", "signature", "signature", "", SAXClassAdapter.encode(signature));
         }
         attrs.addAttribute("", "start", "start", "", getLabel(start));
         attrs.addAttribute("", "end", "end", "", getLabel(end));
@@ -323,17 +300,15 @@ public final class SAXCodeAdapter extends MethodVisitor {
     }
 
     @Override
-    public AnnotationVisitor visitAnnotation(final String desc,
-                                             final boolean visible) {
-        return new SAXAnnotationAdapter(sa, "annotation", visible ? 1 : -1,
-                null, desc);
+    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);
+    public AnnotationVisitor visitParameterAnnotation(final int parameter, final String desc,
+            final boolean visible) {
+        return new SAXAnnotationAdapter(sa, "parameterAnnotation", visible ? 1 : -1, parameter,
+                desc);
     }
 
     @Override
diff --git a/src/main/asm/org/objectweb/asm/xml/SAXFieldAdapter.java b/src/main/asm/org/objectweb/asm/xml/SAXFieldAdapter.java
index 46a6bc3..15341bf 100644
--- a/src/main/asm/org/objectweb/asm/xml/SAXFieldAdapter.java
+++ b/src/main/asm/org/objectweb/asm/xml/SAXFieldAdapter.java
@@ -1,31 +1,22 @@
 /***
- * ASM XML Adapter
- * Copyright (c) 2004-2011, Eugene Kuleshov
- * All rights reserved.
+ * 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.
+ * 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 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;
 
diff --git a/src/main/base/org/bdware/sc/ComponedContractResult.java b/src/main/base/org/bdware/sc/ComponedContractResult.java
index c1bae44..2bf43ca 100644
--- a/src/main/base/org/bdware/sc/ComponedContractResult.java
+++ b/src/main/base/org/bdware/sc/ComponedContractResult.java
@@ -15,10 +15,10 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class ComponedContractResult {
-    //    public static final String RecoveringStr = "";
+    // 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; //  >=的结果可返回
+    private final int THRESHOLD; // >=的结果可返回
     Map<String, ContractResult> resultMap = new HashMap<>(); // 只有状态是Success的返回结果会存在这个map中
     Set<String> problemNodes = new HashSet<>();
 
@@ -29,10 +29,8 @@ public class ComponedContractResult {
 
     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")) {
+        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);
@@ -54,19 +52,18 @@ public class ComponedContractResult {
             }
         } catch (Exception e) {
             String str = null;
-            cr2 =
-                    new ContractResult(
-                            ContractResult.Status.Error, new JsonPrimitive("parse str failed:" + obj.toString()));
+            cr2 = new ContractResult(ContractResult.Status.Error,
+                    new JsonPrimitive("parse str failed:" + obj.toString()));
             e.printStackTrace();
         }
         // if (cr2.status == ContractResult.Status.Error) { // 结果不是Success不参与最终结果计算
-        //   String nodeID = obj.get("nodeID").getAsString();
-        //  logger.info("problemsNodes中加入 " + nodeID);
-        //  problemNodes.add(nodeID);
-        //  return;
+        // String nodeID = obj.get("nodeID").getAsString();
+        // logger.info("problemsNodes中加入 " + nodeID);
+        // problemNodes.add(nodeID);
+        // return;
         // }
-        //  if(cr2.status == ContractResult.Status.Exception){
-        //    return;
+        // if(cr2.status == ContractResult.Status.Exception){
+        // return;
         // }
         // cr2.executeTime.add(obj.get("executeTime").getAsLong());
         resultMap.put(obj.get("nodeID").getAsString(), cr2);
@@ -76,12 +73,12 @@ public class ComponedContractResult {
         ContractResult finalResult = null;
 
         Map<JsonElement, Integer> map = new ConcurrentHashMap<>(); // <结果，出现次数>
-        Map<JsonElement, ContractResult> tempMap =
-                new ConcurrentHashMap<>(); // key为C哦耨天然磁铁Result的result字段
+        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;
+            if (tempResult.result == null)
+                tempResult.result = JsonNull.INSTANCE;
             JsonElement str = tempResult.result;
             // 遍历各个节点的返回结果
             if (!map.containsKey(str)) {
@@ -111,9 +108,8 @@ public class ComponedContractResult {
             }
         } else {
             // 返回结果，无多于一半一致
-            finalResult =
-                    new ContractResult(
-                            ContractResult.Status.Error, new JsonPrimitive("invalid result"));
+            finalResult = new ContractResult(ContractResult.Status.Error,
+                    new JsonPrimitive("invalid result"));
             finalResult.analysis = JsonUtil.toPrettyJson(resultMap);
         }
 
@@ -121,7 +117,7 @@ public class ComponedContractResult {
     }
 
     public ContractResult mergeFinalResult() {
-//        LOGGER.info("mergeFinalResult");
+        // LOGGER.info("mergeFinalResult");
 
         Map<JsonElement, Integer> map = new ConcurrentHashMap<>(); // <结果，出现次数>
 
diff --git a/src/main/base/org/bdware/sc/ContractPort.java b/src/main/base/org/bdware/sc/ContractPort.java
index b82c2fe..b040af4 100644
--- a/src/main/base/org/bdware/sc/ContractPort.java
+++ b/src/main/base/org/bdware/sc/ContractPort.java
@@ -108,7 +108,8 @@ public class ContractPort {
     }
 
     private synchronized void updateDb() {
-        KeyValueDBUtil.instance.setValue(CMTables.ContractInfo.toString(), USED_PORTS, JsonUtil.toJson(usedPorts));
+        KeyValueDBUtil.instance.setValue(CMTables.ContractInfo.toString(), USED_PORTS,
+                JsonUtil.toJson(usedPorts));
     }
 
     public interface PortVisitor {
@@ -119,6 +120,7 @@ public class ContractPort {
          * @return whether some program listens to the port
          */
         boolean visit(int port);
-        boolean visit(String host,int port);
+
+        boolean visit(String host, int port);
     }
 }
diff --git a/src/main/base/org/bdware/sc/ContractPrinter.java b/src/main/base/org/bdware/sc/ContractPrinter.java
index 8a96e9f..69d4631 100644
--- a/src/main/base/org/bdware/sc/ContractPrinter.java
+++ b/src/main/base/org/bdware/sc/ContractPrinter.java
@@ -61,4 +61,4 @@ public class ContractPrinter extends Thread {
         toRemove.clear();
     }
 
-}// Printer
\ No newline at end of file
+}// Printer
diff --git a/src/main/base/org/bdware/sc/ContractResult.java b/src/main/base/org/bdware/sc/ContractResult.java
index 97984d0..c1c6a49 100644
--- a/src/main/base/org/bdware/sc/ContractResult.java
+++ b/src/main/base/org/bdware/sc/ContractResult.java
@@ -27,9 +27,11 @@ public class ContractResult {
 
     public enum Status {
         Success, Exception, Error;
+
         public Status merge(Status status) {
-            if (status == null) status = Error;
+            if (status == null)
+                status = Error;
             return this.ordinal() < status.ordinal() ? status : this;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/base/org/bdware/sc/JSEngine.java b/src/main/base/org/bdware/sc/JSEngine.java
index 5285335..393b4ba 100644
--- a/src/main/base/org/bdware/sc/JSEngine.java
+++ b/src/main/base/org/bdware/sc/JSEngine.java
@@ -15,11 +15,11 @@ public abstract class JSEngine implements ScriptEngine {
     /**
      * Load a contract into contract engine
      *
-     * @param contract     the contract
+     * @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);
+    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
index 088e7ed..3944396 100644
--- a/src/main/base/org/bdware/sc/Jedion.java
+++ b/src/main/base/org/bdware/sc/Jedion.java
@@ -15,7 +15,7 @@ import java.util.List;
 
 public class Jedion {
     private static final Logger LOGGER = LogManager.getLogger(Jedion.class);
-    //    static ExecutorService executor = Executors.newFixedThreadPool(1);
+    // static ExecutorService executor = Executors.newFixedThreadPool(1);
     private EnvironmentConfig envConfig = null; // 数据库环境配置对象
     private Environment myDbEnvironment = null; // 数据库环境对象
     private DatabaseConfig dbConfig = null; // 数据库配置对象
@@ -80,13 +80,13 @@ public class Jedion {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        //        executor.execute(() -> {
-        //            try {
-        //                writeToDatabaseInternal(key, value, isOverwrite);
-        //            } catch (DatabaseException e) {
-        //                e.printStackTrace();
-        //            }
-        //        });
+        // executor.execute(() -> {
+        // try {
+        // writeToDatabaseInternal(key, value, isOverwrite);
+        // } catch (DatabaseException e) {
+        // e.printStackTrace();
+        // }
+        // });
     }
 
     // 像数据库中写数据
@@ -117,18 +117,17 @@ public class Jedion {
 
         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");
+        // 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 {
+    public ArrayList<String> getAllFromDatabase() throws DatabaseException {
         Cursor myCursor; // 游标
         ArrayList<String> resultList = new ArrayList<>();
         Transaction txn;
@@ -145,8 +144,8 @@ public class Jedion {
         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) {
+            while (myCursor.getNext(entryKey, entryValue,
+                    LockMode.DEFAULT) == OperationStatus.SUCCESS) {
                 key = new String(entryKey.getData(), StandardCharsets.UTF_8);
                 resultList.add(key);
             }
@@ -195,15 +194,15 @@ public class Jedion {
             DatabaseEntry foundKey = new DatabaseEntry();
             DatabaseEntry foundData = new DatabaseEntry();
             // 使用cursor.getPrev方法来遍历游标获取数据
-            if (myCursor.getFirst(foundKey, foundData, LockMode.DEFAULT)
-                    == OperationStatus.SUCCESS) {
+            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) {
+                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);
@@ -242,15 +241,15 @@ public class Jedion {
             DatabaseEntry foundKey = new DatabaseEntry();
             DatabaseEntry foundData = new DatabaseEntry();
             // 使用cursor.getPrev方法来遍历游标获取数据
-            if (myCursor.getFirst(foundKey, foundData, LockMode.DEFAULT)
-                    == OperationStatus.SUCCESS) {
+            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) {
+                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);
@@ -297,15 +296,15 @@ public class Jedion {
             DatabaseEntry foundKey = new DatabaseEntry();
             DatabaseEntry foundData = new DatabaseEntry();
             // 使用cursor.getPrev方法来遍历游标获取数据
-            if (myCursor.getFirst(foundKey, foundData, LockMode.DEFAULT)
-                    == OperationStatus.SUCCESS) {
+            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) {
+                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);
@@ -343,12 +342,12 @@ public class Jedion {
         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");
+        // 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");
     }
 
     // 一些其他方法
@@ -371,7 +370,8 @@ public class Jedion {
 
     // 关闭数据库
     public void closeDatabase() throws DatabaseException {
-        if (myDatabase != null) myDatabase.close();
+        if (myDatabase != null)
+            myDatabase.close();
 
         if (myDbEnvironment != null) {
             myDbEnvironment.cleanLog();
diff --git a/src/main/base/org/bdware/sc/codec/DelimiterCodec.java b/src/main/base/org/bdware/sc/codec/DelimiterCodec.java
index abaacff..e461aed 100644
--- a/src/main/base/org/bdware/sc/codec/DelimiterCodec.java
+++ b/src/main/base/org/bdware/sc/codec/DelimiterCodec.java
@@ -5,8 +5,8 @@ import io.netty.buffer.Unpooled;
 import io.netty.channel.CombinedChannelDuplexHandler;
 import io.netty.handler.codec.DelimiterBasedFrameDecoder;
 
-public class DelimiterCodec
-        extends CombinedChannelDuplexHandler<DelimiterBasedFrameDecoder, DelimiterBasedFrameEncoder> {
+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
index 45dc461..2653aea 100644
--- a/src/main/base/org/bdware/sc/codec/LengthFieldBasedFrameCodec.java
+++ b/src/main/base/org/bdware/sc/codec/LengthFieldBasedFrameCodec.java
@@ -5,10 +5,10 @@ import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
 
 import java.nio.ByteOrder;
 
-public class LengthFieldBasedFrameCodec
-        extends CombinedChannelDuplexHandler<LengthFieldBasedFrameDecoder, LengthFieldBasedFrameEncoder> {
+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());
+        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
index 1e941d5..116001e 100644
--- a/src/main/base/org/bdware/sc/codec/LengthFieldBasedFrameEncoder.java
+++ b/src/main/base/org/bdware/sc/codec/LengthFieldBasedFrameEncoder.java
@@ -11,4 +11,4 @@ public class LengthFieldBasedFrameEncoder extends MessageToByteEncoder<ByteBuf>
         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
index 1af7473..7c8b7f8 100644
--- a/src/main/base/org/bdware/sc/compiler/PermissionStub.java
+++ b/src/main/base/org/bdware/sc/compiler/PermissionStub.java
@@ -11,4 +11,4 @@ import java.lang.annotation.Target;
 @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
index b19c04a..2657bd3 100644
--- a/src/main/base/org/bdware/sc/compiler/PermissionStubGenerator.java
+++ b/src/main/base/org/bdware/sc/compiler/PermissionStubGenerator.java
@@ -34,7 +34,8 @@ public class PermissionStubGenerator extends ClassVisitor implements Opcodes {
         return null;
     }
 
-    public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
+    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);
         }
@@ -53,7 +54,8 @@ public class PermissionStubGenerator extends ClassVisitor implements Opcodes {
         mv.visitEnd();
     }
 
-    public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
+    public MethodVisitor visitMethod(int access, String name, String desc, String signature,
+            String[] exceptions) {
         if (cv != null) {
             if (name.equals("<clinit>"))
                 return null;
@@ -62,14 +64,15 @@ public class PermissionStubGenerator extends ClassVisitor implements Opcodes {
             }
 
             MethodVisitor mv = cv.visitMethod(access, name, desc, signature,
-                    new String[]{"javax/script/ScriptException"});
+                    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.visitMethodInsn(INVOKESPECIAL, "javax/script/ScriptException", "<init>",
+                    "(Ljava/lang/String;)V");
             mv.visitInsn(ATHROW);
             mv.visitMaxs(5, 20);
             mv.visitEnd();
diff --git a/src/main/base/org/bdware/sc/compiler/YJSErrorListener.java b/src/main/base/org/bdware/sc/compiler/YJSErrorListener.java
index f355934..eacfee2 100644
--- a/src/main/base/org/bdware/sc/compiler/YJSErrorListener.java
+++ b/src/main/base/org/bdware/sc/compiler/YJSErrorListener.java
@@ -23,29 +23,30 @@ public class YJSErrorListener implements ANTLRErrorListener {
     }
 
     @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());
+    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) {
+    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) {
+    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) {
+    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
index fdb33d0..9f499d6 100644
--- a/src/main/base/org/bdware/sc/conn/ByteUtil.java
+++ b/src/main/base/org/bdware/sc/conn/ByteUtil.java
@@ -11,8 +11,10 @@ public class ByteUtil {
         double d = (double) size;
         int i;
         for (i = 0; i < unit.length - 1; i++) {
-            if (d > 1024.0) d /= 1024.0;
-            else break;
+            if (d > 1024.0)
+                d /= 1024.0;
+            else
+                break;
         }
         return String.format("%.2f %s", d, unit[i]);
     }
@@ -20,7 +22,7 @@ public class ByteUtil {
     public static String encodeBASE64(byte[] array) {
         if (array != null) {
             return Base64.encodeBase64String(array);
-            //return encodeBASE64(array, array.length);   这句有问题，然后stackoverflow了?
+            // return encodeBASE64(array, array.length); 这句有问题，然后stackoverflow了?
         } else {
             return null;
         }
@@ -29,7 +31,7 @@ public class ByteUtil {
     public static byte[] decodeBASE64(String encoded) {
         try {
             return Base64.decodeBase64(encoded);
-            //return ByteUtil.decodeBASE64(encoded);   自己调自己,然后就stackoverflow了
+            // return ByteUtil.decodeBASE64(encoded); 自己调自己,然后就stackoverflow了
         } catch (Exception e) {
             e.printStackTrace();
             return null;
diff --git a/src/main/base/org/bdware/sc/conn/Description.java b/src/main/base/org/bdware/sc/conn/Description.java
index 214bd9d..c0186a5 100644
--- a/src/main/base/org/bdware/sc/conn/Description.java
+++ b/src/main/base/org/bdware/sc/conn/Description.java
@@ -11,4 +11,4 @@ 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
index 03488bd..aef3e73 100644
--- a/src/main/base/org/bdware/sc/conn/EventHandler.java
+++ b/src/main/base/org/bdware/sc/conn/EventHandler.java
@@ -4,4 +4,4 @@ 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/MsgHandler.java b/src/main/base/org/bdware/sc/conn/MsgHandler.java
index 8d4b601..2841907 100644
--- a/src/main/base/org/bdware/sc/conn/MsgHandler.java
+++ b/src/main/base/org/bdware/sc/conn/MsgHandler.java
@@ -21,8 +21,7 @@ public class MsgHandler {
         for (Method method : clz.getDeclaredMethods()) {
             Description anno = method.getAnnotation(Description.class);
             if (anno != null && method.getParameterCount() == 2) {
-                methodInfos.put(
-                        method.getName(),
+                methodInfos.put(method.getName(),
                         new MethodInfo(method.getName(), anno.value(), method, anno.isAsync()));
             }
         }
@@ -50,8 +49,8 @@ public class MsgHandler {
         } catch (Throwable e) {
             Method m2;
             try {
-                m2 = MsgHandler.class.getDeclaredMethod(
-                        message.method, GetMessage.class, ResultCallback.class);
+                m2 = MsgHandler.class.getDeclaredMethod(message.method, GetMessage.class,
+                        ResultCallback.class);
                 m2.invoke(this, message, rc);
             } catch (Exception e1) {
                 ByteArrayOutputStream bo = new ByteArrayOutputStream();
diff --git a/src/main/base/org/bdware/sc/conn/ResultCallback.java b/src/main/base/org/bdware/sc/conn/ResultCallback.java
index b447b65..4d3b3ad 100644
--- a/src/main/base/org/bdware/sc/conn/ResultCallback.java
+++ b/src/main/base/org/bdware/sc/conn/ResultCallback.java
@@ -8,12 +8,11 @@ import org.bdware.sc.util.JsonUtil;
 import java.util.Map;
 
 public abstract class ResultCallback {
-    //    private static final Logger LOGGER = LogManager.getLogger(ResultCallback.class);
+    // private static final Logger LOGGER = LogManager.getLogger(ResultCallback.class);
     Timeout task;
     private Channel channel;
 
-    public ResultCallback() {
-    }
+    public ResultCallback() {}
 
     public ResultCallback(Channel channel) {
         this.channel = channel;
@@ -38,7 +37,7 @@ public abstract class ResultCallback {
     }
 
     public void cancelTimeOut() {
-//        LOGGER.debug("[cancelTimeout]" + task.toString());
+        // 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
index b142fed..d1a8c91 100644
--- a/src/main/base/org/bdware/sc/conn/ServiceServer.java
+++ b/src/main/base/org/bdware/sc/conn/ServiceServer.java
@@ -22,13 +22,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class ServiceServer extends Thread {
-    public static final ExecutorService executor =
-            new ThreadPoolExecutor(
-                    8,
-                    Integer.MAX_VALUE,
-                    60,
-                    TimeUnit.SECONDS,
-                    new SynchronousQueue<>());
+    public static final ExecutorService executor = new ThreadPoolExecutor(8, Integer.MAX_VALUE, 60,
+            TimeUnit.SECONDS, new SynchronousQueue<>());
     private static final String TAG = "ServiceServer";
     private static final Logger LOGGER = LogManager.getLogger(ServiceServer.class);
     private final MsgHandler handler;
@@ -58,20 +53,17 @@ public class ServiceServer extends Thread {
 
         ServerBootstrap b = new ServerBootstrap();
         b.option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT);
-        b.group(bossGroup)
-                .channel(NioServerSocketChannel.class)
-                .option(ChannelOption.SO_BACKLOG, 100)
-                .option(ChannelOption.SO_REUSEADDR, false)
-                .childHandler(
-                        new ChannelInitializer<SocketChannel>() {
-                            @Override
-                            protected void initChannel(SocketChannel arg0) {
-                                LOGGER.info("Connected:" + arg0.remoteAddress() + " " + arg0.localAddress());
-                                arg0.pipeline()
-                                        .addLast(new LengthFieldBasedFrameCodec())
-                                        .addLast(new AsyncInboundHandler(ServiceServer.this));
-                            }
-                        });
+        b.group(bossGroup).channel(NioServerSocketChannel.class)
+                .option(ChannelOption.SO_BACKLOG, 100).option(ChannelOption.SO_REUSEADDR, false)
+                .childHandler(new ChannelInitializer<SocketChannel>() {
+                    @Override
+                    protected void initChannel(SocketChannel arg0) {
+                        LOGGER.info(
+                                "Connected:" + arg0.remoteAddress() + " " + arg0.localAddress());
+                        arg0.pipeline().addLast(new LengthFieldBasedFrameCodec())
+                                .addLast(new AsyncInboundHandler(ServiceServer.this));
+                    }
+                });
         Channel channel;
         while (true) {
             try {
@@ -82,12 +74,12 @@ public class ServiceServer extends Thread {
                 ready = true;
                 break;
             } catch (Exception e) {
-                //e.printStackTrace();
+                // e.printStackTrace();
                 LOGGER.debug("port already in used:" + mainPort);
                 mainPort.getAndIncrement();
             }
         }
-        //TODO MUST use System.out to ensure output
+        // TODO MUST use System.out to ensure output
         System.out.println("ServiceServer mainPort " + mainPort);
         try {
             channel.closeFuture().await();
@@ -118,18 +110,16 @@ public class ServiceServer extends Thread {
             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();
-                            }
-                        }
-                    });
+            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)
diff --git a/src/main/base/org/bdware/sc/conn/SocketGet.java b/src/main/base/org/bdware/sc/conn/SocketGet.java
index e58cd3f..764c8ed 100644
--- a/src/main/base/org/bdware/sc/conn/SocketGet.java
+++ b/src/main/base/org/bdware/sc/conn/SocketGet.java
@@ -41,7 +41,7 @@ public class SocketGet {
         b = new Bootstrap();
         // logger.info("[SocketGet] 构造器 : position---------------1");
 
-        // TODO  可能有问题
+        // TODO 可能有问题
 
         b.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 5000);
 
@@ -50,52 +50,42 @@ public class SocketGet {
         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);
-                                            }
+        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 channelActive(ChannelHandlerContext ctx) {}
 
-                                            @Override
-                                            public void channelInactive(
-                                                    ChannelHandlerContext ctx) {
-                                                SocketGet.this.channel = null;
-                                            }
+                                    @Override
+                                    public void channelInactive(ChannelHandlerContext ctx) {
+                                        SocketGet.this.channel = null;
+                                    }
 
-                                            @Override
-                                            public void exceptionCaught(
-                                                    ChannelHandlerContext ctx,
-                                                    Throwable cause) {
-                                                cause.printStackTrace();
-                                            }
-                                        });
-                            }
-                        });
+                                    @Override
+                                    public void exceptionCaught(ChannelHandlerContext ctx,
+                                            Throwable cause) {
+                                        cause.printStackTrace();
+                                    }
+                                });
+                    }
+                });
         try {
             // logger.info("[SocketGet] 构造器 : position---------------4");
             channel = b.connect(ipAddress, port).sync().channel();
@@ -112,7 +102,7 @@ public class SocketGet {
     private ObjectOutputStream request(String pkgName, String method, String arg, long id)
             throws InterruptedException, IOException {
         if (!isAlive()) {
-            // TODO  可能有问题
+            // TODO 可能有问题
             // logger.info("[SocketGet] request position------1");
             channel = b.connect(ipAddress, port).sync().channel();
         }
@@ -135,17 +125,16 @@ public class SocketGet {
             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();
-                            }
-                        }
-                    };
+            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);
@@ -155,10 +144,8 @@ public class SocketGet {
             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()));
+            final ContractResult cr = new ContractResult(ContractResult.Status.Error,
+                    new JsonPrimitive("Failed due to Exception:" + e.getMessage()));
             return JsonUtil.toJson(cr);
         }
     }
@@ -166,7 +153,7 @@ public class SocketGet {
     public void asyncGet(String pkgName, String method, String arg, ResultCallback cb) {
         try {
             long id;
-            for (id = random.nextLong(); r.waitObj.containsKey(id); id = random.nextLong()) ;
+            for (id = random.nextLong(); r.waitObj.containsKey(id); id = random.nextLong());
             if (cb != null) {
                 r.waitObj.put(id, cb);
                 r.sleep(id, cb);
@@ -174,9 +161,8 @@ public class SocketGet {
             request(pkgName, method, arg, id);
         } catch (Exception e) {
             e.printStackTrace();
-            ContractResult cr =
-                    new ContractResult(
-                            ContractResult.Status.Error, new JsonPrimitive(e.getMessage()));
+            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());
diff --git a/src/main/base/org/bdware/sc/conn/SyncResult.java b/src/main/base/org/bdware/sc/conn/SyncResult.java
index e4f2125..9083104 100644
--- a/src/main/base/org/bdware/sc/conn/SyncResult.java
+++ b/src/main/base/org/bdware/sc/conn/SyncResult.java
@@ -15,15 +15,11 @@ import java.util.concurrent.TimeUnit;
 
 public class SyncResult {
     public static final HashedWheelTimer HASHED_WHEEL_TIMER =
-            new HashedWheelTimer(
-                    Executors.defaultThreadFactory(),
-                    5,
-                    TimeUnit.MILLISECONDS,
-                    2);
+            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);
+    // 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) {
@@ -32,7 +28,7 @@ public class SyncResult {
         if (ob != null) {
             ob.onResult(result);
         } else {
-            //   logger.info("[Missing callback]" + requestID);
+            // logger.info("[Missing callback]" + requestID);
         }
     }
 
@@ -46,13 +42,12 @@ public class SyncResult {
         if (!waitObj.containsKey(requestID)) {
             waitObj.put(requestID, cb);
         }
-        TimerTask tt =
-                new TimerTask() {
-                    @Override
-                    public void run(Timeout timeout) {
-                        wakeUp(requestID, TimeoutStr);
-                    }
-                };
+        TimerTask tt = new TimerTask() {
+            @Override
+            public void run(Timeout timeout) {
+                wakeUp(requestID, TimeoutStr);
+            }
+        };
         HASHED_WHEEL_TIMER.newTimeout(tt, timeOut, TimeUnit.SECONDS);
     }
 
@@ -72,4 +67,4 @@ public class SyncResult {
             return JsonUtil.toJson(cr);
         }
     }
-}
\ 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
index 969b325..a694865 100644
--- a/src/main/base/org/bdware/sc/encrypt/AES.java
+++ b/src/main/base/org/bdware/sc/encrypt/AES.java
@@ -8,19 +8,21 @@ 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};
+    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;
@@ -74,17 +76,19 @@ public class AES {
                 ks = 16 * (14 + 1);
                 break;
             default:
-                System.err.println("AES.expandKey: Only key lengths of 16, 24 or 32 bytes allowed!");
+                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)};
+            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]]};
+                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]]};
+                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));
         }
diff --git a/src/main/base/org/bdware/sc/encrypt/HardwareInfo.java b/src/main/base/org/bdware/sc/encrypt/HardwareInfo.java
index b43a80b..395c135 100644
--- a/src/main/base/org/bdware/sc/encrypt/HardwareInfo.java
+++ b/src/main/base/org/bdware/sc/encrypt/HardwareInfo.java
@@ -12,7 +12,8 @@ public class HardwareInfo {
     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;
+        if (osName.startsWith("Mac"))
+            return OSType.mac;
         else if (osName.startsWith("Linux")) {
             return OSType.linux;
         } else if (osName.contains("Windows")) {
@@ -37,7 +38,7 @@ public class HardwareInfo {
     public static String getCPUID_Windows() {
         try {
             Process process =
-                    Runtime.getRuntime().exec(new String[]{"wmic", "cpu", "get", "ProcessorId"});
+                    Runtime.getRuntime().exec(new String[] {"wmic", "cpu", "get", "ProcessorId"});
             process.getOutputStream().close();
             Scanner sc = new Scanner(process.getInputStream());
             String property = sc.next();
@@ -58,7 +59,7 @@ public class HardwareInfo {
         BufferedReader bufferedReader;
         Process p;
         try {
-            p = Runtime.getRuntime().exec(new String[]{"sh", "-c", CPU_ID_CMD}); // 管道
+            p = Runtime.getRuntime().exec(new String[] {"sh", "-c", CPU_ID_CMD}); // 管道
             bufferedReader = new BufferedReader(new InputStreamReader(p.getInputStream()));
             String line;
             int index;
@@ -76,7 +77,7 @@ public class HardwareInfo {
         System.out.println("[HardwareInfo] get cpuInfo:" + result + "==");
         if (result.toString().equals("")) {
             try {
-                p = Runtime.getRuntime().exec(new String[]{"dmesg"});
+                p = Runtime.getRuntime().exec(new String[] {"dmesg"});
                 Scanner sc = new Scanner(p.getInputStream());
                 while (sc.hasNextLine()) {
                     String line = sc.nextLine();
@@ -117,12 +118,7 @@ public class HardwareInfo {
     public static String getCPUID_Mac() {
         Process p;
         try {
-            p =
-                    Runtime.getRuntime()
-                            .exec(
-                                    new String[]{
-                                            "system_profiler", "SPHardwareDataType",
-                                    }); // 管道
+            p = Runtime.getRuntime().exec(new String[] {"system_profiler", "SPHardwareDataType",}); // 管道
             Scanner sc = new Scanner(p.getInputStream());
             while (sc.hasNextLine()) {
                 String line = sc.nextLine();
@@ -140,9 +136,6 @@ public class HardwareInfo {
     }
 
     public enum OSType {
-        mac,
-        linux,
-        win,
-        unknown
+        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
index 4b5e724..f5c3066 100644
--- a/src/main/base/org/bdware/sc/encrypt/RSA.java
+++ b/src/main/base/org/bdware/sc/encrypt/RSA.java
@@ -13,8 +13,7 @@ import java.util.Arrays;
 public class RSA {
     public BigInteger n, e1, e2;
 
-    private RSA() {
-    }
+    private RSA() {}
 
     public static KeyPair buildKeyPair() {
         try {
@@ -34,7 +33,7 @@ public class RSA {
         return generate(keyPair);
     }
 
-//    public static final String SIGN_ALGORITHMS = "SHA1WithRSA";
+    // public static final String SIGN_ALGORITHMS = "SHA1WithRSA";
 
     public static RSA generate(KeyPair pair) {
         if (null == pair) {
@@ -52,41 +51,41 @@ public class RSA {
         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 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));
+    // 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);
+    // java.security.Signature signature = java.security.Signature.getInstance(SIGN_ALGORITHMS);
     //
-    //			signature.initVerify(pubKey);
-    //			signature.update(content.getBytes());
+    // signature.initVerify(pubKey);
+    // signature.update(content.getBytes());
     //
-    //			boolean bverify = signature.verify(Base64.decode(sign));
-    //			return bverify;
+    // boolean bverify = signature.verify(Base64.decode(sign));
+    // return bverify;
     //
-    //		} catch (Exception e) {
-    //			e.printStackTrace();
-    //		}
+    // } catch (Exception e) {
+    // e.printStackTrace();
+    // }
     //
-    //		return false;
-    //	}
+    // return false;
+    // }
 
     public static RSA generateFromBase64(String base64) {
         try {
@@ -108,7 +107,8 @@ public class RSA {
     }
 
     public static String str2Hex(String str) {
-        if (str.length() % 2 == 1) str = "0" + 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)));
@@ -118,8 +118,10 @@ public class RSA {
     }
 
     private static int code(char c) {
-        if (c >= '0' && c <= '9') return c - '0';
-        else return c - 'a' + 10;
+        if (c >= '0' && c <= '9')
+            return c - '0';
+        else
+            return c - 'a' + 10;
     }
 
     public String toBase64Pubkey() {
diff --git a/src/main/base/org/bdware/sc/event/REvent.java b/src/main/base/org/bdware/sc/event/REvent.java
index 7a1b732..2d243f2 100644
--- a/src/main/base/org/bdware/sc/event/REvent.java
+++ b/src/main/base/org/bdware/sc/event/REvent.java
@@ -100,13 +100,10 @@ public class REvent extends SM2Verifiable implements Serializable {
 
     @Override
     public String getContentStr() {
-        return String.format("{\"topic\":\"%s\",\"content\":\"%s\",\"type\":\"%s\"," +
-                        "\"semantics\":\"%s\",\"requestID\":\"%s\"}",
-                topic,
-                content,
-                type,
-                semantics,
-                requestID);
+        return String.format(
+                "{\"topic\":\"%s\",\"content\":\"%s\",\"type\":\"%s\","
+                        + "\"semantics\":\"%s\",\"requestID\":\"%s\"}",
+                topic, content, type, semantics, requestID);
     }
 
     public enum REventType {
diff --git a/src/main/base/org/bdware/sc/gen/PYGenerator.java b/src/main/base/org/bdware/sc/gen/PYGenerator.java
index 56aad78..fdcc157 100644
--- a/src/main/base/org/bdware/sc/gen/PYGenerator.java
+++ b/src/main/base/org/bdware/sc/gen/PYGenerator.java
@@ -78,58 +78,43 @@ public class PYGenerator implements Opcodes {
             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);
+            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 = 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.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");
+                    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.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",
+                    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.visitLocalVariable("paramObj", "Lcom/yancloud/py/bean/PYMethodParams;", null,
+                            l1, l3, 1);
                     mv.visitMaxs(4, 2);
                     mv.visitEnd();
                 }
@@ -149,19 +134,13 @@ public class PYGenerator implements Opcodes {
             System.out.println("[genClasses]className: " + classNameStr);
 
             // 生成类
-            cw.visit(
-                    V1_7,
-                    ACC_PUBLIC + ACC_SUPER,
-                    PKG_NAME + classNameStr,
-                    null,
-                    "com/yancloud/py/bean/PYObject",
-                    null);
+            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 = cw.visitMethod(ACC_PUBLIC + ACC_VARARGS, "<init>", "([Ljava/lang/Object;)V",
+                        null, null);
                 mv.visitCode();
                 Label l0 = new Label();
                 mv.visitLabel(l0);
@@ -171,31 +150,26 @@ public class PYGenerator implements Opcodes {
                 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.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");
+                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.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",
+                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");
+                mv.visitMethodInsn(INVOKEVIRTUAL, PKG_NAME + classNameStr, "setID",
+                        "(Ljava/lang/String;)V");
                 Label l4 = new Label();
                 mv.visitLabel(l4);
                 mv.visitInsn(RETURN);
@@ -203,7 +177,8 @@ public class PYGenerator implements Opcodes {
                 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.visitLocalVariable("paramObj", "Lcom/yancloud/py/bean/PYMethodParams;", null, l2,
+                        l5, 2);
                 mv.visitMaxs(4, 3);
                 mv.visitEnd();
             }
@@ -214,88 +189,68 @@ public class PYGenerator implements Opcodes {
                 // 生成该类中的每个method
                 if (pyMethod.isStatic()) {
                     {
-                        mv =
-                                cw.visitMethod(
-                                        ACC_PUBLIC + ACC_STATIC + ACC_VARARGS,
-                                        methodName,
-                                        "([Ljava/lang/Object;)Ljava/lang/String;",
-                                        null,
-                                        null);
+                        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.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");
+                        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.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",
+                        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.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 = 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.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");
+                        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.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.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",
+                        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);
@@ -303,8 +258,8 @@ public class PYGenerator implements Opcodes {
                         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.visitLocalVariable("paramObj", "Lcom/yancloud/py/bean/PYMethodParams;",
+                                null, l1, l3, 2);
                         mv.visitMaxs(4, 3);
                         mv.visitEnd();
                     }
@@ -316,38 +271,29 @@ public class PYGenerator implements Opcodes {
                 String functionName = pyFunction.getName();
                 // 生成该类中的每个function
                 {
-                    mv =
-                            cw.visitMethod(
-                                    ACC_PUBLIC + ACC_VARARGS,
-                                    functionName,
-                                    "([Ljava/lang/Object;)Ljava/lang/String;",
-                                    null,
-                                    null);
+                    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.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");
+                    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.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",
+                    mv.visitMethodInsn(INVOKEVIRTUAL, "com/yancloud/py/PYEntry",
                             "invokeClzClassMethod",
                             "(Ljava/lang/String;Lcom/yancloud/py/bean/PYMethodParams;)Ljava/lang/String;");
                     mv.visitInsn(ARETURN);
@@ -355,8 +301,8 @@ public class PYGenerator implements Opcodes {
                     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.visitLocalVariable("paramObj", "Lcom/yancloud/py/bean/PYMethodParams;", null,
+                            l1, l3, 2);
                     mv.visitMaxs(3, 3);
                     mv.visitEnd();
                 }
diff --git a/src/main/base/org/bdware/sc/get/GetMessage.java b/src/main/base/org/bdware/sc/get/GetMessage.java
index 2aaf989..5ac13f3 100644
--- a/src/main/base/org/bdware/sc/get/GetMessage.java
+++ b/src/main/base/org/bdware/sc/get/GetMessage.java
@@ -9,12 +9,11 @@ public class GetMessage implements Serializable {
     public String method;
     public String arg;
 
-    public GetMessage() {
-    }
+    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/ContractNode.java b/src/main/base/org/bdware/sc/node/ContractNode.java
index d1a7571..0f62a28 100644
--- a/src/main/base/org/bdware/sc/node/ContractNode.java
+++ b/src/main/base/org/bdware/sc/node/ContractNode.java
@@ -198,7 +198,8 @@ public class ContractNode {
     public boolean hasDoipModule() {
         if (functions != null)
             for (FunctionNode node : functions) {
-                if (node.getDoipOperationInfo() != null) return true;
+                if (node.getDoipOperationInfo() != null)
+                    return true;
             }
         return false;
     }
@@ -219,7 +220,8 @@ public class ContractNode {
         contractName = name;
     }
 
-    public void maintainRouteJoinInfo(JsonObject methodRouteInfoMap, JsonObject methodJoinInfoMap, JsonObject dependentFunctions) {
+    public void maintainRouteJoinInfo(JsonObject methodRouteInfoMap, JsonObject methodJoinInfoMap,
+            JsonObject dependentFunctions) {
         // all functions存了ContractNode中，所有的FunctionNode
         List<FunctionNode> allFunctions = getFunctions();
         for (FunctionNode functionNode : allFunctions) {
@@ -229,20 +231,27 @@ public class ContractNode {
                 RouteInfo routeInfo = functionNode.getRouteInfo();
                 JoinInfo joinInfo = functionNode.getJoinInfo();
                 if (routeInfo != null) {
-                    packSourceFunctionAndDependentFunctions(getFunction(routeInfo.funcName), dependentFunctions);
-                    methodRouteInfoMap.add(doipOperationInfo.operationName, JsonUtil.parseObjectAsJsonObject(routeInfo));
+                    packSourceFunctionAndDependentFunctions(getFunction(routeInfo.funcName),
+                            dependentFunctions);
+                    methodRouteInfoMap.add(doipOperationInfo.operationName,
+                            JsonUtil.parseObjectAsJsonObject(routeInfo));
                 }
                 if (joinInfo != null) {
-                    packSourceFunctionAndDependentFunctions(getFunction(joinInfo.joinCountFuncName), dependentFunctions);
-                    packSourceFunctionAndDependentFunctions(getFunction(joinInfo.joinFuncName), dependentFunctions);
-                    methodJoinInfoMap.add(doipOperationInfo.operationName, JsonUtil.parseObjectAsJsonObject(joinInfo));
+                    packSourceFunctionAndDependentFunctions(getFunction(joinInfo.joinCountFuncName),
+                            dependentFunctions);
+                    packSourceFunctionAndDependentFunctions(getFunction(joinInfo.joinFuncName),
+                            dependentFunctions);
+                    methodJoinInfoMap.add(doipOperationInfo.operationName,
+                            JsonUtil.parseObjectAsJsonObject(joinInfo));
                 }
             }
         }
     }
 
-    public void packSourceFunctionAndDependentFunctions(FunctionNode sourceFunctionNode, JsonObject functions) {
-        if (sourceFunctionNode == null) return;
+    public void packSourceFunctionAndDependentFunctions(FunctionNode sourceFunctionNode,
+            JsonObject functions) {
+        if (sourceFunctionNode == null)
+            return;
         functions.addProperty(sourceFunctionNode.functionName, sourceFunctionNode.plainText());
         // find all dependent functions to the "functions" struct
         for (String dependentFunctionName : sourceFunctionNode.getDependentFunctions()) {
@@ -262,10 +271,12 @@ public class ContractNode {
                 }
                 for (AnnotationNode annotationNode : node.annotations) {
                     if (funAnno.contains(annotationNode.type))
-                        throw new RuntimeException("duplicated annotation:" + node.functionName + " -> " + annotationNode.getType());
+                        throw new RuntimeException("duplicated annotation:" + node.functionName
+                                + " -> " + annotationNode.getType());
                 }
                 functionNode.annotations.addAll(node.annotations);
-            } else throw new RuntimeException("unimplemented functions:" + node.functionName);
+            } else
+                throw new RuntimeException("unimplemented functions:" + node.functionName);
         }
     }
 }
diff --git a/src/main/base/org/bdware/sc/node/FunctionNode.java b/src/main/base/org/bdware/sc/node/FunctionNode.java
index 2c01602..22e7a1f 100644
--- a/src/main/base/org/bdware/sc/node/FunctionNode.java
+++ b/src/main/base/org/bdware/sc/node/FunctionNode.java
@@ -19,9 +19,9 @@ public class FunctionNode extends Script {
     String fileName;
     boolean isExport;
     boolean isMask;
-    //    boolean isLogLocally;
+    // boolean isLogLocally;
     EnumSet<LogType> logTypes;
-    //    boolean logToChain;
+    // boolean logToChain;
     LogLocation logLocation = new LogLocation();
     private CostDetail cost;
     private RouteInfo routeInfo;
diff --git a/src/main/base/org/bdware/sc/node/InterfaceNode.java b/src/main/base/org/bdware/sc/node/InterfaceNode.java
index f4eda23..66cd04d 100644
--- a/src/main/base/org/bdware/sc/node/InterfaceNode.java
+++ b/src/main/base/org/bdware/sc/node/InterfaceNode.java
@@ -16,7 +16,7 @@ public class InterfaceNode extends Script {
     boolean isStatic;
     String fileName;
     EnumSet<LogType> logTypes;
-    //    boolean logToChain;
+    // boolean logToChain;
     LogLocation logLocation = new LogLocation();
     private RouteInfo routeInfo;
     private JoinInfo joinInfo;
diff --git a/src/main/base/org/bdware/sc/node/LogLocation.java b/src/main/base/org/bdware/sc/node/LogLocation.java
index e529c15..b0c58cb 100644
--- a/src/main/base/org/bdware/sc/node/LogLocation.java
+++ b/src/main/base/org/bdware/sc/node/LogLocation.java
@@ -6,4 +6,4 @@ 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
index ea4db67..af14a6b 100644
--- a/src/main/base/org/bdware/sc/node/LogType.java
+++ b/src/main/base/org/bdware/sc/node/LogType.java
@@ -12,4 +12,4 @@ public enum LogType {
         }
         return null;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/base/org/bdware/sc/node/MockConfig.java b/src/main/base/org/bdware/sc/node/MockConfig.java
index aebeb4e..dedc14e 100644
--- a/src/main/base/org/bdware/sc/node/MockConfig.java
+++ b/src/main/base/org/bdware/sc/node/MockConfig.java
@@ -6,14 +6,17 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class MockConfig {
-    public  Map<String, JsonElement> config= new HashMap<>();
+    public Map<String, JsonElement> config = new HashMap<>();
     public String version;
+
     public Map<String, JsonElement> getConfig() {
         return config;
     }
-    public String getVersion(){
+
+    public String getVersion() {
         return version;
     }
+
     public void setVersion(String v) {
         this.version = v;
     }
diff --git a/src/main/base/org/bdware/sc/node/Permission.java b/src/main/base/org/bdware/sc/node/Permission.java
index b77ad07..03e7709 100644
--- a/src/main/base/org/bdware/sc/node/Permission.java
+++ b/src/main/base/org/bdware/sc/node/Permission.java
@@ -4,22 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public enum Permission {
-    Http,
-    SQL,
-    File,
-    RocksDB,
-    MongoDB,
-    BDWareTimeSeriesDB,
-    MultiTagIndexDB,
-    SM2,
-    AES,
-    Ledger,
-    CM,
-    DOIP,
-    IRP,
-    Async,
-    Cluster,
-    Digest;
+    Http, SQL, File, RocksDB, MongoDB, BDWareTimeSeriesDB, MultiTagIndexDB, SM2, AES, Ledger, CM, DOIP, IRP, Async, Cluster, Digest;
 
     public static Permission parse(String str) {
         try {
diff --git a/src/main/base/org/bdware/sc/node/YjsType.java b/src/main/base/org/bdware/sc/node/YjsType.java
index 47718d6..a16443e 100644
--- a/src/main/base/org/bdware/sc/node/YjsType.java
+++ b/src/main/base/org/bdware/sc/node/YjsType.java
@@ -1,8 +1,5 @@
 package org.bdware.sc.node;
 
 public enum YjsType {
-    Oracle,
-    Contract,
-    DoipModule,
-    Module
+    Oracle, Contract, DoipModule, Module
 }
diff --git a/src/main/base/org/bdware/sc/py/PYEntry.java b/src/main/base/org/bdware/sc/py/PYEntry.java
index 8b29e57..a109b4e 100644
--- a/src/main/base/org/bdware/sc/py/PYEntry.java
+++ b/src/main/base/org/bdware/sc/py/PYEntry.java
@@ -16,26 +16,26 @@ public class PYEntry {
     final String ip = "127.0.0.1";
     final Integer port = 5000;
 
-    public static String getModuleMethodSig(
-            String packageName, String moduleName, String methodName) {
+    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) {
+    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) {
+    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) {
+    public static String getModuleClzStaticMethodSig(String packName, String moduleName,
+            String className, String methodName) {
         return "json";
     }
 
@@ -225,7 +225,7 @@ public class PYEntry {
         System.out.println(JsonUtil.toJson(pyYjsRequest));
         httpResponse = HttpClient.post(ip, port, urlPath, JsonUtil.toJson(pyYjsRequest));
 
-//        PYYjsResponse pyYjsResponse = JsonUtil.fromJson(httpResponse, PYYjsResponse.class);
+        // PYYjsResponse pyYjsResponse = JsonUtil.fromJson(httpResponse, PYYjsResponse.class);
 
         PYClass pyClass = new PYClass();
 
@@ -275,8 +275,8 @@ public class PYEntry {
         return httpResponse;
     }
 
-    public String invokeModuleFunc(
-            String moduleFullName, String moduleFuncName, PYMethodParams PYMethodParams) {
+    public String invokeModuleFunc(String moduleFullName, String moduleFuncName,
+            PYMethodParams PYMethodParams) {
         System.out.println("[PYEntry] invokeModuleFunc");
         String urlPath = "/api/invokeModuleFunc/";
         String httpResponse;
@@ -294,8 +294,8 @@ public class PYEntry {
         return ysjResult.toString();
     }
 
-    public String invokeObjectMethod(
-            String objectId, String methodName, PYMethodParams PYMethodParams) {
+    public String invokeObjectMethod(String objectId, String methodName,
+            PYMethodParams PYMethodParams) {
         System.out.println("[PYEntry] invokeObjectGeneralMethod");
         String urlPath = "/api/invokeObjectGeneralMethod/";
         String httpResponse;
diff --git a/src/main/base/org/bdware/sc/py/PYLoader.java b/src/main/base/org/bdware/sc/py/PYLoader.java
index b9f54fa..26edc6c 100644
--- a/src/main/base/org/bdware/sc/py/PYLoader.java
+++ b/src/main/base/org/bdware/sc/py/PYLoader.java
@@ -2,6 +2,5 @@ package org.bdware.sc.py;
 
 public class PYLoader {
 
-    public static void getReqByID(String id) {
-    }
+    public static void getReqByID(String id) {}
 }
diff --git a/src/main/base/org/bdware/sc/py/utils/HttpClient.java b/src/main/base/org/bdware/sc/py/utils/HttpClient.java
index 48ea3b7..c54b107 100644
--- a/src/main/base/org/bdware/sc/py/utils/HttpClient.java
+++ b/src/main/base/org/bdware/sc/py/utils/HttpClient.java
@@ -25,7 +25,9 @@ public class HttpClient {
 
             httpURLConnection.connect();
 
-            BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(httpURLConnection.getInputStream(), StandardCharsets.UTF_8));
+            BufferedReader bufferedReader =
+                    new BufferedReader(new InputStreamReader(httpURLConnection.getInputStream(),
+                            StandardCharsets.UTF_8));
             String str;
             while ((str = bufferedReader.readLine()) != null) {
                 sb.append(str);
@@ -60,7 +62,9 @@ public class HttpClient {
             outputStream.write(jsonstr.getBytes(StandardCharsets.UTF_8));
             outputStream.flush();
 
-            BufferedReader br = new BufferedReader(new InputStreamReader(httpURLConnection.getInputStream(), StandardCharsets.UTF_8));
+            BufferedReader br =
+                    new BufferedReader(new InputStreamReader(httpURLConnection.getInputStream(),
+                            StandardCharsets.UTF_8));
             String line;
             while ((line = br.readLine()) != null) {
                 stringBuilder.append(line);
@@ -77,4 +81,4 @@ public class HttpClient {
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/src/main/base/org/bdware/sc/redo/TransRecord.java b/src/main/base/org/bdware/sc/redo/TransRecord.java
index 65894a2..04546d6 100644
--- a/src/main/base/org/bdware/sc/redo/TransRecord.java
+++ b/src/main/base/org/bdware/sc/redo/TransRecord.java
@@ -7,58 +7,59 @@ 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;
+public class TransRecord implements Serializable, Comparable<TransRecord> {
+    private static final long serialVersionUID = 8797692289060677903L;
 
-	boolean needSeq = false;
-	int seq;
-	String functionName;
-	JsonElement arg;
-	public Map<String,String> executes = new HashMap<String,String>();   //<innvokdeID,(flag1<seperate>flag<seperate>result)>
+    boolean needSeq = false;
+    int seq;
+    String functionName;
+    JsonElement arg;
+    public Map<String, String> executes = new HashMap<String, String>(); // <innvokdeID,(flag1<seperate>flag<seperate>result)>
 
-	public TransRecord(String s1,JsonElement s2,int sequence) {
-		this.functionName = s1;
-		this.arg = s2;
-		seq = sequence;
-		needSeq = true;
-	}
-	public TransRecord(String s1,JsonElement s2) {
-		this.functionName = s1;
-		this.arg = s2;
-	}
+    public TransRecord(String s1, JsonElement s2, int sequence) {
+        this.functionName = s1;
+        this.arg = s2;
+        seq = sequence;
+        needSeq = true;
+    }
 
-	public String getFuncName() {
-		return functionName;
-	}
+    public TransRecord(String s1, JsonElement s2) {
+        this.functionName = s1;
+        this.arg = s2;
+    }
 
-	public JsonElement getArg() {
-		return arg;
-	}
+    public String getFuncName() {
+        return functionName;
+    }
 
-	public void addExecutes(String k,String v){
-		executes.put(k,v);
-	}
+    public JsonElement getArg() {
+        return arg;
+    }
 
-	public int getSeq(){
-		return seq;
-	}
+    public void addExecutes(String k, String v) {
+        executes.put(k, v);
+    }
 
-	public String getExecuteResult(String k){
-		return executes.get(k);
-	}
+    public int getSeq() {
+        return seq;
+    }
 
-	@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();
-	}
+    public String getExecuteResult(String k) {
+        return executes.get(k);
+    }
 
-	@Override
-	public int compareTo(TransRecord cr) {
-		return (seq < cr.seq) ? -1 : ((seq == cr.seq) ? 0 : 1);
-	}
+    @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
index 14792ca..6bfacc5 100644
--- a/src/main/base/org/bdware/sc/units/RequestCache.java
+++ b/src/main/base/org/bdware/sc/units/RequestCache.java
@@ -6,10 +6,10 @@ 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);
+    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
+    private final Map<Integer, String> requests = new TreeMap<>(); // key is seq
 
     public RequestCache() {
         time = System.currentTimeMillis();
@@ -35,7 +35,7 @@ public class RequestCache {
         return time;
     }
 
-    //只保留最近RESERVED条请求
+    // 只保留最近RESERVED条请求
     public synchronized void decSize() {
         int size = requests.size();
         if (size <= RESERVED)
diff --git a/src/main/base/org/bdware/sc/util/FileUtil.java b/src/main/base/org/bdware/sc/util/FileUtil.java
index a36a5c3..a1b83c0 100644
--- a/src/main/base/org/bdware/sc/util/FileUtil.java
+++ b/src/main/base/org/bdware/sc/util/FileUtil.java
@@ -28,7 +28,7 @@ public class FileUtil {
     public static void copyFile(InputStream in, OutputStream out) {
         try {
             byte[] buffer = new byte[10240];
-            for (int len; (len = in.read(buffer)) > 0; ) {
+            for (int len; (len = in.read(buffer)) > 0;) {
                 out.write(buffer, 0, len);
             }
         } catch (Exception e) {
diff --git a/src/main/base/org/bdware/sc/util/HashUtil.java b/src/main/base/org/bdware/sc/util/HashUtil.java
index 403dec1..b4ddf05 100644
--- a/src/main/base/org/bdware/sc/util/HashUtil.java
+++ b/src/main/base/org/bdware/sc/util/HashUtil.java
@@ -77,13 +77,14 @@ public class HashUtil {
     }
 
     public static int toLittleEndian(int a) {
-        return (((a & 0xFF) << 24) | (((a >> 8) & 0xFF) << 16) | (((a >> 16) & 0xFF) << 8) | ((a >> 24) & 0xFF));
+        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)));
+                | (((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) {
@@ -97,7 +98,8 @@ public class HashUtil {
     }
 
     public static String sha3(String... value) {
-        return Hex.toHexString(DIGEST_SHA3.digest(String.join("", value).getBytes(StandardCharsets.UTF_8)));
+        return Hex.toHexString(
+                DIGEST_SHA3.digest(String.join("", value).getBytes(StandardCharsets.UTF_8)));
     }
 
     public static String sha3ToFixedLen(String value, int len) {
diff --git a/src/main/base/org/bdware/sc/util/LRUList.java b/src/main/base/org/bdware/sc/util/LRUList.java
index ccdbd41..edbdff9 100644
--- a/src/main/base/org/bdware/sc/util/LRUList.java
+++ b/src/main/base/org/bdware/sc/util/LRUList.java
@@ -19,7 +19,8 @@ public class LRUList<T> {
     }
 
     public void remove(T t) {
-        if (array.size() > 0) array.remove(t);
+        if (array.size() > 0)
+            array.remove(t);
     }
 
     public int size() {
diff --git a/src/main/base/org/bdware/sc/util/VersionUtil.java b/src/main/base/org/bdware/sc/util/VersionUtil.java
index 5cf7742..c65d41a 100644
--- a/src/main/base/org/bdware/sc/util/VersionUtil.java
+++ b/src/main/base/org/bdware/sc/util/VersionUtil.java
@@ -11,9 +11,8 @@ public class VersionUtil {
         int minLen = Math.min(version1Array.length, version2Array.length);
         long diff = 0;
 
-        while (index < minLen
-                && (diff = Long.parseLong(version1Array[index])
-                - Long.parseLong(version2Array[index])) == 0) {
+        while (index < minLen && (diff =
+                Long.parseLong(version1Array[index]) - Long.parseLong(version2Array[index])) == 0) {
             index++;
         }
         if (diff == 0) {
diff --git a/src/main/base/org/bdware/sc/visitor/ContractDependencyVisitor.java b/src/main/base/org/bdware/sc/visitor/ContractDependencyVisitor.java
index 5816f32..01fbffe 100644
--- a/src/main/base/org/bdware/sc/visitor/ContractDependencyVisitor.java
+++ b/src/main/base/org/bdware/sc/visitor/ContractDependencyVisitor.java
@@ -5,7 +5,7 @@ import org.bdware.sc.node.FunctionNode;
 import org.bdware.sc.parser.YJSParser;
 import org.bdware.sc.parser.YJSParserBaseVisitor;
 
-public class ContractDependencyVisitor extends YJSParserBaseVisitor<FunctionNode>{
+public class ContractDependencyVisitor extends YJSParserBaseVisitor<FunctionNode> {
 
     private final ContractNode cn;
     private final FunctionNode fn;
@@ -19,13 +19,13 @@ public class ContractDependencyVisitor extends YJSParserBaseVisitor<FunctionNode
     public FunctionNode visitArgumentsExpression(YJSParser.ArgumentsExpressionContext ctx) {
         super.visitArgumentsExpression(ctx);
         if (ctx.singleExpression().getText().equals("executeContract")) {
-            String contractName =  ctx.arguments().singleExpression().get(0).getText();
+            String contractName = ctx.arguments().singleExpression().get(0).getText();
             if (contractName.contains("\"")) {
                 contractName = contractName.replace("\"", "");
                 cn.addDependentContracts(contractName);
             }
-            //ctx.arguments().singleExpression().get(1).getText();
+            // 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
index e0ff5fe..599f7a3 100644
--- a/src/main/base/org/bdware/sc/visitor/ContractReader.java
+++ b/src/main/base/org/bdware/sc/visitor/ContractReader.java
@@ -9,7 +9,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class ContractReader extends YJSParserBaseVisitor<ContractNode> {
-    //    private static final Logger LOGGER = LogManager.getLogger(ContractReader.class);
+    // private static final Logger LOGGER = LogManager.getLogger(ContractReader.class);
     String fileName;
 
     public ContractReader(String fileName) {
@@ -17,10 +17,11 @@ public class ContractReader extends YJSParserBaseVisitor<ContractNode> {
     }
 
     /**
-     * Discover direct dependent functions for all functions. Indirect dependencies are not included.
+     * Discover direct dependent functions for all functions. Indirect dependencies are not
+     * included.
      *
      * @param node contract node
-     * @param ctx  contract declared context
+     * @param ctx contract declared context
      */
     public static void discoverFunctionDependency(ContractNode node, ContractDeclarContext ctx) {
         List<FunctionNode> functions = node.getFunctions();
@@ -81,7 +82,8 @@ public class ContractReader extends YJSParserBaseVisitor<ContractNode> {
         for (AnnotationContext annotation : annotations) {
             AnnotationNode annNode = new AnnotationNode(annotation.Identifier().toString());
             if (null != annotation.annotationArgs())
-                for (AnnotationLiteralContext tNode : annotation.annotationArgs().annotationLiteral()) {
+                for (AnnotationLiteralContext tNode : annotation.annotationArgs()
+                        .annotationLiteral()) {
                     if (null != tNode.numericLiteral()) {
                         annNode.addArg(tNode.numericLiteral().getText());
                     } else if (null != tNode.StringLiteral()) {
@@ -93,11 +95,13 @@ public class ContractReader extends YJSParserBaseVisitor<ContractNode> {
             node.addAnnotation(annNode);
         }
 
-        List<ClzOrFunctionDeclarationContext> clzOrFunctions = contractDelcar.clzOrFunctionDeclaration();
+        List<ClzOrFunctionDeclarationContext> clzOrFunctions =
+                contractDelcar.clzOrFunctionDeclaration();
         for (ClzOrFunctionDeclarationContext clzOrFunction : clzOrFunctions) {
             if (null != clzOrFunction.functionDeclaration()) {
                 FunctionReader reader = new FunctionReader(fileName);
-                node.addFunction(reader.visitFunctionDeclaration(clzOrFunction.functionDeclaration()));
+                node.addFunction(
+                        reader.visitFunctionDeclaration(clzOrFunction.functionDeclaration()));
             } else if (null != clzOrFunction.classDeclaration()) {
                 ClassReader reader = new ClassReader(fileName);
                 node.addClass(reader.visitClassDeclaration(clzOrFunction.classDeclaration()));
@@ -105,10 +109,10 @@ public class ContractReader extends YJSParserBaseVisitor<ContractNode> {
                 EventDeclarationContext event = clzOrFunction.eventDeclaration();
                 EventSemanticsContext eventSemanticsContext = event.eventSemantics();
                 EventGlobalOrLocalContext eventGlobalOrLocalContext = event.eventGlobalOrLocal();
-                String semantics = (null == eventSemanticsContext ? null : eventSemanticsContext.getText());
-                boolean isGlobal =
-                        (null != eventGlobalOrLocalContext &&
-                                eventGlobalOrLocalContext.getText().equals("global"));
+                String semantics =
+                        (null == eventSemanticsContext ? null : eventSemanticsContext.getText());
+                boolean isGlobal = (null != eventGlobalOrLocalContext
+                        && eventGlobalOrLocalContext.getText().equals("global"));
                 node.addEvent(event.Identifier().getText(), semantics, isGlobal);
             } else if (null != clzOrFunction.interfaceDeclaration()) {
                 InterfaceDeclarationContext interfaces = clzOrFunction.interfaceDeclaration();
@@ -122,4 +126,4 @@ public class ContractReader extends YJSParserBaseVisitor<ContractNode> {
         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
index af24cd0..fc65c42 100644
--- a/src/main/base/org/bdware/sc/visitor/FunctionDependencyVisitor.java
+++ b/src/main/base/org/bdware/sc/visitor/FunctionDependencyVisitor.java
@@ -22,9 +22,9 @@ public class FunctionDependencyVisitor extends YJSParserBaseVisitor<FunctionNode
     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)) {
+            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;
             }
diff --git a/src/main/base/org/bdware/sc/visitor/FunctionReader.java b/src/main/base/org/bdware/sc/visitor/FunctionReader.java
index 445a49d..175a93f 100644
--- a/src/main/base/org/bdware/sc/visitor/FunctionReader.java
+++ b/src/main/base/org/bdware/sc/visitor/FunctionReader.java
@@ -67,8 +67,8 @@ public class FunctionReader extends YJSParserBaseVisitor<FunctionNode> {
                 node.setIsMask(true);
             }
             if (null != annotation.annotationArgs())
-                for (AnnotationLiteralContext tNode :
-                        annotation.annotationArgs().annotationLiteral()) {
+                for (AnnotationLiteralContext tNode : annotation.annotationArgs()
+                        .annotationLiteral()) {
                     if (null != tNode.numericLiteral()) {
                         annNode.addArg(tNode.numericLiteral().getText());
                         LOGGER.debug(
@@ -206,8 +206,8 @@ public class FunctionReader extends YJSParserBaseVisitor<FunctionNode> {
         int order = 2;
         int index = 0;
         ExpressionSequenceContext prePart, ifPart, tailPart;
-        if (ctx.getChild(order) instanceof TerminalNodeImpl &&
-                ctx.getChild(order).toString().equals(";")) {
+        if (ctx.getChild(order) instanceof TerminalNodeImpl
+                && ctx.getChild(order).toString().equals(";")) {
             prePart = null;
             order++;
         } else {
@@ -215,8 +215,8 @@ public class FunctionReader extends YJSParserBaseVisitor<FunctionNode> {
             order += 2;
             index++;
         }
-        if (ctx.getChild(order) instanceof TerminalNodeImpl &&
-                ctx.getChild(order).toString().equals(";")) {
+        if (ctx.getChild(order) instanceof TerminalNodeImpl
+                && ctx.getChild(order).toString().equals(";")) {
             ifPart = null;
             order++;
         } else {
@@ -225,8 +225,8 @@ public class FunctionReader extends YJSParserBaseVisitor<FunctionNode> {
             index++;
         }
 
-        if (ctx.getChild(order) instanceof TerminalNodeImpl &&
-                ctx.getChild(order).toString().equals(")")) {
+        if (ctx.getChild(order) instanceof TerminalNodeImpl
+                && ctx.getChild(order).toString().equals(")")) {
             tailPart = null;
         } else {
             tailPart = ctx.expressionSequence(index);
@@ -249,11 +249,8 @@ public class FunctionReader extends YJSParserBaseVisitor<FunctionNode> {
         node.addStmt(target);
         if (null != ifPart) {
             ifPart.accept(this);
-            node.addStmt(
-                    new BranchStmt()
-                            .setReg("Reg" + (regID - 1))
-                            .setTarget(end)
-                            .setLineAndPos(ctx.start));
+            node.addStmt(new BranchStmt().setReg("Reg" + (regID - 1)).setTarget(end)
+                    .setLineAndPos(ctx.start));
         }
         blockStack.push(new BlockInterval(start, end));
         visitStatement(ctx.statement());
diff --git a/src/main/base/org/bdware/sc/visitor/InterfaceReader.java b/src/main/base/org/bdware/sc/visitor/InterfaceReader.java
index b6e932a..2b213b7 100644
--- a/src/main/base/org/bdware/sc/visitor/InterfaceReader.java
+++ b/src/main/base/org/bdware/sc/visitor/InterfaceReader.java
@@ -41,8 +41,8 @@ public class InterfaceReader extends YJSParserBaseVisitor<InterfaceNode> {
         for (AnnotationContext annotation : annotations) {
             AnnotationNode annNode = new AnnotationNode(annotation.Identifier().toString());
             if (null != annotation.annotationArgs())
-                for (AnnotationLiteralContext tNode :
-                        annotation.annotationArgs().annotationLiteral()) {
+                for (AnnotationLiteralContext tNode : annotation.annotationArgs()
+                        .annotationLiteral()) {
                     if (null != tNode.numericLiteral()) {
                         annNode.addArg(tNode.numericLiteral().getText());
                         LOGGER.debug(
diff --git a/src/main/entry/org/bdware/sc/ContractStatus.java b/src/main/entry/org/bdware/sc/ContractStatus.java
index 44231a5..5ca6ee8 100644
--- a/src/main/entry/org/bdware/sc/ContractStatus.java
+++ b/src/main/entry/org/bdware/sc/ContractStatus.java
@@ -1,7 +1,5 @@
 package org.bdware.sc;
 
 enum ContractStatus {
-    Ready,
-    Executing,
-    Executed
+    Ready, Executing, Executed
 }
diff --git a/src/main/entry/org/bdware/sc/SCAPI.java b/src/main/entry/org/bdware/sc/SCAPI.java
index 831c2a4..15f04c0 100644
--- a/src/main/entry/org/bdware/sc/SCAPI.java
+++ b/src/main/entry/org/bdware/sc/SCAPI.java
@@ -9,7 +9,7 @@ import org.bdware.sc.util.JsonUtil;
 public class SCAPI {
     public static void main(String[] args) {
         if (null == args || args.length == 0) {
-            args = new String[]{""};
+            args = new String[] {""};
         }
         switch (args[0]) {
             case "exit":
@@ -45,24 +45,17 @@ public class SCAPI {
 
         }
     }
-	
-	/*
-	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 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();
diff --git a/src/main/entry/org/bdware/sc/YJSPacker.java b/src/main/entry/org/bdware/sc/YJSPacker.java
index d4b5ed5..d9f2689 100644
--- a/src/main/entry/org/bdware/sc/YJSPacker.java
+++ b/src/main/entry/org/bdware/sc/YJSPacker.java
@@ -57,11 +57,12 @@ public class YJSPacker {
             File d = new File(dir);
             File parent = new File(target).getParentFile();
             if (!parent.exists()) {
-                LOGGER.trace("create directory " + parent.getAbsolutePath() + ": " + parent.mkdirs());
+                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);
+            // System.out.println("[YJSPaker]"+dir+MANIFEST_NAME);
             updateManifest(dir + "/" + MANIFEST_NAME);
             generateLogoIfNotExist(dir);
             walkDir(d.getAbsolutePath(), d, zout);
@@ -104,7 +105,7 @@ public class YJSPacker {
         ContractManifest cm = JsonUtil.fromJson(content, ContractManifest.class);
         String builderName = manifest.getParentFile().getParentFile().getName();
         cm.sourcePath = builderName + "/" + manifest.getParentFile().getName();
-        LOGGER.info("DOI:"+cm.doi);
+        LOGGER.info("DOI:" + cm.doi);
         if (null == cm.doi || cm.doi.isEmpty()) {
             cm.doi = "Contract_" + cm.sourcePath.hashCode();
         }
@@ -131,7 +132,7 @@ public class YJSPacker {
                 zout.putNextEntry(new ZipEntry(entryName));
                 FileInputStream fin = new FileInputStream(d);
                 byte[] buff = new byte[1024];
-                for (int l; (l = fin.read(buff)) > 0; ) {
+                for (int l; (l = fin.read(buff)) > 0;) {
                     zout.write(buff, 0, l);
                 }
                 zout.closeEntry();
@@ -163,9 +164,8 @@ public class YJSPacker {
                         pyPkg = PYEntry.instance.packageInfo(pyPkg.getName());
                     } else {
                         for (PYModule pyModule : pyPkg.getModules()) {
-                            PYModule info =
-                                    PYEntry.instance.moduleInfo(
-                                            pyPkg.getName() + "." + pyModule.getName());
+                            PYModule info = PYEntry.instance
+                                    .moduleInfo(pyPkg.getName() + "." + pyModule.getName());
                             info.setName(pyModule.getName());
                             LOGGER.debug(pyPkg.getName() + "." + pyModule.getName());
                             list.add(info);
@@ -211,7 +211,8 @@ public class YJSPacker {
         try {
             zin = new ZipFile(new File(input));
             ZipEntry entry = zin.getEntry(path);
-            return JsonUtil.fromJson(new InputStreamReader(zin.getInputStream(entry)), ContractManifest.class);
+            return JsonUtil.fromJson(new InputStreamReader(zin.getInputStream(entry)),
+                    ContractManifest.class);
         } catch (Exception e) {
             e.printStackTrace();
             return null;
@@ -232,9 +233,9 @@ public class YJSPacker {
             ZipInputStream zin = new ZipInputStream(new FileInputStream(input));
             byte[] buff = new byte[1024 * 100];
             InputStream manifestInput = null;
-            for (ZipEntry entry; (entry = zin.getNextEntry()) != null; ) {
+            for (ZipEntry entry; (entry = zin.getNextEntry()) != null;) {
                 if (entry.getName().endsWith("manifest.json")) {
-                    for (int k; (k = zin.read(buff)) > 0; ) {
+                    for (int k; (k = zin.read(buff)) > 0;) {
                         manifestInput = new ByteArrayInputStream(buff, 0, k);
                     }
                 }
@@ -242,8 +243,8 @@ public class YJSPacker {
             }
             zin.close();
             if (manifestInput != null) {
-                return JsonUtil.fromJson(
-                        new InputStreamReader(manifestInput), ContractManifest.class);
+                return JsonUtil.fromJson(new InputStreamReader(manifestInput),
+                        ContractManifest.class);
             } else {
                 return null;
             }
@@ -269,11 +270,12 @@ public class YJSPacker {
         try {
             ZipInputStream zin = new ZipInputStream(input);
             byte[] buff = new byte[1024 * 100];
-            for (ZipEntry entry; (entry = zin.getNextEntry()) != null; ) {
+            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());
+                    LOGGER.trace("create directory " + parent.getAbsolutePath() + ": "
+                            + parent.mkdirs());
                 }
                 if (!target.exists()) {
                     if (entry.isDirectory()) {
@@ -284,7 +286,7 @@ public class YJSPacker {
                 }
                 if (!entry.isDirectory()) {
                     FileOutputStream fout = new FileOutputStream(target);
-                    for (int k; (k = zin.read(buff)) > 0; ) {
+                    for (int k; (k = zin.read(buff)) > 0;) {
                         fout.write(buff, 0, k);
                     }
                     fout.close();
diff --git a/src/main/entry/org/bdware/sc/bean/ContractDesp.java b/src/main/entry/org/bdware/sc/bean/ContractDesp.java
index 21a4539..9e276d2 100644
--- a/src/main/entry/org/bdware/sc/bean/ContractDesp.java
+++ b/src/main/entry/org/bdware/sc/bean/ContractDesp.java
@@ -27,4 +27,4 @@ public class ContractDesp {
     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
index e357cea..48b0df0 100644
--- a/src/main/entry/org/bdware/sc/bean/ContractExecType.java
+++ b/src/main/entry/org/bdware/sc/bean/ContractExecType.java
@@ -6,12 +6,9 @@ public enum ContractExecType implements Serializable {
     Sole, // 单点锚定合约
     RequestOnce, // 多点不同步合约
     ResponseOnce, // 多点不同步合约，超时的时候再请求一个, 直到获得一个response
-    RequestAllResponseFirst,
-    RequestAllResponseHalf,
-    RequestAllResponseAll,
-    Sharding,//分片执行模式
-    SelfAdaptiveSharding,// self-adaptive sharding
-    PBFT, //PBFT
+    RequestAllResponseFirst, RequestAllResponseHalf, RequestAllResponseAll, Sharding, // 分片执行模式
+    SelfAdaptiveSharding, // self-adaptive sharding
+    PBFT, // PBFT
     RAFT;
 
 
diff --git a/src/main/entry/org/bdware/sc/bean/ContractRequest.java b/src/main/entry/org/bdware/sc/bean/ContractRequest.java
index d90f1e3..4c8c27b 100644
--- a/src/main/entry/org/bdware/sc/bean/ContractRequest.java
+++ b/src/main/entry/org/bdware/sc/bean/ContractRequest.java
@@ -124,13 +124,8 @@ public class ContractRequest extends SM2Verifiable
 
     @Override
     public String getContentStr() {
-        return String.format(
-                "%s|%s|%s%s|%s",
-                contractID,
-                action,
-                parseArg(),
-                gasLimit > 0 ? "|" + gasLimit : "",
-                requester);
+        return String.format("%s|%s|%s%s|%s", contractID, action, parseArg(),
+                gasLimit > 0 ? "|" + gasLimit : "", requester);
     }
 
     private String parseArg() {
diff --git a/src/main/entry/org/bdware/sc/bean/ContractStartInfo.java b/src/main/entry/org/bdware/sc/bean/ContractStartInfo.java
index fa04f5d..451ff7b 100644
--- a/src/main/entry/org/bdware/sc/bean/ContractStartInfo.java
+++ b/src/main/entry/org/bdware/sc/bean/ContractStartInfo.java
@@ -8,8 +8,7 @@ public class ContractStartInfo implements Serializable {
     public String pubKeyPath;
     public String ypkName;
 
-    public ContractStartInfo() {
-    }
+    public ContractStartInfo() {}
 
     public ContractStartInfo(boolean b1, boolean b2, String path, String name) {
         isYPK = b1;
@@ -19,10 +18,9 @@ public class ContractStartInfo implements Serializable {
     }
 
     public String toString() {
-        return String.format("isYPK=%s\n\tisPrivate=%s\n\tpubKeyPath=%s\n\typkName=%s (ContractStartInfo)",
-                isYPK,
-                isPrivate,
-                (pubKeyPath == null ? "null" : pubKeyPath),
+        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
index 6361302..4d233e4 100644
--- a/src/main/entry/org/bdware/sc/bean/DefaultJoinRule.java
+++ b/src/main/entry/org/bdware/sc/bean/DefaultJoinRule.java
@@ -1,6 +1,6 @@
 package org.bdware.sc.bean;
 
 public enum DefaultJoinRule {
-    add,//加法
-    multiply//乘法
+    add, // 加法
+    multiply// 乘法
 }
diff --git a/src/main/entry/org/bdware/sc/bean/DoipOperationInfo.java b/src/main/entry/org/bdware/sc/bean/DoipOperationInfo.java
index 3c5b2eb..7a36d7b 100644
--- a/src/main/entry/org/bdware/sc/bean/DoipOperationInfo.java
+++ b/src/main/entry/org/bdware/sc/bean/DoipOperationInfo.java
@@ -14,7 +14,8 @@ public class DoipOperationInfo {
     public BasicOperations operation;
 
     // todo 对于extension进行特别处理，getArg() == 2就行？这里合理吗？参考RouteInfo貌似合理？
-    public static DoipOperationInfo create(AnnotationNode annotationNode, ContractNode contractNode) {
+    public static DoipOperationInfo create(AnnotationNode annotationNode,
+            ContractNode contractNode) {
         DoipOperationInfo info = new DoipOperationInfo();
         if (annotationNode.getArgs().size() == 1) {
             String str = annotationNode.getArgs().get(0);
@@ -24,14 +25,15 @@ public class DoipOperationInfo {
             String opStr = info.operationType;
             for (BasicOperations op : BasicOperations.values()) {
                 if (op.toString().equals(opStr)) {
-                   info.operation = op;
+                    info.operation = op;
                 }
             }
 
-            if(info.operation == null) info.operation = BasicOperations.Unknown;
+            if (info.operation == null)
+                info.operation = BasicOperations.Unknown;
 
             // If operation is not Extension, set the operationName directly from operation
-            if(info.operation != BasicOperations.Extension) {
+            if (info.operation != BasicOperations.Extension) {
                 info.operationName = info.operation.getName();
             }
         }
diff --git a/src/main/entry/org/bdware/sc/bean/FunctionDesp.java b/src/main/entry/org/bdware/sc/bean/FunctionDesp.java
index b967a0f..068715f 100644
--- a/src/main/entry/org/bdware/sc/bean/FunctionDesp.java
+++ b/src/main/entry/org/bdware/sc/bean/FunctionDesp.java
@@ -13,7 +13,8 @@ public class FunctionDesp implements Serializable {
     public JoinInfo joinInfo;
 
 
-    public FunctionDesp(String name, List<AnnotationNode> annos, RouteInfo routeInfo, JoinInfo joinInfo, boolean isView) {
+    public FunctionDesp(String name, List<AnnotationNode> annos, RouteInfo routeInfo,
+            JoinInfo joinInfo, boolean isView) {
         this.functionName = name;
         this.annotations = annos;
         this.routeInfo = routeInfo;
diff --git a/src/main/entry/org/bdware/sc/bean/ProjectConfig.java b/src/main/entry/org/bdware/sc/bean/ProjectConfig.java
index b768491..7a9afa9 100644
--- a/src/main/entry/org/bdware/sc/bean/ProjectConfig.java
+++ b/src/main/entry/org/bdware/sc/bean/ProjectConfig.java
@@ -28,9 +28,8 @@ public class ProjectConfig implements IDSerializable {
     }
 
     public String getMock(String action) {
-        if (null != mockConfig &&
-                null != mockConfig.config &&
-                null != mockConfig.config.get(action)) {
+        if (null != mockConfig && null != mockConfig.config
+                && null != mockConfig.config.get(action)) {
             return mockConfig.config.get(action).toString();
         }
         return null;
diff --git a/src/main/entry/org/bdware/sc/bean/SM2Verifiable.java b/src/main/entry/org/bdware/sc/bean/SM2Verifiable.java
index fe317a8..7d5db49 100644
--- a/src/main/entry/org/bdware/sc/bean/SM2Verifiable.java
+++ b/src/main/entry/org/bdware/sc/bean/SM2Verifiable.java
@@ -29,10 +29,8 @@ public abstract class SM2Verifiable {
         try {
             setPublicKey(pair.getPublicKeyStr());
 
-            signature =
-                    ByteUtils.toHexString(
-                            SM2Util.sign(
-                                    pair.getPrivateKeyParameter(), getContentStr().getBytes()));
+            signature = ByteUtils.toHexString(
+                    SM2Util.sign(pair.getPrivateKeyParameter(), getContentStr().getBytes()));
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -41,11 +39,10 @@ public abstract class SM2Verifiable {
     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));
+            ECPublicKeyParameters pubKey = BCECUtil.createECPublicKeyFromStrParameters(
+                    getPublicKey(), SM2Util.CURVE, SM2Util.DOMAIN_PARAMS);
+            return SM2Util.verify(pubKey, verifiedStr.getBytes(),
+                    ByteUtils.fromHexString(signature));
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/src/main/entry/org/bdware/sc/db/CMTables.java b/src/main/entry/org/bdware/sc/db/CMTables.java
index dafe899..b5fe777 100644
--- a/src/main/entry/org/bdware/sc/db/CMTables.java
+++ b/src/main/entry/org/bdware/sc/db/CMTables.java
@@ -1,23 +1,9 @@
 package org.bdware.sc.db;
 
 public enum CMTables {
-    LocalNodeLogDB,
-    LocalContractLogDB,
-    NodeRole,
-    LockedUser,
-    NodeTime,
-    ApplyRole,
-    ApplyTime,
-    ConfigDB,
-    ContractInfo,
-    EventRegistry,
-    LastExeSeq,
-    UnitContracts,
-    CheckPointLastHash,
-    ProjectConfig,
-    BCODB;
+    LocalNodeLogDB, LocalContractLogDB, NodeRole, LockedUser, NodeTime, ApplyRole, ApplyTime, ConfigDB, ContractInfo, EventRegistry, LastExeSeq, UnitContracts, CheckPointLastHash, ProjectConfig, BCODB;
 
     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
index 2da9dc5..3605746 100644
--- a/src/main/entry/org/bdware/sc/db/FIFOCache.java
+++ b/src/main/entry/org/bdware/sc/db/FIFOCache.java
@@ -36,10 +36,11 @@ public class FIFOCache<T, V> {
         return cache;
     }
 
-    public void remove(T key){
+    public void remove(T key) {
         cache.remove(key);
     }
-    public void clear(){
+
+    public void clear() {
         cache.clear();
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/entry/org/bdware/sc/db/KeyValueRocksDBUtil.java b/src/main/entry/org/bdware/sc/db/KeyValueRocksDBUtil.java
index 271406a..36c7be9 100644
--- a/src/main/entry/org/bdware/sc/db/KeyValueRocksDBUtil.java
+++ b/src/main/entry/org/bdware/sc/db/KeyValueRocksDBUtil.java
@@ -53,30 +53,26 @@ public class KeyValueRocksDBUtil {
 
     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);
-                    }
-                });
+        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);
-                    }
-                });
+        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;
     }
 
diff --git a/src/main/entry/org/bdware/sc/db/MultiIndexTimeDBUtil.java b/src/main/entry/org/bdware/sc/db/MultiIndexTimeDBUtil.java
index 3ea35d1..06b1a8d 100644
--- a/src/main/entry/org/bdware/sc/db/MultiIndexTimeDBUtil.java
+++ b/src/main/entry/org/bdware/sc/db/MultiIndexTimeDBUtil.java
@@ -114,7 +114,8 @@ public class MultiIndexTimeDBUtil implements MultiIndexTimeDBUtilIntf {
     public long size(String label) {
         try {
             TimeSerialIndex index = getIndex(label);
-            if (index != null) return index.size();
+            if (index != null)
+                return index.size();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -180,8 +181,7 @@ public class MultiIndexTimeDBUtil implements MultiIndexTimeDBUtilIntf {
             String t = null;
             try {
                 t = db.readFromDatabase(l.toString());
-                data2 = JsonUtil.fromJson(t, new TypeToken<Map<String, String>>() {
-                }.getType());
+                data2 = JsonUtil.fromJson(t, new TypeToken<Map<String, String>>() {}.getType());
                 if (null != data2) {
                     action = data2.get("action");
                     if (map.containsKey(action)) {
@@ -220,7 +220,8 @@ public class MultiIndexTimeDBUtil implements MultiIndexTimeDBUtilIntf {
             for (Jedion.KV dataKV : dataKVs) {
                 JsonObject jo = JsonUtil.fromJson(dataKV.value, JsonObject.class);
                 Long time = jo.get("date").getAsLong();
-                if (time < 0) continue;
+                if (time < 0)
+                    continue;
                 times.add(time);
                 memoryIndex.put(time, dataKV);
             }
diff --git a/src/main/entry/org/bdware/sc/db/MultiIndexTimeRocksDBUtil.java b/src/main/entry/org/bdware/sc/db/MultiIndexTimeRocksDBUtil.java
index a486b23..9e601d9 100644
--- a/src/main/entry/org/bdware/sc/db/MultiIndexTimeRocksDBUtil.java
+++ b/src/main/entry/org/bdware/sc/db/MultiIndexTimeRocksDBUtil.java
@@ -55,12 +55,13 @@ public class MultiIndexTimeRocksDBUtil implements MultiIndexTimeDBUtilIntf {
         primaryIndex = new TimeSerialIndex(timeIndex.getAbsolutePath());
         secondaryIndex.put(primaryKey, primaryIndex);
         for (File f : timeIndex.getParentFile().listFiles()) {
-            if (!f.getName().endsWith(".timeindex")) continue;
-            if (f.getName().equals(timeIndex.getName())) continue;
-            TimeSerialIndex index =
-                    new TimeSerialIndex(f.getAbsolutePath());
-            secondaryIndex.putIfAbsent(f.getName().substring(0,
-                    f.getName().length() - ".timeindex".length()), index);
+            if (!f.getName().endsWith(".timeindex"))
+                continue;
+            if (f.getName().equals(timeIndex.getName()))
+                continue;
+            TimeSerialIndex index = new TimeSerialIndex(f.getAbsolutePath());
+            secondaryIndex.putIfAbsent(
+                    f.getName().substring(0, f.getName().length() - ".timeindex".length()), index);
         }
     }
 
@@ -69,7 +70,8 @@ public class MultiIndexTimeRocksDBUtil implements MultiIndexTimeDBUtilIntf {
             TimeSerialIndex index = getIndex(label);
             long key = random.nextLong();
             index.index(key);
-            if (index != primaryIndex) primaryIndex.index(key);
+            if (index != primaryIndex)
+                primaryIndex.index(key);
 
             db.put(longToByte(key), val.getBytes());
         } catch (RocksDBException e) {
@@ -228,8 +230,7 @@ public class MultiIndexTimeRocksDBUtil implements MultiIndexTimeDBUtilIntf {
             String t = null;
             try {
                 t = new String(db.get(longToByte(l)));
-                data2 = JsonUtil.fromJson(t, new TypeToken<Map<String, String>>() {
-                }.getType());
+                data2 = JsonUtil.fromJson(t, new TypeToken<Map<String, String>>() {}.getType());
                 if (null != data2) {
                     action = data2.get("action");
                     if (map.containsKey(action)) {
diff --git a/src/main/entry/org/bdware/sc/db/TimeDBUtil.java b/src/main/entry/org/bdware/sc/db/TimeDBUtil.java
index abe4246..0ff88b3 100644
--- a/src/main/entry/org/bdware/sc/db/TimeDBUtil.java
+++ b/src/main/entry/org/bdware/sc/db/TimeDBUtil.java
@@ -106,9 +106,9 @@ public class TimeDBUtil {
     }
 
     public String queryDetail(String dbName, String key) {
-//        if (!dbName.equals(CMTables.LocalContractLogDB.toString())) {
-//            return null;
-//        }
+        // if (!dbName.equals(CMTables.LocalContractLogDB.toString())) {
+        // return null;
+        // }
         try {
             Jedion db = getDB(dbName);
             return db.readFromDatabase(key);
@@ -177,8 +177,7 @@ public class TimeDBUtil {
     }
 
     public List<String> querySort(String dbName, long end) {
-        if (!(dbName.equals("NC_CMLog")
-                || dbName.equals("NC_NodeLogDB")
+        if (!(dbName.equals("NC_CMLog") || dbName.equals("NC_NodeLogDB")
                 || dbName.equals(CMTables.LocalNodeLogDB.toString())
                 || dbName.equals(CMTables.LocalContractLogDB.toString()))) {
             return null;
@@ -199,8 +198,7 @@ public class TimeDBUtil {
         for (Long l : data) {
             try {
                 String t = db.readFromDatabase(l.toString());
-                data2 = JsonUtil.fromJson(t, new TypeToken<Map<String, String>>() {
-                }.getType());
+                data2 = JsonUtil.fromJson(t, new TypeToken<Map<String, String>>() {}.getType());
                 if (data2 != null) {
                     action = data2.get("action");
                     if (map.containsKey(action)) {
@@ -224,10 +222,9 @@ public class TimeDBUtil {
     }
 
     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())) {
+        if (!dbName.equals("NC_CMLog") && !dbName.equals("NC_NodeLogDB")
+                && !dbName.equals(CMTables.LocalNodeLogDB.toString())
+                && !dbName.equals(CMTables.LocalContractLogDB.toString())) {
             return null;
         }
 
@@ -244,11 +241,8 @@ public class TimeDBUtil {
         String date;
         for (Long l : data) {
             try {
-                data2 =
-                        JsonUtil.fromJson(
-                                db.readFromDatabase(l.toString()),
-                                new TypeToken<Map<String, String>>() {
-                                }.getType());
+                data2 = JsonUtil.fromJson(db.readFromDatabase(l.toString()),
+                        new TypeToken<Map<String, String>>() {}.getType());
                 if (data2 != null) {
                     date = data2.get("date");
                     ret.add(date);
diff --git a/src/main/entry/org/bdware/sc/db/TimeRocksDBUtil.java b/src/main/entry/org/bdware/sc/db/TimeRocksDBUtil.java
index db8ae05..fbc16c0 100644
--- a/src/main/entry/org/bdware/sc/db/TimeRocksDBUtil.java
+++ b/src/main/entry/org/bdware/sc/db/TimeRocksDBUtil.java
@@ -59,8 +59,7 @@ public class TimeRocksDBUtil {
         long key = random.nextLong();
         index.index(key);
         try {
-            db.put(
-                    String.valueOf(key).getBytes(StandardCharsets.UTF_8),
+            db.put(String.valueOf(key).getBytes(StandardCharsets.UTF_8),
                     val.getBytes(StandardCharsets.UTF_8));
         } catch (RocksDBException e) {
             e.printStackTrace();
@@ -73,8 +72,7 @@ public class TimeRocksDBUtil {
         long key = random.nextLong();
         index.manullyIndex(Long.parseLong(date), key);
         try {
-            db.put(
-                    String.valueOf(key).getBytes(StandardCharsets.UTF_8),
+            db.put(String.valueOf(key).getBytes(StandardCharsets.UTF_8),
                     val.getBytes(StandardCharsets.UTF_8));
         } catch (RocksDBException e) {
             e.printStackTrace();
@@ -117,9 +115,9 @@ public class TimeRocksDBUtil {
     }
 
     public String queryDetail(String dbName, String key) {
-        //        if (!dbName.equals(CMTables.LocalContractLogDB.toString())) {
-        //            return null;
-        //        }
+        // if (!dbName.equals(CMTables.LocalContractLogDB.toString())) {
+        // return null;
+        // }
         try {
             RocksDB db = getDB(dbName);
             return new String(db.get(key.getBytes(StandardCharsets.UTF_8)));
@@ -188,8 +186,7 @@ public class TimeRocksDBUtil {
     }
 
     public List<String> querySort(String dbName, long end) {
-        if (!(dbName.equals("NC_CMLog")
-                || dbName.equals("NC_NodeLogDB")
+        if (!(dbName.equals("NC_CMLog") || dbName.equals("NC_NodeLogDB")
                 || dbName.equals(CMTables.LocalNodeLogDB.toString())
                 || dbName.equals(CMTables.LocalContractLogDB.toString()))) {
             return null;
@@ -210,8 +207,7 @@ public class TimeRocksDBUtil {
         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());
+                data2 = JsonUtil.fromJson(t, new TypeToken<Map<String, String>>() {}.getType());
                 if (data2 != null) {
                     action = data2.get("action");
                     if (map.containsKey(action)) {
@@ -235,8 +231,7 @@ public class TimeRocksDBUtil {
     }
 
     public List<String> queryDate(String dbName, long end) {
-        if (!dbName.equals("NC_CMLog")
-                && !dbName.equals("NC_NodeLogDB")
+        if (!dbName.equals("NC_CMLog") && !dbName.equals("NC_NodeLogDB")
                 && !dbName.equals(CMTables.LocalNodeLogDB.toString())
                 && !dbName.equals(CMTables.LocalContractLogDB.toString())) {
             return null;
@@ -255,11 +250,9 @@ public class TimeRocksDBUtil {
         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());
+                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);
diff --git a/src/main/entry/org/bdware/sc/http/HttpPostForm.java b/src/main/entry/org/bdware/sc/http/HttpPostForm.java
index ae37f86..bc522b2 100644
--- a/src/main/entry/org/bdware/sc/http/HttpPostForm.java
+++ b/src/main/entry/org/bdware/sc/http/HttpPostForm.java
@@ -31,7 +31,8 @@ public class HttpPostForm {
             String BOUNDARY = "----------" + System.currentTimeMillis();
             // httpConnection.setRequestProperty("Content-Type", "multipart/form-data;
             // boundary=" + BOUNDARY);
-            httpConnection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded;boundary=" + BOUNDARY);
+            httpConnection.setRequestProperty("Content-Type",
+                    "application/x-www-form-urlencoded;boundary=" + BOUNDARY);
 
             // 连接，从postUrl.openConnection()至此的配置必须要在connect之前完成，
             // 要注意的是connection.getOutputStream会隐含的进行connect。
@@ -74,7 +75,8 @@ public class HttpPostForm {
             if (null == httpConnection) {
                 throw new NullPointerException();
             }
-            reader = new BufferedReader(new InputStreamReader(httpConnection.getInputStream(), StandardCharsets.UTF_8));
+            reader = new BufferedReader(
+                    new InputStreamReader(httpConnection.getInputStream(), StandardCharsets.UTF_8));
             while ((responseMessage = reader.readLine()) != null) {
                 response.append(responseMessage);
                 response.append("\n");
diff --git a/src/main/entry/org/bdware/sc/http/HttpUtil.java b/src/main/entry/org/bdware/sc/http/HttpUtil.java
index 626dfe4..dd8ef2e 100644
--- a/src/main/entry/org/bdware/sc/http/HttpUtil.java
+++ b/src/main/entry/org/bdware/sc/http/HttpUtil.java
@@ -45,16 +45,15 @@ public class HttpUtil {
             URL url = new URL(baseUrl);
             connection = (HttpURLConnection) url.openConnection();
             connection.setRequestMethod("POST");
-            for (String key : header.keySet()) connection.setRequestProperty(key, header.get(key));
+            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();
+            // 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";
+            String resSB = "Content-Disposition: form-data; name=\"file\";" + " filename=\""
+                    + (f.getName()) + "\r\n\r\n";
             out.write(resSB.getBytes(StandardCharsets.UTF_8));
 
             // 开始写文件
@@ -92,12 +91,8 @@ public class HttpUtil {
         return "failed";
     }
 
-    public static String request(
-            String baseUrl,
-            String method,
-            Map<String, String> header,
-            Map<String, String> argMap,
-            List<String> reservedList) {
+    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":
@@ -112,7 +107,8 @@ public class HttpUtil {
     }
 
     private static String getParamStr(Map<String, String> argMap) {
-        if (argMap.keySet().size() == 0) return "";
+        if (argMap.keySet().size() == 0)
+            return "";
         StringBuilder sb = new StringBuilder();
         sb.append("?");
         boolean isFirst = true;
@@ -123,15 +119,16 @@ public class HttpUtil {
         return sb.toString();
     }
 
-    public static Map<String, String> http(
-            String app, String str, String param, Map<String, String> props) {
+    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));
+            for (String key : props.keySet())
+                connection.setRequestProperty(key, props.get(key));
             connection.setDoOutput(true);
             connection.setDoInput(true);
             if (param.length() > 0) {
diff --git a/src/main/entry/org/bdware/sc/index/LenVarTimeSerialIndex.java b/src/main/entry/org/bdware/sc/index/LenVarTimeSerialIndex.java
index 58ff022..d80afbc 100644
--- a/src/main/entry/org/bdware/sc/index/LenVarTimeSerialIndex.java
+++ b/src/main/entry/org/bdware/sc/index/LenVarTimeSerialIndex.java
@@ -11,9 +11,9 @@ 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;
+    // static int chunckSize = 10240;
+    // public String fileDir;
+    // File currentFile;
     RandomAccessFile file;
     int dataSize = 20;
     long fileSize = 0;
@@ -24,7 +24,8 @@ public class LenVarTimeSerialIndex {
             File f = new File(fileName);
             File parent = f.getParentFile();
             if (!parent.exists()) {
-                LOGGER.trace("create directory " + parent.getAbsolutePath() + ": " + parent.mkdirs());
+                LOGGER.trace(
+                        "create directory " + parent.getAbsolutePath() + ": " + parent.mkdirs());
             }
             if (!f.exists()) {
                 LOGGER.trace("create file " + f.getAbsolutePath() + ": " + f.createNewFile());
@@ -72,8 +73,8 @@ public class LenVarTimeSerialIndex {
 
     private void checkData(byte[] hash) {
         if (hash == null || hash.length != dataSize)
-            throw new IllegalArgumentException("unsupported data size:" +
-                    (null == hash ? "null" : hash.length));
+            throw new IllegalArgumentException(
+                    "unsupported data size:" + (null == hash ? "null" : hash.length));
     }
 
     public synchronized long index(byte[] hash) {
diff --git a/src/main/entry/org/bdware/sc/index/TimeSerialIndex.java b/src/main/entry/org/bdware/sc/index/TimeSerialIndex.java
index dcda8dd..64eddc0 100644
--- a/src/main/entry/org/bdware/sc/index/TimeSerialIndex.java
+++ b/src/main/entry/org/bdware/sc/index/TimeSerialIndex.java
@@ -11,9 +11,9 @@ 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;
+    // static int chunkSize = 10240;
+    // public String fileDir;
+    // File currentFile;
     RandomAccessFile file;
     long fileSize = 0;
 
@@ -22,7 +22,8 @@ public class TimeSerialIndex {
             File f = new File(fileName);
             File parent = f.getParentFile();
             if (!parent.exists()) {
-                LOGGER.trace("create directory " + parent.getAbsolutePath() + ": " + parent.mkdirs());
+                LOGGER.trace(
+                        "create directory " + parent.getAbsolutePath() + ": " + parent.mkdirs());
             }
             if (!f.exists()) {
                 LOGGER.trace("create file " + f.getAbsolutePath() + ": " + f.createNewFile());
@@ -59,7 +60,8 @@ public class TimeSerialIndex {
 
     public synchronized List<Long> request(long offset, int len) {
         List<Long> ret = new ArrayList<>();
-        if (offset < 0) offset = 0;
+        if (offset < 0)
+            offset = 0;
 
         if (offset < fileSize) {
             long pos = 0;
@@ -82,7 +84,8 @@ public class TimeSerialIndex {
                 }
             }
             return ret;
-        } else return new ArrayList<>();
+        } else
+            return new ArrayList<>();
     }
 
     public static class IndexEntry {
@@ -91,7 +94,8 @@ public class TimeSerialIndex {
 
     public synchronized List<IndexEntry> requestIndexEntry(long offset, int len) {
         List<IndexEntry> ret = new ArrayList<>();
-        if (offset < 0) offset = 0;
+        if (offset < 0)
+            offset = 0;
         if (offset < fileSize) {
             long pos = 0;
             try {
@@ -115,7 +119,8 @@ public class TimeSerialIndex {
                 }
             }
             return ret;
-        } else return new ArrayList<>();
+        } else
+            return new ArrayList<>();
     }
 
     private long getIndex(long offset) {
@@ -153,12 +158,14 @@ public class TimeSerialIndex {
     }
 
     private long binarySearch(long start, long end, long timeStamp) {
-        if (end <= 0) return end;
+        if (end <= 0)
+            return end;
         if (start >= end - 1) {
             long key = getIndex(end - 1);
             if (key >= timeStamp) {
                 return end - 1;
-            } else return end;
+            } else
+                return end;
         }
         long mid = (start + end) / 2;
         long key = getIndex(mid);
diff --git a/src/main/entry/org/bdware/sc/packer/AvatarHelper.java b/src/main/entry/org/bdware/sc/packer/AvatarHelper.java
index 8f94090..46e82c4 100644
--- a/src/main/entry/org/bdware/sc/packer/AvatarHelper.java
+++ b/src/main/entry/org/bdware/sc/packer/AvatarHelper.java
@@ -52,15 +52,13 @@ public class AvatarHelper {
         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 (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.fillRect((padding + ((grid - 1) - x) * width), (padding + y * width),
+                                width, width);
                     }
                 }
             }
diff --git a/src/main/entry/org/bdware/sc/packer/JarPacker.java b/src/main/entry/org/bdware/sc/packer/JarPacker.java
index 8c92703..542b87c 100644
--- a/src/main/entry/org/bdware/sc/packer/JarPacker.java
+++ b/src/main/entry/org/bdware/sc/packer/JarPacker.java
@@ -15,10 +15,10 @@ 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();
+    // public static boolean ignoreGson = false;
+    // static ClassLoader cl = ClassLoader.getSystemClassLoader();
     ZipOutputStream outputZip;
-    //    Set<String> already = new HashSet<>();
+    // Set<String> already = new HashSet<>();
     private String base = "";
 
     public static void zipTest() {
@@ -97,8 +97,7 @@ public class JarPacker {
             }
 
             private byte[] getMF() {
-                String sb = "Manifest-Version: 1.0\n" +
-                        "Main-Class: com.yancloud.sc.SCAPI\n";
+                String sb = "Manifest-Version: 1.0\n" + "Main-Class: com.yancloud.sc.SCAPI\n";
                 return sb.getBytes();
             }
         }.generateZip(paths, "./generatedlib/yjs.jar");
diff --git a/src/main/gen/org/bdware/sc/parser/JavaScriptBaseLexer.java b/src/main/gen/org/bdware/sc/parser/JavaScriptBaseLexer.java
index 805cc6b..96b3333 100644
--- a/src/main/gen/org/bdware/sc/parser/JavaScriptBaseLexer.java
+++ b/src/main/gen/org/bdware/sc/parser/JavaScriptBaseLexer.java
@@ -8,20 +8,19 @@ import java.util.Stack;
 
 public abstract class JavaScriptBaseLexer extends Lexer {
     /**
-     * Stores values of nested modes. By default mode is strict or
-     * defined externally (useStrictDefault)
+     * 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
+     * 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
+     * Current value of strict mode Can be defined during parsing, see StringFunctions.js and
+     * StringGlobal.js samples
      */
     private boolean useStrictCurrent = false;
 
@@ -43,10 +42,9 @@ public abstract class JavaScriptBaseLexer extends Lexer {
     }
 
     /**
-     * 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
+     * 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.
@@ -64,7 +62,8 @@ public abstract class JavaScriptBaseLexer extends Lexer {
     }
 
     protected void ProcessOpenBrace() {
-        useStrictCurrent = scopeStrictModes.size() > 0 && scopeStrictModes.peek() || useStrictDefault;
+        useStrictCurrent =
+                scopeStrictModes.size() > 0 && scopeStrictModes.peek() || useStrictDefault;
         scopeStrictModes.push(useStrictCurrent);
     }
 
@@ -115,4 +114,4 @@ public abstract class JavaScriptBaseLexer extends Lexer {
                 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
index f1638cb..99665ef 100644
--- a/src/main/gen/org/bdware/sc/parser/JavaScriptBaseParser.java
+++ b/src/main/gen/org/bdware/sc/parser/JavaScriptBaseParser.java
@@ -6,8 +6,8 @@ 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.
+ * 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) {
@@ -56,12 +56,12 @@ public abstract class JavaScriptBaseParser extends Parser {
     }
 
     /**
-     * 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.
+     * 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.
+     * @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) {
 
@@ -75,14 +75,13 @@ public abstract class JavaScriptBaseParser extends Parser {
     }
 
     /**
-     * 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.
+     * 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.
+     * @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() {
 
@@ -114,4 +113,4 @@ public abstract class JavaScriptBaseParser extends Parser {
         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.java b/src/main/gen/org/bdware/sc/parser/JavaScriptLexer.java
index 21e6686..a0073f3 100644
--- a/src/main/gen/org/bdware/sc/parser/JavaScriptLexer.java
+++ b/src/main/gen/org/bdware/sc/parser/JavaScriptLexer.java
@@ -1,9 +1,7 @@
 // Generated from JavaScriptLexer.g4 by ANTLR 4.9.2
 package org.bdware.sc.parser;
-import org.antlr.v4.runtime.Lexer;
+
 import org.antlr.v4.runtime.CharStream;
-import org.antlr.v4.runtime.Token;
-import org.antlr.v4.runtime.TokenStream;
 import org.antlr.v4.runtime.*;
 import org.antlr.v4.runtime.atn.*;
 import org.antlr.v4.runtime.dfa.DFA;
@@ -11,794 +9,816 @@ import org.antlr.v4.runtime.misc.*;
 
 @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
 public class JavaScriptLexer extends JavaScriptBaseLexer {
-	static { RuntimeMetaData.checkVersion("4.9.2", RuntimeMetaData.VERSION); }
+    static {
+        RuntimeMetaData.checkVersion("4.9.2", RuntimeMetaData.VERSION);
+    }
 
-	protected static final DFA[] _decisionToDFA;
-	protected static final PredictionContextCache _sharedContextCache =
-		new PredictionContextCache();
-	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, Global=92, Local=93, View=94, 
-		Class=95, Enum=96, Extends=97, Super=98, Const=99, Export=100, Import=101, 
-		Contract=102, Module=103, Oracle=104, DoipModule=105, Implements=106, 
-		Let=107, Private=108, Public=109, Interface=110, Package=111, Protected=112, 
-		Static=113, Yield=114, Identifier=115, StringLiteral=116, TemplateStringLiteral=117, 
-		WhiteSpaces=118, LineTerminator=119, HtmlComment=120, CDataComment=121, 
-		UnexpectedCharacter=122;
-	public static final int
-		ERROR=2;
-	public static String[] channelNames = {
-		"DEFAULT_TOKEN_CHANNEL", "HIDDEN", "ERROR"
-	};
+    protected static final DFA[] _decisionToDFA;
+    protected static final PredictionContextCache _sharedContextCache =
+            new PredictionContextCache();
+    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, Global = 92, Local = 93, View = 94, Class = 95,
+            Enum = 96, Extends = 97, Super = 98, Const = 99, Export = 100, Import = 101,
+            Contract = 102, Module = 103, Oracle = 104, DoipModule = 105, Implements = 106,
+            Let = 107, Private = 108, Public = 109, Interface = 110, Package = 111, Protected = 112,
+            Static = 113, Yield = 114, Identifier = 115, StringLiteral = 116,
+            TemplateStringLiteral = 117, WhiteSpaces = 118, LineTerminator = 119, HtmlComment = 120,
+            CDataComment = 121, UnexpectedCharacter = 122;
+    public static final int ERROR = 2;
+    public static String[] channelNames = {"DEFAULT_TOKEN_CHANNEL", "HIDDEN", "ERROR"};
 
-	public static String[] modeNames = {
-		"DEFAULT_MODE"
-	};
+    public static String[] modeNames = {"DEFAULT_MODE"};
 
-	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", 
-			"Global", "Local", "View", "Class", "Enum", "Extends", "Super", "Const", 
-			"Export", "Import", "Contract", "Module", "Oracle", "DoipModule", "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"
-		};
-	}
-	public static final String[] ruleNames = makeRuleNames();
+    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", "Global", "Local", "View", "Class", "Enum",
+                "Extends", "Super", "Const", "Export", "Import", "Contract", "Module", "Oracle",
+                "DoipModule", "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'", 
-			"'global'", "'local'", "'view'", "'class'", "'enum'", "'extends'", "'super'", 
-			"'const'", "'export'", "'import'", "'contract'", "'module'", "'oracle'", 
-			"'doipmodule'", "'implements'", "'let'", "'private'", "'public'", "'interface'", 
-			"'package'", "'protected'", "'static'", "'yield'"
-		};
-	}
-	private static final String[] _LITERAL_NAMES = makeLiteralNames();
-	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", 
-			"Global", "Local", "View", "Class", "Enum", "Extends", "Super", "Const", 
-			"Export", "Import", "Contract", "Module", "Oracle", "DoipModule", "Implements", 
-			"Let", "Private", "Public", "Interface", "Package", "Protected", "Static", 
-			"Yield", "Identifier", "StringLiteral", "TemplateStringLiteral", "WhiteSpaces", 
-			"LineTerminator", "HtmlComment", "CDataComment", "UnexpectedCharacter"
-		};
-	}
-	private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
-	public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
+    public static final String[] ruleNames = makeRuleNames();
 
-	/**
-	 * @deprecated Use {@link #VOCABULARY} instead.
-	 */
-	@Deprecated
-	public static final String[] tokenNames;
-	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);
-			}
+    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'", "'global'", "'local'", "'view'", "'class'", "'enum'", "'extends'",
+                "'super'", "'const'", "'export'", "'import'", "'contract'", "'module'", "'oracle'",
+                "'doipmodule'", "'implements'", "'let'", "'private'", "'public'", "'interface'",
+                "'package'", "'protected'", "'static'", "'yield'"};
+    }
 
-			if (tokenNames[i] == null) {
-				tokenNames[i] = "<INVALID>";
-			}
-		}
-	}
+    private static final String[] _LITERAL_NAMES = makeLiteralNames();
 
-	@Override
-	@Deprecated
-	public String[] getTokenNames() {
-		return tokenNames;
-	}
+    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", "Global", "Local", "View", "Class", "Enum",
+                "Extends", "Super", "Const", "Export", "Import", "Contract", "Module", "Oracle",
+                "DoipModule", "Implements", "Let", "Private", "Public", "Interface", "Package",
+                "Protected", "Static", "Yield", "Identifier", "StringLiteral",
+                "TemplateStringLiteral", "WhiteSpaces", "LineTerminator", "HtmlComment",
+                "CDataComment", "UnexpectedCharacter"};
+    }
 
-	@Override
+    private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
+    public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
 
-	public Vocabulary getVocabulary() {
-		return VOCABULARY;
-	}
+    /**
+     * @deprecated Use {@link #VOCABULARY} instead.
+     */
+    @Deprecated
+    public static final String[] tokenNames;
+    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>";
+            }
+        }
+    }
+
+    @Override
+    @Deprecated
+    public String[] getTokenNames() {
+        return tokenNames;
+    }
+
+    @Override
+
+    public Vocabulary getVocabulary() {
+        return VOCABULARY;
+    }
 
 
-	public JavaScriptLexer(CharStream input) {
-		super(input);
-		_interp = new LexerATNSimulator(this,_ATN,_decisionToDFA,_sharedContextCache);
-	}
+    public JavaScriptLexer(CharStream input) {
+        super(input);
+        _interp = new LexerATNSimulator(this, _ATN, _decisionToDFA, _sharedContextCache);
+    }
 
-	@Override
-	public String getGrammarFileName() { return "JavaScriptLexer.g4"; }
+    @Override
+    public String getGrammarFileName() {
+        return "JavaScriptLexer.g4";
+    }
 
-	@Override
-	public String[] getRuleNames() { return ruleNames; }
+    @Override
+    public String[] getRuleNames() {
+        return ruleNames;
+    }
 
-	@Override
-	public String getSerializedATN() { return _serializedATN; }
+    @Override
+    public String getSerializedATN() {
+        return _serializedATN;
+    }
 
-	@Override
-	public String[] getChannelNames() { return channelNames; }
+    @Override
+    public String[] getChannelNames() {
+        return channelNames;
+    }
 
-	@Override
-	public String[] getModeNames() { return modeNames; }
+    @Override
+    public String[] getModeNames() {
+        return modeNames;
+    }
 
-	@Override
-	public ATN getATN() { return _ATN; }
+    @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 115:
-			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 105:
-			return Implements_sempred((RuleContext)_localctx, predIndex);
-		case 106:
-			return Let_sempred((RuleContext)_localctx, predIndex);
-		case 107:
-			return Private_sempred((RuleContext)_localctx, predIndex);
-		case 108:
-			return Public_sempred((RuleContext)_localctx, predIndex);
-		case 109:
-			return Interface_sempred((RuleContext)_localctx, predIndex);
-		case 110:
-			return Package_sempred((RuleContext)_localctx, predIndex);
-		case 111:
-			return Protected_sempred((RuleContext)_localctx, predIndex);
-		case 112:
-			return Static_sempred((RuleContext)_localctx, predIndex);
-		case 113:
-			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;
-	}
+    @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 115:
+                StringLiteral_action((RuleContext) _localctx, actionIndex);
+                break;
+        }
+    }
 
-	public static final String _serializedATN =
-		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2|\u0470\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\4\u008f\t\u008f\4\u0090\t\u0090\4\u0091\t\u0091\4\u0092\t\u0092"+
-		"\3\2\3\2\3\2\3\2\7\2\u012a\n\2\f\2\16\2\u012d\13\2\3\2\3\2\3\2\3\2\3\2"+
-		"\3\3\3\3\3\3\3\3\7\3\u0138\n\3\f\3\16\3\u013b\13\3\3\3\3\3\3\4\3\4\6\4"+
-		"\u0141\n\4\r\4\16\4\u0142\3\4\3\4\3\4\7\4\u0148\n\4\f\4\16\4\u014b\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\u01e3\n8\39\39\39\79\u01e8\n9\f9\169\u01eb\139\39\59\u01ee\n9\39"+
-		"\39\69\u01f2\n9\r9\169\u01f3\39\59\u01f7\n9\39\39\59\u01fb\n9\59\u01fd"+
-		"\n9\3:\3:\3:\6:\u0202\n:\r:\16:\u0203\3;\3;\6;\u0208\n;\r;\16;\u0209\3"+
-		";\3;\3<\3<\3<\6<\u0211\n<\r<\16<\u0212\3=\3=\3=\6=\u0218\n=\r=\16=\u0219"+
-		"\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`\3a\3"+
-		"a\3a\3a\3a\3b\3b\3b\3b\3b\3b\3b\3b\3c\3c\3c\3c\3c\3c\3d\3d\3d\3d\3d\3"+
-		"d\3e\3e\3e\3e\3e\3e\3e\3f\3f\3f\3f\3f\3f\3f\3g\3g\3g\3g\3g\3g\3g\3g\3"+
-		"g\3h\3h\3h\3h\3h\3h\3h\3i\3i\3i\3i\3i\3i\3i\3j\3j\3j\3j\3j\3j\3j\3j\3"+
-		"j\3j\3j\3k\3k\3k\3k\3k\3k\3k\3k\3k\3k\3k\3k\3k\3l\3l\3l\3l\3l\3l\3m\3"+
-		"m\3m\3m\3m\3m\3m\3m\3m\3m\3n\3n\3n\3n\3n\3n\3n\3n\3n\3o\3o\3o\3o\3o\3"+
-		"o\3o\3o\3o\3o\3o\3o\3p\3p\3p\3p\3p\3p\3p\3p\3p\3p\3q\3q\3q\3q\3q\3q\3"+
-		"q\3q\3q\3q\3q\3q\3r\3r\3r\3r\3r\3r\3r\3r\3r\3s\3s\3s\3s\3s\3s\3s\3s\3"+
-		"t\3t\7t\u03a1\nt\ft\16t\u03a4\13t\3u\3u\7u\u03a8\nu\fu\16u\u03ab\13u\3"+
-		"u\3u\3u\7u\u03b0\nu\fu\16u\u03b3\13u\3u\5u\u03b6\nu\3u\3u\3v\3v\3v\3v"+
-		"\7v\u03be\nv\fv\16v\u03c1\13v\3v\3v\3w\6w\u03c6\nw\rw\16w\u03c7\3w\3w"+
-		"\3x\3x\3x\3x\3y\3y\3y\3y\3y\3y\7y\u03d6\ny\fy\16y\u03d9\13y\3y\3y\3y\3"+
-		"y\3y\3y\3z\3z\3z\3z\3z\3z\3z\3z\3z\3z\3z\7z\u03ec\nz\fz\16z\u03ef\13z"+
-		"\3z\3z\3z\3z\3z\3z\3{\3{\3{\3{\3|\3|\3|\3|\5|\u03ff\n|\3}\3}\3}\3}\5}"+
-		"\u0405\n}\3~\3~\3~\3~\3~\5~\u040c\n~\3\177\3\177\5\177\u0410\n\177\3\u0080"+
-		"\3\u0080\3\u0080\3\u0080\3\u0081\3\u0081\3\u0081\3\u0081\3\u0081\3\u0081"+
-		"\3\u0082\3\u0082\3\u0082\6\u0082\u041f\n\u0082\r\u0082\16\u0082\u0420"+
-		"\3\u0082\3\u0082\3\u0083\3\u0083\3\u0084\3\u0084\3\u0085\3\u0085\5\u0085"+
-		"\u042b\n\u0085\3\u0086\3\u0086\3\u0086\3\u0087\3\u0087\3\u0088\3\u0088"+
-		"\3\u0088\7\u0088\u0435\n\u0088\f\u0088\16\u0088\u0438\13\u0088\5\u0088"+
-		"\u043a\n\u0088\3\u0089\3\u0089\5\u0089\u043e\n\u0089\3\u0089\6\u0089\u0441"+
-		"\n\u0089\r\u0089\16\u0089\u0442\3\u008a\3\u008a\3\u008a\3\u008a\3\u008a"+
-		"\5\u008a\u044a\n\u008a\3\u008b\3\u008b\3\u008b\3\u008b\5\u008b\u0450\n"+
-		"\u008b\3\u008c\5\u008c\u0453\n\u008c\3\u008d\5\u008d\u0456\n\u008d\3\u008e"+
-		"\5\u008e\u0459\n\u008e\3\u008f\5\u008f\u045c\n\u008f\3\u0090\3\u0090\3"+
-		"\u0090\3\u0090\7\u0090\u0462\n\u0090\f\u0090\16\u0090\u0465\13\u0090\3"+
-		"\u0090\5\u0090\u0468\n\u0090\3\u0091\3\u0091\5\u0091\u046c\n\u0091\3\u0092"+
-		"\3\u0092\3\u0092\5\u012b\u03d7\u03ed\2\u0093\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\67m8o9q:s;u<w=y>{?}@\177A\u0081"+
-		"B\u0083C\u0085D\u0087E\u0089F\u008bG\u008dH\u008fI\u0091J\u0093K\u0095"+
-		"L\u0097M\u0099N\u009bO\u009dP\u009fQ\u00a1R\u00a3S\u00a5T\u00a7U\u00a9"+
-		"V\u00abW\u00adX\u00afY\u00b1Z\u00b3[\u00b5\\\u00b7]\u00b9^\u00bb_\u00bd"+
-		"`\u00bfa\u00c1b\u00c3c\u00c5d\u00c7e\u00c9f\u00cbg\u00cdh\u00cfi\u00d1"+
-		"j\u00d3k\u00d5l\u00d7m\u00d9n\u00dbo\u00ddp\u00dfq\u00e1r\u00e3s\u00e5"+
-		"t\u00e7u\u00e9v\u00ebw\u00edx\u00efy\u00f1z\u00f3{\u00f5|\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\u011d"+
-		"\2\u011f\2\u0121\2\u0123\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\u048a\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\2\u00ef"+
-		"\3\2\2\2\2\u00f1\3\2\2\2\2\u00f3\3\2\2\2\2\u00f5\3\2\2\2\3\u0125\3\2\2"+
-		"\2\5\u0133\3\2\2\2\7\u013e\3\2\2\2\t\u014c\3\2\2\2\13\u014e\3\2\2\2\r"+
-		"\u0150\3\2\2\2\17\u0152\3\2\2\2\21\u0154\3\2\2\2\23\u0157\3\2\2\2\25\u015a"+
-		"\3\2\2\2\27\u015c\3\2\2\2\31\u015e\3\2\2\2\33\u0160\3\2\2\2\35\u0162\3"+
-		"\2\2\2\37\u0164\3\2\2\2!\u0168\3\2\2\2#\u016a\3\2\2\2%\u016d\3\2\2\2\'"+
-		"\u0170\3\2\2\2)\u0172\3\2\2\2+\u0174\3\2\2\2-\u0176\3\2\2\2/\u0178\3\2"+
-		"\2\2\61\u017a\3\2\2\2\63\u017c\3\2\2\2\65\u017e\3\2\2\2\67\u0181\3\2\2"+
-		"\29\u0184\3\2\2\2;\u0188\3\2\2\2=\u018a\3\2\2\2?\u018c\3\2\2\2A\u018f"+
-		"\3\2\2\2C\u0192\3\2\2\2E\u0195\3\2\2\2G\u0198\3\2\2\2I\u019c\3\2\2\2K"+
-		"\u01a0\3\2\2\2M\u01a2\3\2\2\2O\u01a4\3\2\2\2Q\u01a6\3\2\2\2S\u01a9\3\2"+
-		"\2\2U\u01ac\3\2\2\2W\u01af\3\2\2\2Y\u01b2\3\2\2\2[\u01b5\3\2\2\2]\u01b8"+
-		"\3\2\2\2_\u01bb\3\2\2\2a\u01bf\3\2\2\2c\u01c3\3\2\2\2e\u01c8\3\2\2\2g"+
-		"\u01cb\3\2\2\2i\u01ce\3\2\2\2k\u01d1\3\2\2\2m\u01d4\3\2\2\2o\u01e2\3\2"+
-		"\2\2q\u01fc\3\2\2\2s\u01fe\3\2\2\2u\u0205\3\2\2\2w\u020d\3\2\2\2y\u0214"+
-		"\3\2\2\2{\u021b\3\2\2\2}\u0221\3\2\2\2\177\u0224\3\2\2\2\u0081\u022f\3"+
-		"\2\2\2\u0083\u0236\3\2\2\2\u0085\u023b\3\2\2\2\u0087\u0240\3\2\2\2\u0089"+
-		"\u0244\3\2\2\2\u008b\u0248\3\2\2\2\u008d\u024e\3\2\2\2\u008f\u0256\3\2"+
-		"\2\2\u0091\u025d\3\2\2\2\u0093\u0262\3\2\2\2\u0095\u026b\3\2\2\2\u0097"+
-		"\u026f\3\2\2\2\u0099\u0276\3\2\2\2\u009b\u027c\3\2\2\2\u009d\u0285\3\2"+
-		"\2\2\u009f\u028e\3\2\2\2\u00a1\u0293\3\2\2\2\u00a3\u0298\3\2\2\2\u00a5"+
-		"\u02a0\3\2\2\2\u00a7\u02a3\3\2\2\2\u00a9\u02a9\3\2\2\2\u00ab\u02b0\3\2"+
-		"\2\2\u00ad\u02b3\3\2\2\2\u00af\u02b7\3\2\2\2\u00b1\u02bd\3\2\2\2\u00b3"+
-		"\u02bf\3\2\2\2\u00b5\u02cd\3\2\2\2\u00b7\u02da\3\2\2\2\u00b9\u02e4\3\2"+
-		"\2\2\u00bb\u02eb\3\2\2\2\u00bd\u02f1\3\2\2\2\u00bf\u02f6\3\2\2\2\u00c1"+
-		"\u02fc\3\2\2\2\u00c3\u0301\3\2\2\2\u00c5\u0309\3\2\2\2\u00c7\u030f\3\2"+
-		"\2\2\u00c9\u0315\3\2\2\2\u00cb\u031c\3\2\2\2\u00cd\u0323\3\2\2\2\u00cf"+
-		"\u032c\3\2\2\2\u00d1\u0333\3\2\2\2\u00d3\u033a\3\2\2\2\u00d5\u0345\3\2"+
-		"\2\2\u00d7\u0352\3\2\2\2\u00d9\u0358\3\2\2\2\u00db\u0362\3\2\2\2\u00dd"+
-		"\u036b\3\2\2\2\u00df\u0377\3\2\2\2\u00e1\u0381\3\2\2\2\u00e3\u038d\3\2"+
-		"\2\2\u00e5\u0396\3\2\2\2\u00e7\u039e\3\2\2\2\u00e9\u03b5\3\2\2\2\u00eb"+
-		"\u03b9\3\2\2\2\u00ed\u03c5\3\2\2\2\u00ef\u03cb\3\2\2\2\u00f1\u03cf\3\2"+
-		"\2\2\u00f3\u03e0\3\2\2\2\u00f5\u03f6\3\2\2\2\u00f7\u03fe\3\2\2\2\u00f9"+
-		"\u0404\3\2\2\2\u00fb\u040b\3\2\2\2\u00fd\u040f\3\2\2\2\u00ff\u0411\3\2"+
-		"\2\2\u0101\u0415\3\2\2\2\u0103\u041b\3\2\2\2\u0105\u0424\3\2\2\2\u0107"+
-		"\u0426\3\2\2\2\u0109\u042a\3\2\2\2\u010b\u042c\3\2\2\2\u010d\u042f\3\2"+
-		"\2\2\u010f\u0439\3\2\2\2\u0111\u043b\3\2\2\2\u0113\u0449\3\2\2\2\u0115"+
-		"\u044f\3\2\2\2\u0117\u0452\3\2\2\2\u0119\u0455\3\2\2\2\u011b\u0458\3\2"+
-		"\2\2\u011d\u045b\3\2\2\2\u011f\u0467\3\2\2\2\u0121\u046b\3\2\2\2\u0123"+
-		"\u046d\3\2\2\2\u0125\u0126\7\61\2\2\u0126\u0127\7,\2\2\u0127\u012b\3\2"+
-		"\2\2\u0128\u012a\13\2\2\2\u0129\u0128\3\2\2\2\u012a\u012d\3\2\2\2\u012b"+
-		"\u012c\3\2\2\2\u012b\u0129\3\2\2\2\u012c\u012e\3\2\2\2\u012d\u012b\3\2"+
-		"\2\2\u012e\u012f\7,\2\2\u012f\u0130\7\61\2\2\u0130\u0131\3\2\2\2\u0131"+
-		"\u0132\b\2\2\2\u0132\4\3\2\2\2\u0133\u0134\7\61\2\2\u0134\u0135\7\61\2"+
-		"\2\u0135\u0139\3\2\2\2\u0136\u0138\n\2\2\2\u0137\u0136\3\2\2\2\u0138\u013b"+
-		"\3\2\2\2\u0139\u0137\3\2\2\2\u0139\u013a\3\2\2\2\u013a\u013c\3\2\2\2\u013b"+
-		"\u0139\3\2\2\2\u013c\u013d\b\3\2\2\u013d\6\3\2\2\2\u013e\u0140\7\61\2"+
-		"\2\u013f\u0141\5\u011f\u0090\2\u0140\u013f\3\2\2\2\u0141\u0142\3\2\2\2"+
-		"\u0142\u0140\3\2\2\2\u0142\u0143\3\2\2\2\u0143\u0144\3\2\2\2\u0144\u0145"+
-		"\6\4\2\2\u0145\u0149\7\61\2\2\u0146\u0148\5\u0113\u008a\2\u0147\u0146"+
-		"\3\2\2\2\u0148\u014b\3\2\2\2\u0149\u0147\3\2\2\2\u0149\u014a\3\2\2\2\u014a"+
-		"\b\3\2\2\2\u014b\u0149\3\2\2\2\u014c\u014d\7]\2\2\u014d\n\3\2\2\2\u014e"+
-		"\u014f\7_\2\2\u014f\f\3\2\2\2\u0150\u0151\7*\2\2\u0151\16\3\2\2\2\u0152"+
-		"\u0153\7+\2\2\u0153\20\3\2\2\2\u0154\u0155\7}\2\2\u0155\u0156\b\t\3\2"+
-		"\u0156\22\3\2\2\2\u0157\u0158\7\177\2\2\u0158\u0159\b\n\4\2\u0159\24\3"+
-		"\2\2\2\u015a\u015b\7=\2\2\u015b\26\3\2\2\2\u015c\u015d\7.\2\2\u015d\30"+
-		"\3\2\2\2\u015e\u015f\7?\2\2\u015f\32\3\2\2\2\u0160\u0161\7A\2\2\u0161"+
-		"\34\3\2\2\2\u0162\u0163\7<\2\2\u0163\36\3\2\2\2\u0164\u0165\7\60\2\2\u0165"+
-		"\u0166\7\60\2\2\u0166\u0167\7\60\2\2\u0167 \3\2\2\2\u0168\u0169\7\60\2"+
-		"\2\u0169\"\3\2\2\2\u016a\u016b\7-\2\2\u016b\u016c\7-\2\2\u016c$\3\2\2"+
-		"\2\u016d\u016e\7/\2\2\u016e\u016f\7/\2\2\u016f&\3\2\2\2\u0170\u0171\7"+
-		"-\2\2\u0171(\3\2\2\2\u0172\u0173\7/\2\2\u0173*\3\2\2\2\u0174\u0175\7\u0080"+
-		"\2\2\u0175,\3\2\2\2\u0176\u0177\7#\2\2\u0177.\3\2\2\2\u0178\u0179\7,\2"+
-		"\2\u0179\60\3\2\2\2\u017a\u017b\7\61\2\2\u017b\62\3\2\2\2\u017c\u017d"+
-		"\7\'\2\2\u017d\64\3\2\2\2\u017e\u017f\7@\2\2\u017f\u0180\7@\2\2\u0180"+
-		"\66\3\2\2\2\u0181\u0182\7>\2\2\u0182\u0183\7>\2\2\u01838\3\2\2\2\u0184"+
-		"\u0185\7@\2\2\u0185\u0186\7@\2\2\u0186\u0187\7@\2\2\u0187:\3\2\2\2\u0188"+
-		"\u0189\7>\2\2\u0189<\3\2\2\2\u018a\u018b\7@\2\2\u018b>\3\2\2\2\u018c\u018d"+
-		"\7>\2\2\u018d\u018e\7?\2\2\u018e@\3\2\2\2\u018f\u0190\7@\2\2\u0190\u0191"+
-		"\7?\2\2\u0191B\3\2\2\2\u0192\u0193\7?\2\2\u0193\u0194\7?\2\2\u0194D\3"+
-		"\2\2\2\u0195\u0196\7#\2\2\u0196\u0197\7?\2\2\u0197F\3\2\2\2\u0198\u0199"+
-		"\7?\2\2\u0199\u019a\7?\2\2\u019a\u019b\7?\2\2\u019bH\3\2\2\2\u019c\u019d"+
-		"\7#\2\2\u019d\u019e\7?\2\2\u019e\u019f\7?\2\2\u019fJ\3\2\2\2\u01a0\u01a1"+
-		"\7(\2\2\u01a1L\3\2\2\2\u01a2\u01a3\7`\2\2\u01a3N\3\2\2\2\u01a4\u01a5\7"+
-		"~\2\2\u01a5P\3\2\2\2\u01a6\u01a7\7(\2\2\u01a7\u01a8\7(\2\2\u01a8R\3\2"+
-		"\2\2\u01a9\u01aa\7~\2\2\u01aa\u01ab\7~\2\2\u01abT\3\2\2\2\u01ac\u01ad"+
-		"\7,\2\2\u01ad\u01ae\7?\2\2\u01aeV\3\2\2\2\u01af\u01b0\7\61\2\2\u01b0\u01b1"+
-		"\7?\2\2\u01b1X\3\2\2\2\u01b2\u01b3\7\'\2\2\u01b3\u01b4\7?\2\2\u01b4Z\3"+
-		"\2\2\2\u01b5\u01b6\7-\2\2\u01b6\u01b7\7?\2\2\u01b7\\\3\2\2\2\u01b8\u01b9"+
-		"\7/\2\2\u01b9\u01ba\7?\2\2\u01ba^\3\2\2\2\u01bb\u01bc\7>\2\2\u01bc\u01bd"+
-		"\7>\2\2\u01bd\u01be\7?\2\2\u01be`\3\2\2\2\u01bf\u01c0\7@\2\2\u01c0\u01c1"+
-		"\7@\2\2\u01c1\u01c2\7?\2\2\u01c2b\3\2\2\2\u01c3\u01c4\7@\2\2\u01c4\u01c5"+
-		"\7@\2\2\u01c5\u01c6\7@\2\2\u01c6\u01c7\7?\2\2\u01c7d\3\2\2\2\u01c8\u01c9"+
-		"\7(\2\2\u01c9\u01ca\7?\2\2\u01caf\3\2\2\2\u01cb\u01cc\7`\2\2\u01cc\u01cd"+
-		"\7?\2\2\u01cdh\3\2\2\2\u01ce\u01cf\7~\2\2\u01cf\u01d0\7?\2\2\u01d0j\3"+
-		"\2\2\2\u01d1\u01d2\7?\2\2\u01d2\u01d3\7@\2\2\u01d3l\3\2\2\2\u01d4\u01d5"+
-		"\7p\2\2\u01d5\u01d6\7w\2\2\u01d6\u01d7\7n\2\2\u01d7\u01d8\7n\2\2\u01d8"+
-		"n\3\2\2\2\u01d9\u01da\7v\2\2\u01da\u01db\7t\2\2\u01db\u01dc\7w\2\2\u01dc"+
-		"\u01e3\7g\2\2\u01dd\u01de\7h\2\2\u01de\u01df\7c\2\2\u01df\u01e0\7n\2\2"+
-		"\u01e0\u01e1\7u\2\2\u01e1\u01e3\7g\2\2\u01e2\u01d9\3\2\2\2\u01e2\u01dd"+
-		"\3\2\2\2\u01e3p\3\2\2\2\u01e4\u01e5\5\u010f\u0088\2\u01e5\u01e9\7\60\2"+
-		"\2\u01e6\u01e8\t\3\2\2\u01e7\u01e6\3\2\2\2\u01e8\u01eb\3\2\2\2\u01e9\u01e7"+
-		"\3\2\2\2\u01e9\u01ea\3\2\2\2\u01ea\u01ed\3\2\2\2\u01eb\u01e9\3\2\2\2\u01ec"+
-		"\u01ee\5\u0111\u0089\2\u01ed\u01ec\3\2\2\2\u01ed\u01ee\3\2\2\2\u01ee\u01fd"+
-		"\3\2\2\2\u01ef\u01f1\7\60\2\2\u01f0\u01f2\t\3\2\2\u01f1\u01f0\3\2\2\2"+
-		"\u01f2\u01f3\3\2\2\2\u01f3\u01f1\3\2\2\2\u01f3\u01f4\3\2\2\2\u01f4\u01f6"+
-		"\3\2\2\2\u01f5\u01f7\5\u0111\u0089\2\u01f6\u01f5\3\2\2\2\u01f6\u01f7\3"+
-		"\2\2\2\u01f7\u01fd\3\2\2\2\u01f8\u01fa\5\u010f\u0088\2\u01f9\u01fb\5\u0111"+
-		"\u0089\2\u01fa\u01f9\3\2\2\2\u01fa\u01fb\3\2\2\2\u01fb\u01fd\3\2\2\2\u01fc"+
-		"\u01e4\3\2\2\2\u01fc\u01ef\3\2\2\2\u01fc\u01f8\3\2\2\2\u01fdr\3\2\2\2"+
-		"\u01fe\u01ff\7\62\2\2\u01ff\u0201\t\4\2\2\u0200\u0202\5\u010d\u0087\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\u0204t\3\2\2\2\u0205\u0207\7\62\2\2\u0206\u0208\t\5\2\2\u0207"+
-		"\u0206\3\2\2\2\u0208\u0209\3\2\2\2\u0209\u0207\3\2\2\2\u0209\u020a\3\2"+
-		"\2\2\u020a\u020b\3\2\2\2\u020b\u020c\6;\3\2\u020cv\3\2\2\2\u020d\u020e"+
-		"\7\62\2\2\u020e\u0210\t\6\2\2\u020f\u0211\t\5\2\2\u0210\u020f\3\2\2\2"+
-		"\u0211\u0212\3\2\2\2\u0212\u0210\3\2\2\2\u0212\u0213\3\2\2\2\u0213x\3"+
-		"\2\2\2\u0214\u0215\7\62\2\2\u0215\u0217\t\7\2\2\u0216\u0218\t\b\2\2\u0217"+
-		"\u0216\3\2\2\2\u0218\u0219\3\2\2\2\u0219\u0217\3\2\2\2\u0219\u021a\3\2"+
-		"\2\2\u021az\3\2\2\2\u021b\u021c\7d\2\2\u021c\u021d\7t\2\2\u021d\u021e"+
-		"\7g\2\2\u021e\u021f\7c\2\2\u021f\u0220\7m\2\2\u0220|\3\2\2\2\u0221\u0222"+
-		"\7f\2\2\u0222\u0223\7q\2\2\u0223~\3\2\2\2\u0224\u0225\7k\2\2\u0225\u0226"+
-		"\7p\2\2\u0226\u0227\7u\2\2\u0227\u0228\7v\2\2\u0228\u0229\7c\2\2\u0229"+
-		"\u022a\7p\2\2\u022a\u022b\7e\2\2\u022b\u022c\7g\2\2\u022c\u022d\7q\2\2"+
-		"\u022d\u022e\7h\2\2\u022e\u0080\3\2\2\2\u022f\u0230\7v\2\2\u0230\u0231"+
-		"\7{\2\2\u0231\u0232\7r\2\2\u0232\u0233\7g\2\2\u0233\u0234\7q\2\2\u0234"+
-		"\u0235\7h\2\2\u0235\u0082\3\2\2\2\u0236\u0237\7e\2\2\u0237\u0238\7c\2"+
-		"\2\u0238\u0239\7u\2\2\u0239\u023a\7g\2\2\u023a\u0084\3\2\2\2\u023b\u023c"+
-		"\7g\2\2\u023c\u023d\7n\2\2\u023d\u023e\7u\2\2\u023e\u023f\7g\2\2\u023f"+
-		"\u0086\3\2\2\2\u0240\u0241\7p\2\2\u0241\u0242\7g\2\2\u0242\u0243\7y\2"+
-		"\2\u0243\u0088\3\2\2\2\u0244\u0245\7x\2\2\u0245\u0246\7c\2\2\u0246\u0247"+
-		"\7t\2\2\u0247\u008a\3\2\2\2\u0248\u0249\7e\2\2\u0249\u024a\7c\2\2\u024a"+
-		"\u024b\7v\2\2\u024b\u024c\7e\2\2\u024c\u024d\7j\2\2\u024d\u008c\3\2\2"+
-		"\2\u024e\u024f\7h\2\2\u024f\u0250\7k\2\2\u0250\u0251\7p\2\2\u0251\u0252"+
-		"\7c\2\2\u0252\u0253\7n\2\2\u0253\u0254\7n\2\2\u0254\u0255\7{\2\2\u0255"+
-		"\u008e\3\2\2\2\u0256\u0257\7t\2\2\u0257\u0258\7g\2\2\u0258\u0259\7v\2"+
-		"\2\u0259\u025a\7w\2\2\u025a\u025b\7t\2\2\u025b\u025c\7p\2\2\u025c\u0090"+
-		"\3\2\2\2\u025d\u025e\7x\2\2\u025e\u025f\7q\2\2\u025f\u0260\7k\2\2\u0260"+
-		"\u0261\7f\2\2\u0261\u0092\3\2\2\2\u0262\u0263\7e\2\2\u0263\u0264\7q\2"+
-		"\2\u0264\u0265\7p\2\2\u0265\u0266\7v\2\2\u0266\u0267\7k\2\2\u0267\u0268"+
-		"\7p\2\2\u0268\u0269\7w\2\2\u0269\u026a\7g\2\2\u026a\u0094\3\2\2\2\u026b"+
-		"\u026c\7h\2\2\u026c\u026d\7q\2\2\u026d\u026e\7t\2\2\u026e\u0096\3\2\2"+
-		"\2\u026f\u0270\7u\2\2\u0270\u0271\7y\2\2\u0271\u0272\7k\2\2\u0272\u0273"+
-		"\7v\2\2\u0273\u0274\7e\2\2\u0274\u0275\7j\2\2\u0275\u0098\3\2\2\2\u0276"+
-		"\u0277\7y\2\2\u0277\u0278\7j\2\2\u0278\u0279\7k\2\2\u0279\u027a\7n\2\2"+
-		"\u027a\u027b\7g\2\2\u027b\u009a\3\2\2\2\u027c\u027d\7f\2\2\u027d\u027e"+
-		"\7g\2\2\u027e\u027f\7d\2\2\u027f\u0280\7w\2\2\u0280\u0281\7i\2\2\u0281"+
-		"\u0282\7i\2\2\u0282\u0283\7g\2\2\u0283\u0284\7t\2\2\u0284\u009c\3\2\2"+
-		"\2\u0285\u0286\7h\2\2\u0286\u0287\7w\2\2\u0287\u0288\7p\2\2\u0288\u0289"+
-		"\7e\2\2\u0289\u028a\7v\2\2\u028a\u028b\7k\2\2\u028b\u028c\7q\2\2\u028c"+
-		"\u028d\7p\2\2\u028d\u009e\3\2\2\2\u028e\u028f\7v\2\2\u028f\u0290\7j\2"+
-		"\2\u0290\u0291\7k\2\2\u0291\u0292\7u\2\2\u0292\u00a0\3\2\2\2\u0293\u0294"+
-		"\7y\2\2\u0294\u0295\7k\2\2\u0295\u0296\7v\2\2\u0296\u0297\7j\2\2\u0297"+
-		"\u00a2\3\2\2\2\u0298\u0299\7f\2\2\u0299\u029a\7g\2\2\u029a\u029b\7h\2"+
-		"\2\u029b\u029c\7c\2\2\u029c\u029d\7w\2\2\u029d\u029e\7n\2\2\u029e\u029f"+
-		"\7v\2\2\u029f\u00a4\3\2\2\2\u02a0\u02a1\7k\2\2\u02a1\u02a2\7h\2\2\u02a2"+
-		"\u00a6\3\2\2\2\u02a3\u02a4\7v\2\2\u02a4\u02a5\7j\2\2\u02a5\u02a6\7t\2"+
-		"\2\u02a6\u02a7\7q\2\2\u02a7\u02a8\7y\2\2\u02a8\u00a8\3\2\2\2\u02a9\u02aa"+
-		"\7f\2\2\u02aa\u02ab\7g\2\2\u02ab\u02ac\7n\2\2\u02ac\u02ad\7g\2\2\u02ad"+
-		"\u02ae\7v\2\2\u02ae\u02af\7g\2\2\u02af\u00aa\3\2\2\2\u02b0\u02b1\7k\2"+
-		"\2\u02b1\u02b2\7p\2\2\u02b2\u00ac\3\2\2\2\u02b3\u02b4\7v\2\2\u02b4\u02b5"+
-		"\7t\2\2\u02b5\u02b6\7{\2\2\u02b6\u00ae\3\2\2\2\u02b7\u02b8\7g\2\2\u02b8"+
-		"\u02b9\7x\2\2\u02b9\u02ba\7g\2\2\u02ba\u02bb\7p\2\2\u02bb\u02bc\7v\2\2"+
-		"\u02bc\u00b0\3\2\2\2\u02bd\u02be\7B\2\2\u02be\u00b2\3\2\2\2\u02bf\u02c0"+
-		"\7C\2\2\u02c0\u02c1\7V\2\2\u02c1\u02c2\7a\2\2\u02c2\u02c3\7N\2\2\u02c3"+
-		"\u02c4\7G\2\2\u02c4\u02c5\7C\2\2\u02c5\u02c6\7U\2\2\u02c6\u02c7\7V\2\2"+
-		"\u02c7\u02c8\7a\2\2\u02c8\u02c9\7Q\2\2\u02c9\u02ca\7P\2\2\u02ca\u02cb"+
-		"\7E\2\2\u02cb\u02cc\7G\2\2\u02cc\u00b4\3\2\2\2\u02cd\u02ce\7C\2\2\u02ce"+
-		"\u02cf\7V\2\2\u02cf\u02d0\7a\2\2\u02d0\u02d1\7O\2\2\u02d1\u02d2\7Q\2\2"+
-		"\u02d2\u02d3\7U\2\2\u02d3\u02d4\7V\2\2\u02d4\u02d5\7a\2\2\u02d5\u02d6"+
-		"\7Q\2\2\u02d6\u02d7\7P\2\2\u02d7\u02d8\7E\2\2\u02d8\u02d9\7G\2\2\u02d9"+
-		"\u00b6\3\2\2\2\u02da\u02db\7Q\2\2\u02db\u02dc\7P\2\2\u02dc\u02dd\7N\2"+
-		"\2\u02dd\u02de\7[\2\2\u02de\u02df\7a\2\2\u02df\u02e0\7Q\2\2\u02e0\u02e1"+
-		"\7P\2\2\u02e1\u02e2\7E\2\2\u02e2\u02e3\7G\2\2\u02e3\u00b8\3\2\2\2\u02e4"+
-		"\u02e5\7i\2\2\u02e5\u02e6\7n\2\2\u02e6\u02e7\7q\2\2\u02e7\u02e8\7d\2\2"+
-		"\u02e8\u02e9\7c\2\2\u02e9\u02ea\7n\2\2\u02ea\u00ba\3\2\2\2\u02eb\u02ec"+
-		"\7n\2\2\u02ec\u02ed\7q\2\2\u02ed\u02ee\7e\2\2\u02ee\u02ef\7c\2\2\u02ef"+
-		"\u02f0\7n\2\2\u02f0\u00bc\3\2\2\2\u02f1\u02f2\7x\2\2\u02f2\u02f3\7k\2"+
-		"\2\u02f3\u02f4\7g\2\2\u02f4\u02f5\7y\2\2\u02f5\u00be\3\2\2\2\u02f6\u02f7"+
-		"\7e\2\2\u02f7\u02f8\7n\2\2\u02f8\u02f9\7c\2\2\u02f9\u02fa\7u\2\2\u02fa"+
-		"\u02fb\7u\2\2\u02fb\u00c0\3\2\2\2\u02fc\u02fd\7g\2\2\u02fd\u02fe\7p\2"+
-		"\2\u02fe\u02ff\7w\2\2\u02ff\u0300\7o\2\2\u0300\u00c2\3\2\2\2\u0301\u0302"+
-		"\7g\2\2\u0302\u0303\7z\2\2\u0303\u0304\7v\2\2\u0304\u0305\7g\2\2\u0305"+
-		"\u0306\7p\2\2\u0306\u0307\7f\2\2\u0307\u0308\7u\2\2\u0308\u00c4\3\2\2"+
-		"\2\u0309\u030a\7u\2\2\u030a\u030b\7w\2\2\u030b\u030c\7r\2\2\u030c\u030d"+
-		"\7g\2\2\u030d\u030e\7t\2\2\u030e\u00c6\3\2\2\2\u030f\u0310\7e\2\2\u0310"+
-		"\u0311\7q\2\2\u0311\u0312\7p\2\2\u0312\u0313\7u\2\2\u0313\u0314\7v\2\2"+
-		"\u0314\u00c8\3\2\2\2\u0315\u0316\7g\2\2\u0316\u0317\7z\2\2\u0317\u0318"+
-		"\7r\2\2\u0318\u0319\7q\2\2\u0319\u031a\7t\2\2\u031a\u031b\7v\2\2\u031b"+
-		"\u00ca\3\2\2\2\u031c\u031d\7k\2\2\u031d\u031e\7o\2\2\u031e\u031f\7r\2"+
-		"\2\u031f\u0320\7q\2\2\u0320\u0321\7t\2\2\u0321\u0322\7v\2\2\u0322\u00cc"+
-		"\3\2\2\2\u0323\u0324\7e\2\2\u0324\u0325\7q\2\2\u0325\u0326\7p\2\2\u0326"+
-		"\u0327\7v\2\2\u0327\u0328\7t\2\2\u0328\u0329\7c\2\2\u0329\u032a\7e\2\2"+
-		"\u032a\u032b\7v\2\2\u032b\u00ce\3\2\2\2\u032c\u032d\7o\2\2\u032d\u032e"+
-		"\7q\2\2\u032e\u032f\7f\2\2\u032f\u0330\7w\2\2\u0330\u0331\7n\2\2\u0331"+
-		"\u0332\7g\2\2\u0332\u00d0\3\2\2\2\u0333\u0334\7q\2\2\u0334\u0335\7t\2"+
-		"\2\u0335\u0336\7c\2\2\u0336\u0337\7e\2\2\u0337\u0338\7n\2\2\u0338\u0339"+
-		"\7g\2\2\u0339\u00d2\3\2\2\2\u033a\u033b\7f\2\2\u033b\u033c\7q\2\2\u033c"+
-		"\u033d\7k\2\2\u033d\u033e\7r\2\2\u033e\u033f\7o\2\2\u033f\u0340\7q\2\2"+
-		"\u0340\u0341\7f\2\2\u0341\u0342\7w\2\2\u0342\u0343\7n\2\2\u0343\u0344"+
-		"\7g\2\2\u0344\u00d4\3\2\2\2\u0345\u0346\7k\2\2\u0346\u0347\7o\2\2\u0347"+
-		"\u0348\7r\2\2\u0348\u0349\7n\2\2\u0349\u034a\7g\2\2\u034a\u034b\7o\2\2"+
-		"\u034b\u034c\7g\2\2\u034c\u034d\7p\2\2\u034d\u034e\7v\2\2\u034e\u034f"+
-		"\7u\2\2\u034f\u0350\3\2\2\2\u0350\u0351\6k\4\2\u0351\u00d6\3\2\2\2\u0352"+
-		"\u0353\7n\2\2\u0353\u0354\7g\2\2\u0354\u0355\7v\2\2\u0355\u0356\3\2\2"+
-		"\2\u0356\u0357\6l\5\2\u0357\u00d8\3\2\2\2\u0358\u0359\7r\2\2\u0359\u035a"+
-		"\7t\2\2\u035a\u035b\7k\2\2\u035b\u035c\7x\2\2\u035c\u035d\7c\2\2\u035d"+
-		"\u035e\7v\2\2\u035e\u035f\7g\2\2\u035f\u0360\3\2\2\2\u0360\u0361\6m\6"+
-		"\2\u0361\u00da\3\2\2\2\u0362\u0363\7r\2\2\u0363\u0364\7w\2\2\u0364\u0365"+
-		"\7d\2\2\u0365\u0366\7n\2\2\u0366\u0367\7k\2\2\u0367\u0368\7e\2\2\u0368"+
-		"\u0369\3\2\2\2\u0369\u036a\6n\7\2\u036a\u00dc\3\2\2\2\u036b\u036c\7k\2"+
-		"\2\u036c\u036d\7p\2\2\u036d\u036e\7v\2\2\u036e\u036f\7g\2\2\u036f\u0370"+
-		"\7t\2\2\u0370\u0371\7h\2\2\u0371\u0372\7c\2\2\u0372\u0373\7e\2\2\u0373"+
-		"\u0374\7g\2\2\u0374\u0375\3\2\2\2\u0375\u0376\6o\b\2\u0376\u00de\3\2\2"+
-		"\2\u0377\u0378\7r\2\2\u0378\u0379\7c\2\2\u0379\u037a\7e\2\2\u037a\u037b"+
-		"\7m\2\2\u037b\u037c\7c\2\2\u037c\u037d\7i\2\2\u037d\u037e\7g\2\2\u037e"+
-		"\u037f\3\2\2\2\u037f\u0380\6p\t\2\u0380\u00e0\3\2\2\2\u0381\u0382\7r\2"+
-		"\2\u0382\u0383\7t\2\2\u0383\u0384\7q\2\2\u0384\u0385\7v\2\2\u0385\u0386"+
-		"\7g\2\2\u0386\u0387\7e\2\2\u0387\u0388\7v\2\2\u0388\u0389\7g\2\2\u0389"+
-		"\u038a\7f\2\2\u038a\u038b\3\2\2\2\u038b\u038c\6q\n\2\u038c\u00e2\3\2\2"+
-		"\2\u038d\u038e\7u\2\2\u038e\u038f\7v\2\2\u038f\u0390\7c\2\2\u0390\u0391"+
-		"\7v\2\2\u0391\u0392\7k\2\2\u0392\u0393\7e\2\2\u0393\u0394\3\2\2\2\u0394"+
-		"\u0395\6r\13\2\u0395\u00e4\3\2\2\2\u0396\u0397\7{\2\2\u0397\u0398\7k\2"+
-		"\2\u0398\u0399\7g\2\2\u0399\u039a\7n\2\2\u039a\u039b\7f\2\2\u039b\u039c"+
-		"\3\2\2\2\u039c\u039d\6s\f\2\u039d\u00e6\3\2\2\2\u039e\u03a2\5\u0115\u008b"+
-		"\2\u039f\u03a1\5\u0113\u008a\2\u03a0\u039f\3\2\2\2\u03a1\u03a4\3\2\2\2"+
-		"\u03a2\u03a0\3\2\2\2\u03a2\u03a3\3\2\2\2\u03a3\u00e8\3\2\2\2\u03a4\u03a2"+
-		"\3\2\2\2\u03a5\u03a9\7$\2\2\u03a6\u03a8\5\u00f7|\2\u03a7\u03a6\3\2\2\2"+
-		"\u03a8\u03ab\3\2\2\2\u03a9\u03a7\3\2\2\2\u03a9\u03aa\3\2\2\2\u03aa\u03ac"+
-		"\3\2\2\2\u03ab\u03a9\3\2\2\2\u03ac\u03b6\7$\2\2\u03ad\u03b1\7)\2\2\u03ae"+
-		"\u03b0\5\u00f9}\2\u03af\u03ae\3\2\2\2\u03b0\u03b3\3\2\2\2\u03b1\u03af"+
-		"\3\2\2\2\u03b1\u03b2\3\2\2\2\u03b2\u03b4\3\2\2\2\u03b3\u03b1\3\2\2\2\u03b4"+
-		"\u03b6\7)\2\2\u03b5\u03a5\3\2\2\2\u03b5\u03ad\3\2\2\2\u03b6\u03b7\3\2"+
-		"\2\2\u03b7\u03b8\bu\5\2\u03b8\u00ea\3\2\2\2\u03b9\u03bf\7b\2\2\u03ba\u03bb"+
-		"\7^\2\2\u03bb\u03be\7b\2\2\u03bc\u03be\n\t\2\2\u03bd\u03ba\3\2\2\2\u03bd"+
-		"\u03bc\3\2\2\2\u03be\u03c1\3\2\2\2\u03bf\u03bd\3\2\2\2\u03bf\u03c0\3\2"+
-		"\2\2\u03c0\u03c2\3\2\2\2\u03c1\u03bf\3\2\2\2\u03c2\u03c3\7b\2\2\u03c3"+
-		"\u00ec\3\2\2\2\u03c4\u03c6\t\n\2\2\u03c5\u03c4\3\2\2\2\u03c6\u03c7\3\2"+
-		"\2\2\u03c7\u03c5\3\2\2\2\u03c7\u03c8\3\2\2\2\u03c8\u03c9\3\2\2\2\u03c9"+
-		"\u03ca\bw\2\2\u03ca\u00ee\3\2\2\2\u03cb\u03cc\t\2\2\2\u03cc\u03cd\3\2"+
-		"\2\2\u03cd\u03ce\bx\2\2\u03ce\u00f0\3\2\2\2\u03cf\u03d0\7>\2\2\u03d0\u03d1"+
-		"\7#\2\2\u03d1\u03d2\7/\2\2\u03d2\u03d3\7/\2\2\u03d3\u03d7\3\2\2\2\u03d4"+
-		"\u03d6\13\2\2\2\u03d5\u03d4\3\2\2\2\u03d6\u03d9\3\2\2\2\u03d7\u03d8\3"+
-		"\2\2\2\u03d7\u03d5\3\2\2\2\u03d8\u03da\3\2\2\2\u03d9\u03d7\3\2\2\2\u03da"+
-		"\u03db\7/\2\2\u03db\u03dc\7/\2\2\u03dc\u03dd\7@\2\2\u03dd\u03de\3\2\2"+
-		"\2\u03de\u03df\by\2\2\u03df\u00f2\3\2\2\2\u03e0\u03e1\7>\2\2\u03e1\u03e2"+
-		"\7#\2\2\u03e2\u03e3\7]\2\2\u03e3\u03e4\7E\2\2\u03e4\u03e5\7F\2\2\u03e5"+
-		"\u03e6\7C\2\2\u03e6\u03e7\7V\2\2\u03e7\u03e8\7C\2\2\u03e8\u03e9\7]\2\2"+
-		"\u03e9\u03ed\3\2\2\2\u03ea\u03ec\13\2\2\2\u03eb\u03ea\3\2\2\2\u03ec\u03ef"+
-		"\3\2\2\2\u03ed\u03ee\3\2\2\2\u03ed\u03eb\3\2\2\2\u03ee\u03f0\3\2\2\2\u03ef"+
-		"\u03ed\3\2\2\2\u03f0\u03f1\7_\2\2\u03f1\u03f2\7_\2\2\u03f2\u03f3\7@\2"+
-		"\2\u03f3\u03f4\3\2\2\2\u03f4\u03f5\bz\2\2\u03f5\u00f4\3\2\2\2\u03f6\u03f7"+
-		"\13\2\2\2\u03f7\u03f8\3\2\2\2\u03f8\u03f9\b{\6\2\u03f9\u00f6\3\2\2\2\u03fa"+
-		"\u03ff\n\13\2\2\u03fb\u03fc\7^\2\2\u03fc\u03ff\5\u00fb~\2\u03fd\u03ff"+
-		"\5\u010b\u0086\2\u03fe\u03fa\3\2\2\2\u03fe\u03fb\3\2\2\2\u03fe\u03fd\3"+
-		"\2\2\2\u03ff\u00f8\3\2\2\2\u0400\u0405\n\f\2\2\u0401\u0402\7^\2\2\u0402"+
-		"\u0405\5\u00fb~\2\u0403\u0405\5\u010b\u0086\2\u0404\u0400\3\2\2\2\u0404"+
-		"\u0401\3\2\2\2\u0404\u0403\3\2\2\2\u0405\u00fa\3\2\2\2\u0406\u040c\5\u00fd"+
-		"\177\2\u0407\u040c\7\62\2\2\u0408\u040c\5\u00ff\u0080\2\u0409\u040c\5"+
-		"\u0101\u0081\2\u040a\u040c\5\u0103\u0082\2\u040b\u0406\3\2\2\2\u040b\u0407"+
-		"\3\2\2\2\u040b\u0408\3\2\2\2\u040b\u0409\3\2\2\2\u040b\u040a\3\2\2\2\u040c"+
-		"\u00fc\3\2\2\2\u040d\u0410\5\u0105\u0083\2\u040e\u0410\5\u0107\u0084\2"+
-		"\u040f\u040d\3\2\2\2\u040f\u040e\3\2\2\2\u0410\u00fe\3\2\2\2\u0411\u0412"+
-		"\7z\2\2\u0412\u0413\5\u010d\u0087\2\u0413\u0414\5\u010d\u0087\2\u0414"+
-		"\u0100\3\2\2\2\u0415\u0416\7w\2\2\u0416\u0417\5\u010d\u0087\2\u0417\u0418"+
-		"\5\u010d\u0087\2\u0418\u0419\5\u010d\u0087\2\u0419\u041a\5\u010d\u0087"+
-		"\2\u041a\u0102\3\2\2\2\u041b\u041c\7w\2\2\u041c\u041e\7}\2\2\u041d\u041f"+
-		"\5\u010d\u0087\2\u041e\u041d\3\2\2\2\u041f\u0420\3\2\2\2\u0420\u041e\3"+
-		"\2\2\2\u0420\u0421\3\2\2\2\u0421\u0422\3\2\2\2\u0422\u0423\7\177\2\2\u0423"+
-		"\u0104\3\2\2\2\u0424\u0425\t\r\2\2\u0425\u0106\3\2\2\2\u0426\u0427\n\16"+
-		"\2\2\u0427\u0108\3\2\2\2\u0428\u042b\5\u0105\u0083\2\u0429\u042b\t\17"+
-		"\2\2\u042a\u0428\3\2\2\2\u042a\u0429\3\2\2\2\u042b\u010a\3\2\2\2\u042c"+
-		"\u042d\7^\2\2\u042d\u042e\t\2\2\2\u042e\u010c\3\2\2\2\u042f\u0430\t\20"+
-		"\2\2\u0430\u010e\3\2\2\2\u0431\u043a\7\62\2\2\u0432\u0436\t\21\2\2\u0433"+
-		"\u0435\t\3\2\2\u0434\u0433\3\2\2\2\u0435\u0438\3\2\2\2\u0436\u0434\3\2"+
-		"\2\2\u0436\u0437\3\2\2\2\u0437\u043a\3\2\2\2\u0438\u0436\3\2\2\2\u0439"+
-		"\u0431\3\2\2\2\u0439\u0432\3\2\2\2\u043a\u0110\3\2\2\2\u043b\u043d\t\22"+
-		"\2\2\u043c\u043e\t\23\2\2\u043d\u043c\3\2\2\2\u043d\u043e\3\2\2\2\u043e"+
-		"\u0440\3\2\2\2\u043f\u0441\t\3\2\2\u0440\u043f\3\2\2\2\u0441\u0442\3\2"+
-		"\2\2\u0442\u0440\3\2\2\2\u0442\u0443\3\2\2\2\u0443\u0112\3\2\2\2\u0444"+
-		"\u044a\5\u0115\u008b\2\u0445\u044a\5\u0119\u008d\2\u0446\u044a\5\u011b"+
-		"\u008e\2\u0447\u044a\5\u011d\u008f\2\u0448\u044a\4\u200e\u200f\2\u0449"+
-		"\u0444\3\2\2\2\u0449\u0445\3\2\2\2\u0449\u0446\3\2\2\2\u0449\u0447\3\2"+
-		"\2\2\u0449\u0448\3\2\2\2\u044a\u0114\3\2\2\2\u044b\u0450\5\u0117\u008c"+
-		"\2\u044c\u0450\t\24\2\2\u044d\u044e\7^\2\2\u044e\u0450\5\u0101\u0081\2"+
-		"\u044f\u044b\3\2\2\2\u044f\u044c\3\2\2\2\u044f\u044d\3\2\2\2\u0450\u0116"+
-		"\3\2\2\2\u0451\u0453\t\25\2\2\u0452\u0451\3\2\2\2\u0453\u0118\3\2\2\2"+
-		"\u0454\u0456\t\26\2\2\u0455\u0454\3\2\2\2\u0456\u011a\3\2\2\2\u0457\u0459"+
-		"\t\27\2\2\u0458\u0457\3\2\2\2\u0459\u011c\3\2\2\2\u045a\u045c\t\30\2\2"+
-		"\u045b\u045a\3\2\2\2\u045c\u011e\3\2\2\2\u045d\u0468\n\31\2\2\u045e\u0468"+
-		"\5\u0123\u0092\2\u045f\u0463\7]\2\2\u0460\u0462\5\u0121\u0091\2\u0461"+
-		"\u0460\3\2\2\2\u0462\u0465\3\2\2\2\u0463\u0461\3\2\2\2\u0463\u0464\3\2"+
-		"\2\2\u0464\u0466\3\2\2\2\u0465\u0463\3\2\2\2\u0466\u0468\7_\2\2\u0467"+
-		"\u045d\3\2\2\2\u0467\u045e\3\2\2\2\u0467\u045f\3\2\2\2\u0468\u0120\3\2"+
-		"\2\2\u0469\u046c\n\32\2\2\u046a\u046c\5\u0123\u0092\2\u046b\u0469\3\2"+
-		"\2\2\u046b\u046a\3\2\2\2\u046c\u0122\3\2\2\2\u046d\u046e\7^\2\2\u046e"+
-		"\u046f\n\2\2\2\u046f\u0124\3\2\2\2.\2\u012b\u0139\u0142\u0149\u01e2\u01e9"+
-		"\u01ed\u01f3\u01f6\u01fa\u01fc\u0203\u0209\u0212\u0219\u03a2\u03a9\u03b1"+
-		"\u03b5\u03bd\u03bf\u03c7\u03d7\u03ed\u03fe\u0404\u040b\u040f\u0420\u042a"+
-		"\u0436\u0439\u043d\u0442\u0449\u044f\u0452\u0455\u0458\u045b\u0463\u0467"+
-		"\u046b\7\2\3\2\3\t\2\3\n\3\3u\4\2\4\2";
-	public static final ATN _ATN =
-		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
-	static {
-		_decisionToDFA = new DFA[_ATN.getNumberOfDecisions()];
-		for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) {
-			_decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
-		}
-	}
-}
\ No newline at end of file
+    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 105:
+                return Implements_sempred((RuleContext) _localctx, predIndex);
+            case 106:
+                return Let_sempred((RuleContext) _localctx, predIndex);
+            case 107:
+                return Private_sempred((RuleContext) _localctx, predIndex);
+            case 108:
+                return Public_sempred((RuleContext) _localctx, predIndex);
+            case 109:
+                return Interface_sempred((RuleContext) _localctx, predIndex);
+            case 110:
+                return Package_sempred((RuleContext) _localctx, predIndex);
+            case 111:
+                return Protected_sempred((RuleContext) _localctx, predIndex);
+            case 112:
+                return Static_sempred((RuleContext) _localctx, predIndex);
+            case 113:
+                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;
+    }
+
+    public static final String _serializedATN =
+            "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2|\u0470\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\4\u008f\t\u008f\4\u0090\t\u0090\4\u0091\t\u0091\4\u0092\t\u0092"
+                    + "\3\2\3\2\3\2\3\2\7\2\u012a\n\2\f\2\16\2\u012d\13\2\3\2\3\2\3\2\3\2\3\2"
+                    + "\3\3\3\3\3\3\3\3\7\3\u0138\n\3\f\3\16\3\u013b\13\3\3\3\3\3\3\4\3\4\6\4"
+                    + "\u0141\n\4\r\4\16\4\u0142\3\4\3\4\3\4\7\4\u0148\n\4\f\4\16\4\u014b\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\u01e3\n8\39\39\39\79\u01e8\n9\f9\169\u01eb\139\39\59\u01ee\n9\39"
+                    + "\39\69\u01f2\n9\r9\169\u01f3\39\59\u01f7\n9\39\39\59\u01fb\n9\59\u01fd"
+                    + "\n9\3:\3:\3:\6:\u0202\n:\r:\16:\u0203\3;\3;\6;\u0208\n;\r;\16;\u0209\3"
+                    + ";\3;\3<\3<\3<\6<\u0211\n<\r<\16<\u0212\3=\3=\3=\6=\u0218\n=\r=\16=\u0219"
+                    + "\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`\3a\3"
+                    + "a\3a\3a\3a\3b\3b\3b\3b\3b\3b\3b\3b\3c\3c\3c\3c\3c\3c\3d\3d\3d\3d\3d\3"
+                    + "d\3e\3e\3e\3e\3e\3e\3e\3f\3f\3f\3f\3f\3f\3f\3g\3g\3g\3g\3g\3g\3g\3g\3"
+                    + "g\3h\3h\3h\3h\3h\3h\3h\3i\3i\3i\3i\3i\3i\3i\3j\3j\3j\3j\3j\3j\3j\3j\3"
+                    + "j\3j\3j\3k\3k\3k\3k\3k\3k\3k\3k\3k\3k\3k\3k\3k\3l\3l\3l\3l\3l\3l\3m\3"
+                    + "m\3m\3m\3m\3m\3m\3m\3m\3m\3n\3n\3n\3n\3n\3n\3n\3n\3n\3o\3o\3o\3o\3o\3"
+                    + "o\3o\3o\3o\3o\3o\3o\3p\3p\3p\3p\3p\3p\3p\3p\3p\3p\3q\3q\3q\3q\3q\3q\3"
+                    + "q\3q\3q\3q\3q\3q\3r\3r\3r\3r\3r\3r\3r\3r\3r\3s\3s\3s\3s\3s\3s\3s\3s\3"
+                    + "t\3t\7t\u03a1\nt\ft\16t\u03a4\13t\3u\3u\7u\u03a8\nu\fu\16u\u03ab\13u\3"
+                    + "u\3u\3u\7u\u03b0\nu\fu\16u\u03b3\13u\3u\5u\u03b6\nu\3u\3u\3v\3v\3v\3v"
+                    + "\7v\u03be\nv\fv\16v\u03c1\13v\3v\3v\3w\6w\u03c6\nw\rw\16w\u03c7\3w\3w"
+                    + "\3x\3x\3x\3x\3y\3y\3y\3y\3y\3y\7y\u03d6\ny\fy\16y\u03d9\13y\3y\3y\3y\3"
+                    + "y\3y\3y\3z\3z\3z\3z\3z\3z\3z\3z\3z\3z\3z\7z\u03ec\nz\fz\16z\u03ef\13z"
+                    + "\3z\3z\3z\3z\3z\3z\3{\3{\3{\3{\3|\3|\3|\3|\5|\u03ff\n|\3}\3}\3}\3}\5}"
+                    + "\u0405\n}\3~\3~\3~\3~\3~\5~\u040c\n~\3\177\3\177\5\177\u0410\n\177\3\u0080"
+                    + "\3\u0080\3\u0080\3\u0080\3\u0081\3\u0081\3\u0081\3\u0081\3\u0081\3\u0081"
+                    + "\3\u0082\3\u0082\3\u0082\6\u0082\u041f\n\u0082\r\u0082\16\u0082\u0420"
+                    + "\3\u0082\3\u0082\3\u0083\3\u0083\3\u0084\3\u0084\3\u0085\3\u0085\5\u0085"
+                    + "\u042b\n\u0085\3\u0086\3\u0086\3\u0086\3\u0087\3\u0087\3\u0088\3\u0088"
+                    + "\3\u0088\7\u0088\u0435\n\u0088\f\u0088\16\u0088\u0438\13\u0088\5\u0088"
+                    + "\u043a\n\u0088\3\u0089\3\u0089\5\u0089\u043e\n\u0089\3\u0089\6\u0089\u0441"
+                    + "\n\u0089\r\u0089\16\u0089\u0442\3\u008a\3\u008a\3\u008a\3\u008a\3\u008a"
+                    + "\5\u008a\u044a\n\u008a\3\u008b\3\u008b\3\u008b\3\u008b\5\u008b\u0450\n"
+                    + "\u008b\3\u008c\5\u008c\u0453\n\u008c\3\u008d\5\u008d\u0456\n\u008d\3\u008e"
+                    + "\5\u008e\u0459\n\u008e\3\u008f\5\u008f\u045c\n\u008f\3\u0090\3\u0090\3"
+                    + "\u0090\3\u0090\7\u0090\u0462\n\u0090\f\u0090\16\u0090\u0465\13\u0090\3"
+                    + "\u0090\5\u0090\u0468\n\u0090\3\u0091\3\u0091\5\u0091\u046c\n\u0091\3\u0092"
+                    + "\3\u0092\3\u0092\5\u012b\u03d7\u03ed\2\u0093\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\67m8o9q:s;u<w=y>{?}@\177A\u0081"
+                    + "B\u0083C\u0085D\u0087E\u0089F\u008bG\u008dH\u008fI\u0091J\u0093K\u0095"
+                    + "L\u0097M\u0099N\u009bO\u009dP\u009fQ\u00a1R\u00a3S\u00a5T\u00a7U\u00a9"
+                    + "V\u00abW\u00adX\u00afY\u00b1Z\u00b3[\u00b5\\\u00b7]\u00b9^\u00bb_\u00bd"
+                    + "`\u00bfa\u00c1b\u00c3c\u00c5d\u00c7e\u00c9f\u00cbg\u00cdh\u00cfi\u00d1"
+                    + "j\u00d3k\u00d5l\u00d7m\u00d9n\u00dbo\u00ddp\u00dfq\u00e1r\u00e3s\u00e5"
+                    + "t\u00e7u\u00e9v\u00ebw\u00edx\u00efy\u00f1z\u00f3{\u00f5|\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\u011d"
+                    + "\2\u011f\2\u0121\2\u0123\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\u048a\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\2\u00ef"
+                    + "\3\2\2\2\2\u00f1\3\2\2\2\2\u00f3\3\2\2\2\2\u00f5\3\2\2\2\3\u0125\3\2\2"
+                    + "\2\5\u0133\3\2\2\2\7\u013e\3\2\2\2\t\u014c\3\2\2\2\13\u014e\3\2\2\2\r"
+                    + "\u0150\3\2\2\2\17\u0152\3\2\2\2\21\u0154\3\2\2\2\23\u0157\3\2\2\2\25\u015a"
+                    + "\3\2\2\2\27\u015c\3\2\2\2\31\u015e\3\2\2\2\33\u0160\3\2\2\2\35\u0162\3"
+                    + "\2\2\2\37\u0164\3\2\2\2!\u0168\3\2\2\2#\u016a\3\2\2\2%\u016d\3\2\2\2\'"
+                    + "\u0170\3\2\2\2)\u0172\3\2\2\2+\u0174\3\2\2\2-\u0176\3\2\2\2/\u0178\3\2"
+                    + "\2\2\61\u017a\3\2\2\2\63\u017c\3\2\2\2\65\u017e\3\2\2\2\67\u0181\3\2\2"
+                    + "\29\u0184\3\2\2\2;\u0188\3\2\2\2=\u018a\3\2\2\2?\u018c\3\2\2\2A\u018f"
+                    + "\3\2\2\2C\u0192\3\2\2\2E\u0195\3\2\2\2G\u0198\3\2\2\2I\u019c\3\2\2\2K"
+                    + "\u01a0\3\2\2\2M\u01a2\3\2\2\2O\u01a4\3\2\2\2Q\u01a6\3\2\2\2S\u01a9\3\2"
+                    + "\2\2U\u01ac\3\2\2\2W\u01af\3\2\2\2Y\u01b2\3\2\2\2[\u01b5\3\2\2\2]\u01b8"
+                    + "\3\2\2\2_\u01bb\3\2\2\2a\u01bf\3\2\2\2c\u01c3\3\2\2\2e\u01c8\3\2\2\2g"
+                    + "\u01cb\3\2\2\2i\u01ce\3\2\2\2k\u01d1\3\2\2\2m\u01d4\3\2\2\2o\u01e2\3\2"
+                    + "\2\2q\u01fc\3\2\2\2s\u01fe\3\2\2\2u\u0205\3\2\2\2w\u020d\3\2\2\2y\u0214"
+                    + "\3\2\2\2{\u021b\3\2\2\2}\u0221\3\2\2\2\177\u0224\3\2\2\2\u0081\u022f\3"
+                    + "\2\2\2\u0083\u0236\3\2\2\2\u0085\u023b\3\2\2\2\u0087\u0240\3\2\2\2\u0089"
+                    + "\u0244\3\2\2\2\u008b\u0248\3\2\2\2\u008d\u024e\3\2\2\2\u008f\u0256\3\2"
+                    + "\2\2\u0091\u025d\3\2\2\2\u0093\u0262\3\2\2\2\u0095\u026b\3\2\2\2\u0097"
+                    + "\u026f\3\2\2\2\u0099\u0276\3\2\2\2\u009b\u027c\3\2\2\2\u009d\u0285\3\2"
+                    + "\2\2\u009f\u028e\3\2\2\2\u00a1\u0293\3\2\2\2\u00a3\u0298\3\2\2\2\u00a5"
+                    + "\u02a0\3\2\2\2\u00a7\u02a3\3\2\2\2\u00a9\u02a9\3\2\2\2\u00ab\u02b0\3\2"
+                    + "\2\2\u00ad\u02b3\3\2\2\2\u00af\u02b7\3\2\2\2\u00b1\u02bd\3\2\2\2\u00b3"
+                    + "\u02bf\3\2\2\2\u00b5\u02cd\3\2\2\2\u00b7\u02da\3\2\2\2\u00b9\u02e4\3\2"
+                    + "\2\2\u00bb\u02eb\3\2\2\2\u00bd\u02f1\3\2\2\2\u00bf\u02f6\3\2\2\2\u00c1"
+                    + "\u02fc\3\2\2\2\u00c3\u0301\3\2\2\2\u00c5\u0309\3\2\2\2\u00c7\u030f\3\2"
+                    + "\2\2\u00c9\u0315\3\2\2\2\u00cb\u031c\3\2\2\2\u00cd\u0323\3\2\2\2\u00cf"
+                    + "\u032c\3\2\2\2\u00d1\u0333\3\2\2\2\u00d3\u033a\3\2\2\2\u00d5\u0345\3\2"
+                    + "\2\2\u00d7\u0352\3\2\2\2\u00d9\u0358\3\2\2\2\u00db\u0362\3\2\2\2\u00dd"
+                    + "\u036b\3\2\2\2\u00df\u0377\3\2\2\2\u00e1\u0381\3\2\2\2\u00e3\u038d\3\2"
+                    + "\2\2\u00e5\u0396\3\2\2\2\u00e7\u039e\3\2\2\2\u00e9\u03b5\3\2\2\2\u00eb"
+                    + "\u03b9\3\2\2\2\u00ed\u03c5\3\2\2\2\u00ef\u03cb\3\2\2\2\u00f1\u03cf\3\2"
+                    + "\2\2\u00f3\u03e0\3\2\2\2\u00f5\u03f6\3\2\2\2\u00f7\u03fe\3\2\2\2\u00f9"
+                    + "\u0404\3\2\2\2\u00fb\u040b\3\2\2\2\u00fd\u040f\3\2\2\2\u00ff\u0411\3\2"
+                    + "\2\2\u0101\u0415\3\2\2\2\u0103\u041b\3\2\2\2\u0105\u0424\3\2\2\2\u0107"
+                    + "\u0426\3\2\2\2\u0109\u042a\3\2\2\2\u010b\u042c\3\2\2\2\u010d\u042f\3\2"
+                    + "\2\2\u010f\u0439\3\2\2\2\u0111\u043b\3\2\2\2\u0113\u0449\3\2\2\2\u0115"
+                    + "\u044f\3\2\2\2\u0117\u0452\3\2\2\2\u0119\u0455\3\2\2\2\u011b\u0458\3\2"
+                    + "\2\2\u011d\u045b\3\2\2\2\u011f\u0467\3\2\2\2\u0121\u046b\3\2\2\2\u0123"
+                    + "\u046d\3\2\2\2\u0125\u0126\7\61\2\2\u0126\u0127\7,\2\2\u0127\u012b\3\2"
+                    + "\2\2\u0128\u012a\13\2\2\2\u0129\u0128\3\2\2\2\u012a\u012d\3\2\2\2\u012b"
+                    + "\u012c\3\2\2\2\u012b\u0129\3\2\2\2\u012c\u012e\3\2\2\2\u012d\u012b\3\2"
+                    + "\2\2\u012e\u012f\7,\2\2\u012f\u0130\7\61\2\2\u0130\u0131\3\2\2\2\u0131"
+                    + "\u0132\b\2\2\2\u0132\4\3\2\2\2\u0133\u0134\7\61\2\2\u0134\u0135\7\61\2"
+                    + "\2\u0135\u0139\3\2\2\2\u0136\u0138\n\2\2\2\u0137\u0136\3\2\2\2\u0138\u013b"
+                    + "\3\2\2\2\u0139\u0137\3\2\2\2\u0139\u013a\3\2\2\2\u013a\u013c\3\2\2\2\u013b"
+                    + "\u0139\3\2\2\2\u013c\u013d\b\3\2\2\u013d\6\3\2\2\2\u013e\u0140\7\61\2"
+                    + "\2\u013f\u0141\5\u011f\u0090\2\u0140\u013f\3\2\2\2\u0141\u0142\3\2\2\2"
+                    + "\u0142\u0140\3\2\2\2\u0142\u0143\3\2\2\2\u0143\u0144\3\2\2\2\u0144\u0145"
+                    + "\6\4\2\2\u0145\u0149\7\61\2\2\u0146\u0148\5\u0113\u008a\2\u0147\u0146"
+                    + "\3\2\2\2\u0148\u014b\3\2\2\2\u0149\u0147\3\2\2\2\u0149\u014a\3\2\2\2\u014a"
+                    + "\b\3\2\2\2\u014b\u0149\3\2\2\2\u014c\u014d\7]\2\2\u014d\n\3\2\2\2\u014e"
+                    + "\u014f\7_\2\2\u014f\f\3\2\2\2\u0150\u0151\7*\2\2\u0151\16\3\2\2\2\u0152"
+                    + "\u0153\7+\2\2\u0153\20\3\2\2\2\u0154\u0155\7}\2\2\u0155\u0156\b\t\3\2"
+                    + "\u0156\22\3\2\2\2\u0157\u0158\7\177\2\2\u0158\u0159\b\n\4\2\u0159\24\3"
+                    + "\2\2\2\u015a\u015b\7=\2\2\u015b\26\3\2\2\2\u015c\u015d\7.\2\2\u015d\30"
+                    + "\3\2\2\2\u015e\u015f\7?\2\2\u015f\32\3\2\2\2\u0160\u0161\7A\2\2\u0161"
+                    + "\34\3\2\2\2\u0162\u0163\7<\2\2\u0163\36\3\2\2\2\u0164\u0165\7\60\2\2\u0165"
+                    + "\u0166\7\60\2\2\u0166\u0167\7\60\2\2\u0167 \3\2\2\2\u0168\u0169\7\60\2"
+                    + "\2\u0169\"\3\2\2\2\u016a\u016b\7-\2\2\u016b\u016c\7-\2\2\u016c$\3\2\2"
+                    + "\2\u016d\u016e\7/\2\2\u016e\u016f\7/\2\2\u016f&\3\2\2\2\u0170\u0171\7"
+                    + "-\2\2\u0171(\3\2\2\2\u0172\u0173\7/\2\2\u0173*\3\2\2\2\u0174\u0175\7\u0080"
+                    + "\2\2\u0175,\3\2\2\2\u0176\u0177\7#\2\2\u0177.\3\2\2\2\u0178\u0179\7,\2"
+                    + "\2\u0179\60\3\2\2\2\u017a\u017b\7\61\2\2\u017b\62\3\2\2\2\u017c\u017d"
+                    + "\7\'\2\2\u017d\64\3\2\2\2\u017e\u017f\7@\2\2\u017f\u0180\7@\2\2\u0180"
+                    + "\66\3\2\2\2\u0181\u0182\7>\2\2\u0182\u0183\7>\2\2\u01838\3\2\2\2\u0184"
+                    + "\u0185\7@\2\2\u0185\u0186\7@\2\2\u0186\u0187\7@\2\2\u0187:\3\2\2\2\u0188"
+                    + "\u0189\7>\2\2\u0189<\3\2\2\2\u018a\u018b\7@\2\2\u018b>\3\2\2\2\u018c\u018d"
+                    + "\7>\2\2\u018d\u018e\7?\2\2\u018e@\3\2\2\2\u018f\u0190\7@\2\2\u0190\u0191"
+                    + "\7?\2\2\u0191B\3\2\2\2\u0192\u0193\7?\2\2\u0193\u0194\7?\2\2\u0194D\3"
+                    + "\2\2\2\u0195\u0196\7#\2\2\u0196\u0197\7?\2\2\u0197F\3\2\2\2\u0198\u0199"
+                    + "\7?\2\2\u0199\u019a\7?\2\2\u019a\u019b\7?\2\2\u019bH\3\2\2\2\u019c\u019d"
+                    + "\7#\2\2\u019d\u019e\7?\2\2\u019e\u019f\7?\2\2\u019fJ\3\2\2\2\u01a0\u01a1"
+                    + "\7(\2\2\u01a1L\3\2\2\2\u01a2\u01a3\7`\2\2\u01a3N\3\2\2\2\u01a4\u01a5\7"
+                    + "~\2\2\u01a5P\3\2\2\2\u01a6\u01a7\7(\2\2\u01a7\u01a8\7(\2\2\u01a8R\3\2"
+                    + "\2\2\u01a9\u01aa\7~\2\2\u01aa\u01ab\7~\2\2\u01abT\3\2\2\2\u01ac\u01ad"
+                    + "\7,\2\2\u01ad\u01ae\7?\2\2\u01aeV\3\2\2\2\u01af\u01b0\7\61\2\2\u01b0\u01b1"
+                    + "\7?\2\2\u01b1X\3\2\2\2\u01b2\u01b3\7\'\2\2\u01b3\u01b4\7?\2\2\u01b4Z\3"
+                    + "\2\2\2\u01b5\u01b6\7-\2\2\u01b6\u01b7\7?\2\2\u01b7\\\3\2\2\2\u01b8\u01b9"
+                    + "\7/\2\2\u01b9\u01ba\7?\2\2\u01ba^\3\2\2\2\u01bb\u01bc\7>\2\2\u01bc\u01bd"
+                    + "\7>\2\2\u01bd\u01be\7?\2\2\u01be`\3\2\2\2\u01bf\u01c0\7@\2\2\u01c0\u01c1"
+                    + "\7@\2\2\u01c1\u01c2\7?\2\2\u01c2b\3\2\2\2\u01c3\u01c4\7@\2\2\u01c4\u01c5"
+                    + "\7@\2\2\u01c5\u01c6\7@\2\2\u01c6\u01c7\7?\2\2\u01c7d\3\2\2\2\u01c8\u01c9"
+                    + "\7(\2\2\u01c9\u01ca\7?\2\2\u01caf\3\2\2\2\u01cb\u01cc\7`\2\2\u01cc\u01cd"
+                    + "\7?\2\2\u01cdh\3\2\2\2\u01ce\u01cf\7~\2\2\u01cf\u01d0\7?\2\2\u01d0j\3"
+                    + "\2\2\2\u01d1\u01d2\7?\2\2\u01d2\u01d3\7@\2\2\u01d3l\3\2\2\2\u01d4\u01d5"
+                    + "\7p\2\2\u01d5\u01d6\7w\2\2\u01d6\u01d7\7n\2\2\u01d7\u01d8\7n\2\2\u01d8"
+                    + "n\3\2\2\2\u01d9\u01da\7v\2\2\u01da\u01db\7t\2\2\u01db\u01dc\7w\2\2\u01dc"
+                    + "\u01e3\7g\2\2\u01dd\u01de\7h\2\2\u01de\u01df\7c\2\2\u01df\u01e0\7n\2\2"
+                    + "\u01e0\u01e1\7u\2\2\u01e1\u01e3\7g\2\2\u01e2\u01d9\3\2\2\2\u01e2\u01dd"
+                    + "\3\2\2\2\u01e3p\3\2\2\2\u01e4\u01e5\5\u010f\u0088\2\u01e5\u01e9\7\60\2"
+                    + "\2\u01e6\u01e8\t\3\2\2\u01e7\u01e6\3\2\2\2\u01e8\u01eb\3\2\2\2\u01e9\u01e7"
+                    + "\3\2\2\2\u01e9\u01ea\3\2\2\2\u01ea\u01ed\3\2\2\2\u01eb\u01e9\3\2\2\2\u01ec"
+                    + "\u01ee\5\u0111\u0089\2\u01ed\u01ec\3\2\2\2\u01ed\u01ee\3\2\2\2\u01ee\u01fd"
+                    + "\3\2\2\2\u01ef\u01f1\7\60\2\2\u01f0\u01f2\t\3\2\2\u01f1\u01f0\3\2\2\2"
+                    + "\u01f2\u01f3\3\2\2\2\u01f3\u01f1\3\2\2\2\u01f3\u01f4\3\2\2\2\u01f4\u01f6"
+                    + "\3\2\2\2\u01f5\u01f7\5\u0111\u0089\2\u01f6\u01f5\3\2\2\2\u01f6\u01f7\3"
+                    + "\2\2\2\u01f7\u01fd\3\2\2\2\u01f8\u01fa\5\u010f\u0088\2\u01f9\u01fb\5\u0111"
+                    + "\u0089\2\u01fa\u01f9\3\2\2\2\u01fa\u01fb\3\2\2\2\u01fb\u01fd\3\2\2\2\u01fc"
+                    + "\u01e4\3\2\2\2\u01fc\u01ef\3\2\2\2\u01fc\u01f8\3\2\2\2\u01fdr\3\2\2\2"
+                    + "\u01fe\u01ff\7\62\2\2\u01ff\u0201\t\4\2\2\u0200\u0202\5\u010d\u0087\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\u0204t\3\2\2\2\u0205\u0207\7\62\2\2\u0206\u0208\t\5\2\2\u0207"
+                    + "\u0206\3\2\2\2\u0208\u0209\3\2\2\2\u0209\u0207\3\2\2\2\u0209\u020a\3\2"
+                    + "\2\2\u020a\u020b\3\2\2\2\u020b\u020c\6;\3\2\u020cv\3\2\2\2\u020d\u020e"
+                    + "\7\62\2\2\u020e\u0210\t\6\2\2\u020f\u0211\t\5\2\2\u0210\u020f\3\2\2\2"
+                    + "\u0211\u0212\3\2\2\2\u0212\u0210\3\2\2\2\u0212\u0213\3\2\2\2\u0213x\3"
+                    + "\2\2\2\u0214\u0215\7\62\2\2\u0215\u0217\t\7\2\2\u0216\u0218\t\b\2\2\u0217"
+                    + "\u0216\3\2\2\2\u0218\u0219\3\2\2\2\u0219\u0217\3\2\2\2\u0219\u021a\3\2"
+                    + "\2\2\u021az\3\2\2\2\u021b\u021c\7d\2\2\u021c\u021d\7t\2\2\u021d\u021e"
+                    + "\7g\2\2\u021e\u021f\7c\2\2\u021f\u0220\7m\2\2\u0220|\3\2\2\2\u0221\u0222"
+                    + "\7f\2\2\u0222\u0223\7q\2\2\u0223~\3\2\2\2\u0224\u0225\7k\2\2\u0225\u0226"
+                    + "\7p\2\2\u0226\u0227\7u\2\2\u0227\u0228\7v\2\2\u0228\u0229\7c\2\2\u0229"
+                    + "\u022a\7p\2\2\u022a\u022b\7e\2\2\u022b\u022c\7g\2\2\u022c\u022d\7q\2\2"
+                    + "\u022d\u022e\7h\2\2\u022e\u0080\3\2\2\2\u022f\u0230\7v\2\2\u0230\u0231"
+                    + "\7{\2\2\u0231\u0232\7r\2\2\u0232\u0233\7g\2\2\u0233\u0234\7q\2\2\u0234"
+                    + "\u0235\7h\2\2\u0235\u0082\3\2\2\2\u0236\u0237\7e\2\2\u0237\u0238\7c\2"
+                    + "\2\u0238\u0239\7u\2\2\u0239\u023a\7g\2\2\u023a\u0084\3\2\2\2\u023b\u023c"
+                    + "\7g\2\2\u023c\u023d\7n\2\2\u023d\u023e\7u\2\2\u023e\u023f\7g\2\2\u023f"
+                    + "\u0086\3\2\2\2\u0240\u0241\7p\2\2\u0241\u0242\7g\2\2\u0242\u0243\7y\2"
+                    + "\2\u0243\u0088\3\2\2\2\u0244\u0245\7x\2\2\u0245\u0246\7c\2\2\u0246\u0247"
+                    + "\7t\2\2\u0247\u008a\3\2\2\2\u0248\u0249\7e\2\2\u0249\u024a\7c\2\2\u024a"
+                    + "\u024b\7v\2\2\u024b\u024c\7e\2\2\u024c\u024d\7j\2\2\u024d\u008c\3\2\2"
+                    + "\2\u024e\u024f\7h\2\2\u024f\u0250\7k\2\2\u0250\u0251\7p\2\2\u0251\u0252"
+                    + "\7c\2\2\u0252\u0253\7n\2\2\u0253\u0254\7n\2\2\u0254\u0255\7{\2\2\u0255"
+                    + "\u008e\3\2\2\2\u0256\u0257\7t\2\2\u0257\u0258\7g\2\2\u0258\u0259\7v\2"
+                    + "\2\u0259\u025a\7w\2\2\u025a\u025b\7t\2\2\u025b\u025c\7p\2\2\u025c\u0090"
+                    + "\3\2\2\2\u025d\u025e\7x\2\2\u025e\u025f\7q\2\2\u025f\u0260\7k\2\2\u0260"
+                    + "\u0261\7f\2\2\u0261\u0092\3\2\2\2\u0262\u0263\7e\2\2\u0263\u0264\7q\2"
+                    + "\2\u0264\u0265\7p\2\2\u0265\u0266\7v\2\2\u0266\u0267\7k\2\2\u0267\u0268"
+                    + "\7p\2\2\u0268\u0269\7w\2\2\u0269\u026a\7g\2\2\u026a\u0094\3\2\2\2\u026b"
+                    + "\u026c\7h\2\2\u026c\u026d\7q\2\2\u026d\u026e\7t\2\2\u026e\u0096\3\2\2"
+                    + "\2\u026f\u0270\7u\2\2\u0270\u0271\7y\2\2\u0271\u0272\7k\2\2\u0272\u0273"
+                    + "\7v\2\2\u0273\u0274\7e\2\2\u0274\u0275\7j\2\2\u0275\u0098\3\2\2\2\u0276"
+                    + "\u0277\7y\2\2\u0277\u0278\7j\2\2\u0278\u0279\7k\2\2\u0279\u027a\7n\2\2"
+                    + "\u027a\u027b\7g\2\2\u027b\u009a\3\2\2\2\u027c\u027d\7f\2\2\u027d\u027e"
+                    + "\7g\2\2\u027e\u027f\7d\2\2\u027f\u0280\7w\2\2\u0280\u0281\7i\2\2\u0281"
+                    + "\u0282\7i\2\2\u0282\u0283\7g\2\2\u0283\u0284\7t\2\2\u0284\u009c\3\2\2"
+                    + "\2\u0285\u0286\7h\2\2\u0286\u0287\7w\2\2\u0287\u0288\7p\2\2\u0288\u0289"
+                    + "\7e\2\2\u0289\u028a\7v\2\2\u028a\u028b\7k\2\2\u028b\u028c\7q\2\2\u028c"
+                    + "\u028d\7p\2\2\u028d\u009e\3\2\2\2\u028e\u028f\7v\2\2\u028f\u0290\7j\2"
+                    + "\2\u0290\u0291\7k\2\2\u0291\u0292\7u\2\2\u0292\u00a0\3\2\2\2\u0293\u0294"
+                    + "\7y\2\2\u0294\u0295\7k\2\2\u0295\u0296\7v\2\2\u0296\u0297\7j\2\2\u0297"
+                    + "\u00a2\3\2\2\2\u0298\u0299\7f\2\2\u0299\u029a\7g\2\2\u029a\u029b\7h\2"
+                    + "\2\u029b\u029c\7c\2\2\u029c\u029d\7w\2\2\u029d\u029e\7n\2\2\u029e\u029f"
+                    + "\7v\2\2\u029f\u00a4\3\2\2\2\u02a0\u02a1\7k\2\2\u02a1\u02a2\7h\2\2\u02a2"
+                    + "\u00a6\3\2\2\2\u02a3\u02a4\7v\2\2\u02a4\u02a5\7j\2\2\u02a5\u02a6\7t\2"
+                    + "\2\u02a6\u02a7\7q\2\2\u02a7\u02a8\7y\2\2\u02a8\u00a8\3\2\2\2\u02a9\u02aa"
+                    + "\7f\2\2\u02aa\u02ab\7g\2\2\u02ab\u02ac\7n\2\2\u02ac\u02ad\7g\2\2\u02ad"
+                    + "\u02ae\7v\2\2\u02ae\u02af\7g\2\2\u02af\u00aa\3\2\2\2\u02b0\u02b1\7k\2"
+                    + "\2\u02b1\u02b2\7p\2\2\u02b2\u00ac\3\2\2\2\u02b3\u02b4\7v\2\2\u02b4\u02b5"
+                    + "\7t\2\2\u02b5\u02b6\7{\2\2\u02b6\u00ae\3\2\2\2\u02b7\u02b8\7g\2\2\u02b8"
+                    + "\u02b9\7x\2\2\u02b9\u02ba\7g\2\2\u02ba\u02bb\7p\2\2\u02bb\u02bc\7v\2\2"
+                    + "\u02bc\u00b0\3\2\2\2\u02bd\u02be\7B\2\2\u02be\u00b2\3\2\2\2\u02bf\u02c0"
+                    + "\7C\2\2\u02c0\u02c1\7V\2\2\u02c1\u02c2\7a\2\2\u02c2\u02c3\7N\2\2\u02c3"
+                    + "\u02c4\7G\2\2\u02c4\u02c5\7C\2\2\u02c5\u02c6\7U\2\2\u02c6\u02c7\7V\2\2"
+                    + "\u02c7\u02c8\7a\2\2\u02c8\u02c9\7Q\2\2\u02c9\u02ca\7P\2\2\u02ca\u02cb"
+                    + "\7E\2\2\u02cb\u02cc\7G\2\2\u02cc\u00b4\3\2\2\2\u02cd\u02ce\7C\2\2\u02ce"
+                    + "\u02cf\7V\2\2\u02cf\u02d0\7a\2\2\u02d0\u02d1\7O\2\2\u02d1\u02d2\7Q\2\2"
+                    + "\u02d2\u02d3\7U\2\2\u02d3\u02d4\7V\2\2\u02d4\u02d5\7a\2\2\u02d5\u02d6"
+                    + "\7Q\2\2\u02d6\u02d7\7P\2\2\u02d7\u02d8\7E\2\2\u02d8\u02d9\7G\2\2\u02d9"
+                    + "\u00b6\3\2\2\2\u02da\u02db\7Q\2\2\u02db\u02dc\7P\2\2\u02dc\u02dd\7N\2"
+                    + "\2\u02dd\u02de\7[\2\2\u02de\u02df\7a\2\2\u02df\u02e0\7Q\2\2\u02e0\u02e1"
+                    + "\7P\2\2\u02e1\u02e2\7E\2\2\u02e2\u02e3\7G\2\2\u02e3\u00b8\3\2\2\2\u02e4"
+                    + "\u02e5\7i\2\2\u02e5\u02e6\7n\2\2\u02e6\u02e7\7q\2\2\u02e7\u02e8\7d\2\2"
+                    + "\u02e8\u02e9\7c\2\2\u02e9\u02ea\7n\2\2\u02ea\u00ba\3\2\2\2\u02eb\u02ec"
+                    + "\7n\2\2\u02ec\u02ed\7q\2\2\u02ed\u02ee\7e\2\2\u02ee\u02ef\7c\2\2\u02ef"
+                    + "\u02f0\7n\2\2\u02f0\u00bc\3\2\2\2\u02f1\u02f2\7x\2\2\u02f2\u02f3\7k\2"
+                    + "\2\u02f3\u02f4\7g\2\2\u02f4\u02f5\7y\2\2\u02f5\u00be\3\2\2\2\u02f6\u02f7"
+                    + "\7e\2\2\u02f7\u02f8\7n\2\2\u02f8\u02f9\7c\2\2\u02f9\u02fa\7u\2\2\u02fa"
+                    + "\u02fb\7u\2\2\u02fb\u00c0\3\2\2\2\u02fc\u02fd\7g\2\2\u02fd\u02fe\7p\2"
+                    + "\2\u02fe\u02ff\7w\2\2\u02ff\u0300\7o\2\2\u0300\u00c2\3\2\2\2\u0301\u0302"
+                    + "\7g\2\2\u0302\u0303\7z\2\2\u0303\u0304\7v\2\2\u0304\u0305\7g\2\2\u0305"
+                    + "\u0306\7p\2\2\u0306\u0307\7f\2\2\u0307\u0308\7u\2\2\u0308\u00c4\3\2\2"
+                    + "\2\u0309\u030a\7u\2\2\u030a\u030b\7w\2\2\u030b\u030c\7r\2\2\u030c\u030d"
+                    + "\7g\2\2\u030d\u030e\7t\2\2\u030e\u00c6\3\2\2\2\u030f\u0310\7e\2\2\u0310"
+                    + "\u0311\7q\2\2\u0311\u0312\7p\2\2\u0312\u0313\7u\2\2\u0313\u0314\7v\2\2"
+                    + "\u0314\u00c8\3\2\2\2\u0315\u0316\7g\2\2\u0316\u0317\7z\2\2\u0317\u0318"
+                    + "\7r\2\2\u0318\u0319\7q\2\2\u0319\u031a\7t\2\2\u031a\u031b\7v\2\2\u031b"
+                    + "\u00ca\3\2\2\2\u031c\u031d\7k\2\2\u031d\u031e\7o\2\2\u031e\u031f\7r\2"
+                    + "\2\u031f\u0320\7q\2\2\u0320\u0321\7t\2\2\u0321\u0322\7v\2\2\u0322\u00cc"
+                    + "\3\2\2\2\u0323\u0324\7e\2\2\u0324\u0325\7q\2\2\u0325\u0326\7p\2\2\u0326"
+                    + "\u0327\7v\2\2\u0327\u0328\7t\2\2\u0328\u0329\7c\2\2\u0329\u032a\7e\2\2"
+                    + "\u032a\u032b\7v\2\2\u032b\u00ce\3\2\2\2\u032c\u032d\7o\2\2\u032d\u032e"
+                    + "\7q\2\2\u032e\u032f\7f\2\2\u032f\u0330\7w\2\2\u0330\u0331\7n\2\2\u0331"
+                    + "\u0332\7g\2\2\u0332\u00d0\3\2\2\2\u0333\u0334\7q\2\2\u0334\u0335\7t\2"
+                    + "\2\u0335\u0336\7c\2\2\u0336\u0337\7e\2\2\u0337\u0338\7n\2\2\u0338\u0339"
+                    + "\7g\2\2\u0339\u00d2\3\2\2\2\u033a\u033b\7f\2\2\u033b\u033c\7q\2\2\u033c"
+                    + "\u033d\7k\2\2\u033d\u033e\7r\2\2\u033e\u033f\7o\2\2\u033f\u0340\7q\2\2"
+                    + "\u0340\u0341\7f\2\2\u0341\u0342\7w\2\2\u0342\u0343\7n\2\2\u0343\u0344"
+                    + "\7g\2\2\u0344\u00d4\3\2\2\2\u0345\u0346\7k\2\2\u0346\u0347\7o\2\2\u0347"
+                    + "\u0348\7r\2\2\u0348\u0349\7n\2\2\u0349\u034a\7g\2\2\u034a\u034b\7o\2\2"
+                    + "\u034b\u034c\7g\2\2\u034c\u034d\7p\2\2\u034d\u034e\7v\2\2\u034e\u034f"
+                    + "\7u\2\2\u034f\u0350\3\2\2\2\u0350\u0351\6k\4\2\u0351\u00d6\3\2\2\2\u0352"
+                    + "\u0353\7n\2\2\u0353\u0354\7g\2\2\u0354\u0355\7v\2\2\u0355\u0356\3\2\2"
+                    + "\2\u0356\u0357\6l\5\2\u0357\u00d8\3\2\2\2\u0358\u0359\7r\2\2\u0359\u035a"
+                    + "\7t\2\2\u035a\u035b\7k\2\2\u035b\u035c\7x\2\2\u035c\u035d\7c\2\2\u035d"
+                    + "\u035e\7v\2\2\u035e\u035f\7g\2\2\u035f\u0360\3\2\2\2\u0360\u0361\6m\6"
+                    + "\2\u0361\u00da\3\2\2\2\u0362\u0363\7r\2\2\u0363\u0364\7w\2\2\u0364\u0365"
+                    + "\7d\2\2\u0365\u0366\7n\2\2\u0366\u0367\7k\2\2\u0367\u0368\7e\2\2\u0368"
+                    + "\u0369\3\2\2\2\u0369\u036a\6n\7\2\u036a\u00dc\3\2\2\2\u036b\u036c\7k\2"
+                    + "\2\u036c\u036d\7p\2\2\u036d\u036e\7v\2\2\u036e\u036f\7g\2\2\u036f\u0370"
+                    + "\7t\2\2\u0370\u0371\7h\2\2\u0371\u0372\7c\2\2\u0372\u0373\7e\2\2\u0373"
+                    + "\u0374\7g\2\2\u0374\u0375\3\2\2\2\u0375\u0376\6o\b\2\u0376\u00de\3\2\2"
+                    + "\2\u0377\u0378\7r\2\2\u0378\u0379\7c\2\2\u0379\u037a\7e\2\2\u037a\u037b"
+                    + "\7m\2\2\u037b\u037c\7c\2\2\u037c\u037d\7i\2\2\u037d\u037e\7g\2\2\u037e"
+                    + "\u037f\3\2\2\2\u037f\u0380\6p\t\2\u0380\u00e0\3\2\2\2\u0381\u0382\7r\2"
+                    + "\2\u0382\u0383\7t\2\2\u0383\u0384\7q\2\2\u0384\u0385\7v\2\2\u0385\u0386"
+                    + "\7g\2\2\u0386\u0387\7e\2\2\u0387\u0388\7v\2\2\u0388\u0389\7g\2\2\u0389"
+                    + "\u038a\7f\2\2\u038a\u038b\3\2\2\2\u038b\u038c\6q\n\2\u038c\u00e2\3\2\2"
+                    + "\2\u038d\u038e\7u\2\2\u038e\u038f\7v\2\2\u038f\u0390\7c\2\2\u0390\u0391"
+                    + "\7v\2\2\u0391\u0392\7k\2\2\u0392\u0393\7e\2\2\u0393\u0394\3\2\2\2\u0394"
+                    + "\u0395\6r\13\2\u0395\u00e4\3\2\2\2\u0396\u0397\7{\2\2\u0397\u0398\7k\2"
+                    + "\2\u0398\u0399\7g\2\2\u0399\u039a\7n\2\2\u039a\u039b\7f\2\2\u039b\u039c"
+                    + "\3\2\2\2\u039c\u039d\6s\f\2\u039d\u00e6\3\2\2\2\u039e\u03a2\5\u0115\u008b"
+                    + "\2\u039f\u03a1\5\u0113\u008a\2\u03a0\u039f\3\2\2\2\u03a1\u03a4\3\2\2\2"
+                    + "\u03a2\u03a0\3\2\2\2\u03a2\u03a3\3\2\2\2\u03a3\u00e8\3\2\2\2\u03a4\u03a2"
+                    + "\3\2\2\2\u03a5\u03a9\7$\2\2\u03a6\u03a8\5\u00f7|\2\u03a7\u03a6\3\2\2\2"
+                    + "\u03a8\u03ab\3\2\2\2\u03a9\u03a7\3\2\2\2\u03a9\u03aa\3\2\2\2\u03aa\u03ac"
+                    + "\3\2\2\2\u03ab\u03a9\3\2\2\2\u03ac\u03b6\7$\2\2\u03ad\u03b1\7)\2\2\u03ae"
+                    + "\u03b0\5\u00f9}\2\u03af\u03ae\3\2\2\2\u03b0\u03b3\3\2\2\2\u03b1\u03af"
+                    + "\3\2\2\2\u03b1\u03b2\3\2\2\2\u03b2\u03b4\3\2\2\2\u03b3\u03b1\3\2\2\2\u03b4"
+                    + "\u03b6\7)\2\2\u03b5\u03a5\3\2\2\2\u03b5\u03ad\3\2\2\2\u03b6\u03b7\3\2"
+                    + "\2\2\u03b7\u03b8\bu\5\2\u03b8\u00ea\3\2\2\2\u03b9\u03bf\7b\2\2\u03ba\u03bb"
+                    + "\7^\2\2\u03bb\u03be\7b\2\2\u03bc\u03be\n\t\2\2\u03bd\u03ba\3\2\2\2\u03bd"
+                    + "\u03bc\3\2\2\2\u03be\u03c1\3\2\2\2\u03bf\u03bd\3\2\2\2\u03bf\u03c0\3\2"
+                    + "\2\2\u03c0\u03c2\3\2\2\2\u03c1\u03bf\3\2\2\2\u03c2\u03c3\7b\2\2\u03c3"
+                    + "\u00ec\3\2\2\2\u03c4\u03c6\t\n\2\2\u03c5\u03c4\3\2\2\2\u03c6\u03c7\3\2"
+                    + "\2\2\u03c7\u03c5\3\2\2\2\u03c7\u03c8\3\2\2\2\u03c8\u03c9\3\2\2\2\u03c9"
+                    + "\u03ca\bw\2\2\u03ca\u00ee\3\2\2\2\u03cb\u03cc\t\2\2\2\u03cc\u03cd\3\2"
+                    + "\2\2\u03cd\u03ce\bx\2\2\u03ce\u00f0\3\2\2\2\u03cf\u03d0\7>\2\2\u03d0\u03d1"
+                    + "\7#\2\2\u03d1\u03d2\7/\2\2\u03d2\u03d3\7/\2\2\u03d3\u03d7\3\2\2\2\u03d4"
+                    + "\u03d6\13\2\2\2\u03d5\u03d4\3\2\2\2\u03d6\u03d9\3\2\2\2\u03d7\u03d8\3"
+                    + "\2\2\2\u03d7\u03d5\3\2\2\2\u03d8\u03da\3\2\2\2\u03d9\u03d7\3\2\2\2\u03da"
+                    + "\u03db\7/\2\2\u03db\u03dc\7/\2\2\u03dc\u03dd\7@\2\2\u03dd\u03de\3\2\2"
+                    + "\2\u03de\u03df\by\2\2\u03df\u00f2\3\2\2\2\u03e0\u03e1\7>\2\2\u03e1\u03e2"
+                    + "\7#\2\2\u03e2\u03e3\7]\2\2\u03e3\u03e4\7E\2\2\u03e4\u03e5\7F\2\2\u03e5"
+                    + "\u03e6\7C\2\2\u03e6\u03e7\7V\2\2\u03e7\u03e8\7C\2\2\u03e8\u03e9\7]\2\2"
+                    + "\u03e9\u03ed\3\2\2\2\u03ea\u03ec\13\2\2\2\u03eb\u03ea\3\2\2\2\u03ec\u03ef"
+                    + "\3\2\2\2\u03ed\u03ee\3\2\2\2\u03ed\u03eb\3\2\2\2\u03ee\u03f0\3\2\2\2\u03ef"
+                    + "\u03ed\3\2\2\2\u03f0\u03f1\7_\2\2\u03f1\u03f2\7_\2\2\u03f2\u03f3\7@\2"
+                    + "\2\u03f3\u03f4\3\2\2\2\u03f4\u03f5\bz\2\2\u03f5\u00f4\3\2\2\2\u03f6\u03f7"
+                    + "\13\2\2\2\u03f7\u03f8\3\2\2\2\u03f8\u03f9\b{\6\2\u03f9\u00f6\3\2\2\2\u03fa"
+                    + "\u03ff\n\13\2\2\u03fb\u03fc\7^\2\2\u03fc\u03ff\5\u00fb~\2\u03fd\u03ff"
+                    + "\5\u010b\u0086\2\u03fe\u03fa\3\2\2\2\u03fe\u03fb\3\2\2\2\u03fe\u03fd\3"
+                    + "\2\2\2\u03ff\u00f8\3\2\2\2\u0400\u0405\n\f\2\2\u0401\u0402\7^\2\2\u0402"
+                    + "\u0405\5\u00fb~\2\u0403\u0405\5\u010b\u0086\2\u0404\u0400\3\2\2\2\u0404"
+                    + "\u0401\3\2\2\2\u0404\u0403\3\2\2\2\u0405\u00fa\3\2\2\2\u0406\u040c\5\u00fd"
+                    + "\177\2\u0407\u040c\7\62\2\2\u0408\u040c\5\u00ff\u0080\2\u0409\u040c\5"
+                    + "\u0101\u0081\2\u040a\u040c\5\u0103\u0082\2\u040b\u0406\3\2\2\2\u040b\u0407"
+                    + "\3\2\2\2\u040b\u0408\3\2\2\2\u040b\u0409\3\2\2\2\u040b\u040a\3\2\2\2\u040c"
+                    + "\u00fc\3\2\2\2\u040d\u0410\5\u0105\u0083\2\u040e\u0410\5\u0107\u0084\2"
+                    + "\u040f\u040d\3\2\2\2\u040f\u040e\3\2\2\2\u0410\u00fe\3\2\2\2\u0411\u0412"
+                    + "\7z\2\2\u0412\u0413\5\u010d\u0087\2\u0413\u0414\5\u010d\u0087\2\u0414"
+                    + "\u0100\3\2\2\2\u0415\u0416\7w\2\2\u0416\u0417\5\u010d\u0087\2\u0417\u0418"
+                    + "\5\u010d\u0087\2\u0418\u0419\5\u010d\u0087\2\u0419\u041a\5\u010d\u0087"
+                    + "\2\u041a\u0102\3\2\2\2\u041b\u041c\7w\2\2\u041c\u041e\7}\2\2\u041d\u041f"
+                    + "\5\u010d\u0087\2\u041e\u041d\3\2\2\2\u041f\u0420\3\2\2\2\u0420\u041e\3"
+                    + "\2\2\2\u0420\u0421\3\2\2\2\u0421\u0422\3\2\2\2\u0422\u0423\7\177\2\2\u0423"
+                    + "\u0104\3\2\2\2\u0424\u0425\t\r\2\2\u0425\u0106\3\2\2\2\u0426\u0427\n\16"
+                    + "\2\2\u0427\u0108\3\2\2\2\u0428\u042b\5\u0105\u0083\2\u0429\u042b\t\17"
+                    + "\2\2\u042a\u0428\3\2\2\2\u042a\u0429\3\2\2\2\u042b\u010a\3\2\2\2\u042c"
+                    + "\u042d\7^\2\2\u042d\u042e\t\2\2\2\u042e\u010c\3\2\2\2\u042f\u0430\t\20"
+                    + "\2\2\u0430\u010e\3\2\2\2\u0431\u043a\7\62\2\2\u0432\u0436\t\21\2\2\u0433"
+                    + "\u0435\t\3\2\2\u0434\u0433\3\2\2\2\u0435\u0438\3\2\2\2\u0436\u0434\3\2"
+                    + "\2\2\u0436\u0437\3\2\2\2\u0437\u043a\3\2\2\2\u0438\u0436\3\2\2\2\u0439"
+                    + "\u0431\3\2\2\2\u0439\u0432\3\2\2\2\u043a\u0110\3\2\2\2\u043b\u043d\t\22"
+                    + "\2\2\u043c\u043e\t\23\2\2\u043d\u043c\3\2\2\2\u043d\u043e\3\2\2\2\u043e"
+                    + "\u0440\3\2\2\2\u043f\u0441\t\3\2\2\u0440\u043f\3\2\2\2\u0441\u0442\3\2"
+                    + "\2\2\u0442\u0440\3\2\2\2\u0442\u0443\3\2\2\2\u0443\u0112\3\2\2\2\u0444"
+                    + "\u044a\5\u0115\u008b\2\u0445\u044a\5\u0119\u008d\2\u0446\u044a\5\u011b"
+                    + "\u008e\2\u0447\u044a\5\u011d\u008f\2\u0448\u044a\4\u200e\u200f\2\u0449"
+                    + "\u0444\3\2\2\2\u0449\u0445\3\2\2\2\u0449\u0446\3\2\2\2\u0449\u0447\3\2"
+                    + "\2\2\u0449\u0448\3\2\2\2\u044a\u0114\3\2\2\2\u044b\u0450\5\u0117\u008c"
+                    + "\2\u044c\u0450\t\24\2\2\u044d\u044e\7^\2\2\u044e\u0450\5\u0101\u0081\2"
+                    + "\u044f\u044b\3\2\2\2\u044f\u044c\3\2\2\2\u044f\u044d\3\2\2\2\u0450\u0116"
+                    + "\3\2\2\2\u0451\u0453\t\25\2\2\u0452\u0451\3\2\2\2\u0453\u0118\3\2\2\2"
+                    + "\u0454\u0456\t\26\2\2\u0455\u0454\3\2\2\2\u0456\u011a\3\2\2\2\u0457\u0459"
+                    + "\t\27\2\2\u0458\u0457\3\2\2\2\u0459\u011c\3\2\2\2\u045a\u045c\t\30\2\2"
+                    + "\u045b\u045a\3\2\2\2\u045c\u011e\3\2\2\2\u045d\u0468\n\31\2\2\u045e\u0468"
+                    + "\5\u0123\u0092\2\u045f\u0463\7]\2\2\u0460\u0462\5\u0121\u0091\2\u0461"
+                    + "\u0460\3\2\2\2\u0462\u0465\3\2\2\2\u0463\u0461\3\2\2\2\u0463\u0464\3\2"
+                    + "\2\2\u0464\u0466\3\2\2\2\u0465\u0463\3\2\2\2\u0466\u0468\7_\2\2\u0467"
+                    + "\u045d\3\2\2\2\u0467\u045e\3\2\2\2\u0467\u045f\3\2\2\2\u0468\u0120\3\2"
+                    + "\2\2\u0469\u046c\n\32\2\2\u046a\u046c\5\u0123\u0092\2\u046b\u0469\3\2"
+                    + "\2\2\u046b\u046a\3\2\2\2\u046c\u0122\3\2\2\2\u046d\u046e\7^\2\2\u046e"
+                    + "\u046f\n\2\2\2\u046f\u0124\3\2\2\2.\2\u012b\u0139\u0142\u0149\u01e2\u01e9"
+                    + "\u01ed\u01f3\u01f6\u01fa\u01fc\u0203\u0209\u0212\u0219\u03a2\u03a9\u03b1"
+                    + "\u03b5\u03bd\u03bf\u03c7\u03d7\u03ed\u03fe\u0404\u040b\u040f\u0420\u042a"
+                    + "\u0436\u0439\u043d\u0442\u0449\u044f\u0452\u0455\u0458\u045b\u0463\u0467"
+                    + "\u046b\7\2\3\2\3\t\2\3\n\3\3u\4\2\4\2";
+    public static final ATN _ATN = new ATNDeserializer().deserialize(_serializedATN.toCharArray());
+    static {
+        _decisionToDFA = new DFA[_ATN.getNumberOfDecisions()];
+        for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) {
+            _decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
+        }
+    }
+}
diff --git a/src/main/gen/org/bdware/sc/parser/YJSParser.java b/src/main/gen/org/bdware/sc/parser/YJSParser.java
index 842c5f0..0aa4687 100644
--- a/src/main/gen/org/bdware/sc/parser/YJSParser.java
+++ b/src/main/gen/org/bdware/sc/parser/YJSParser.java
@@ -1,7299 +1,9499 @@
 // Generated from YJSParser.g4 by ANTLR 4.9.2
 package org.bdware.sc.parser;
+
 import org.antlr.v4.runtime.atn.*;
 import org.antlr.v4.runtime.dfa.DFA;
 import org.antlr.v4.runtime.*;
 import org.antlr.v4.runtime.misc.*;
 import org.antlr.v4.runtime.tree.*;
 import java.util.List;
-import java.util.Iterator;
-import java.util.ArrayList;
 
 @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
 public class YJSParser extends JavaScriptBaseParser {
-	static { RuntimeMetaData.checkVersion("4.9.2", RuntimeMetaData.VERSION); }
-
-	protected static final DFA[] _decisionToDFA;
-	protected static final PredictionContextCache _sharedContextCache =
-		new PredictionContextCache();
-	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, Global=92, Local=93, View=94, 
-		Class=95, Enum=96, Extends=97, Super=98, Const=99, Export=100, Import=101, 
-		Contract=102, Module=103, Oracle=104, DoipModule=105, Implements=106, 
-		Let=107, Private=108, Public=109, Interface=110, Package=111, Protected=112, 
-		Static=113, Yield=114, Identifier=115, StringLiteral=116, TemplateStringLiteral=117, 
-		WhiteSpaces=118, LineTerminator=119, HtmlComment=120, CDataComment=121, 
-		UnexpectedCharacter=122;
-	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_interfaceDeclaration = 7, RULE_eventDeclaration = 8, RULE_eventGlobalOrLocal = 9, 
-		RULE_eventSemantics = 10, RULE_sourceElement = 11, RULE_importStmts = 12, 
-		RULE_importStmt = 13, RULE_exportStmt = 14, RULE_versionName = 15, RULE_statement = 16, 
-		RULE_block = 17, RULE_statementList = 18, RULE_variableStatement = 19, 
-		RULE_variableDeclarationList = 20, RULE_variableDeclaration = 21, RULE_emptyStatement = 22, 
-		RULE_expressionStatement = 23, RULE_ifStatement = 24, RULE_iterationStatement = 25, 
-		RULE_varModifier = 26, RULE_continueStatement = 27, RULE_breakStatement = 28, 
-		RULE_returnStatement = 29, RULE_withStatement = 30, RULE_switchStatement = 31, 
-		RULE_caseBlock = 32, RULE_caseClauses = 33, RULE_caseClause = 34, RULE_defaultClause = 35, 
-		RULE_throwStatement = 36, RULE_tryStatement = 37, RULE_catchProduction = 38, 
-		RULE_finallyProduction = 39, RULE_debuggerStatement = 40, RULE_functionDeclaration = 41, 
-		RULE_classDeclaration = 42, RULE_classTail = 43, RULE_classElement = 44, 
-		RULE_methodDefinition = 45, RULE_formalParameterList = 46, RULE_formalParameterArg = 47, 
-		RULE_lastFormalParameterArg = 48, RULE_functionBody = 49, RULE_sourceElements = 50, 
-		RULE_arrayLiteral = 51, RULE_elementList = 52, RULE_lastElement = 53, 
-		RULE_objectLiteral = 54, RULE_propertyAssignment = 55, RULE_propertyName = 56, 
-		RULE_arguments = 57, RULE_lastArgument = 58, RULE_expressionSequence = 59, 
-		RULE_singleExpression = 60, RULE_arrowFunctionParameters = 61, RULE_arrowFunctionBody = 62, 
-		RULE_assignmentOperator = 63, RULE_literal = 64, RULE_numericLiteral = 65, 
-		RULE_identifierName = 66, RULE_reservedWord = 67, RULE_keyword = 68, RULE_eos = 69;
-	private static String[] makeRuleNames() {
-		return new String[] {
-			"program", "contractDeclar", "annotations", "annotation", "annotationArgs", 
-			"annotationLiteral", "clzOrFunctionDeclaration", "interfaceDeclaration", 
-			"eventDeclaration", "eventGlobalOrLocal", "eventSemantics", "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"
-		};
-	}
-	public static final String[] ruleNames = makeRuleNames();
-
-	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'", 
-			"'global'", "'local'", "'view'", "'class'", "'enum'", "'extends'", "'super'", 
-			"'const'", "'export'", "'import'", "'contract'", "'module'", "'oracle'", 
-			"'doipmodule'", "'implements'", "'let'", "'private'", "'public'", "'interface'", 
-			"'package'", "'protected'", "'static'", "'yield'"
-		};
-	}
-	private static final String[] _LITERAL_NAMES = makeLiteralNames();
-	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", 
-			"Global", "Local", "View", "Class", "Enum", "Extends", "Super", "Const", 
-			"Export", "Import", "Contract", "Module", "Oracle", "DoipModule", "Implements", 
-			"Let", "Private", "Public", "Interface", "Package", "Protected", "Static", 
-			"Yield", "Identifier", "StringLiteral", "TemplateStringLiteral", "WhiteSpaces", 
-			"LineTerminator", "HtmlComment", "CDataComment", "UnexpectedCharacter"
-		};
-	}
-	private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
-	public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
-
-	/**
-	 * @deprecated Use {@link #VOCABULARY} instead.
-	 */
-	@Deprecated
-	public static final String[] tokenNames;
-	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>";
-			}
-		}
-	}
-
-	@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 YJSParser(TokenStream input) {
-		super(input);
-		_interp = new ParserATNSimulator(this,_ATN,_decisionToDFA,_sharedContextCache);
-	}
-
-	public static class ProgramContext extends ParserRuleContext {
-		public ContractDeclarContext contractDeclar() {
-			return getRuleContext(ContractDeclarContext.class,0);
-		}
-		public ImportStmtsContext importStmts() {
-			return getRuleContext(ImportStmtsContext.class,0);
-		}
-		public ProgramContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final ProgramContext program() throws RecognitionException {
-		ProgramContext _localctx = new ProgramContext(_ctx, getState());
-		enterRule(_localctx, 0, RULE_program);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(141);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==Import) {
-				{
-				setState(140);
-				importStmts();
-				}
-			}
-
-			setState(143);
-			contractDeclar();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class ContractDeclarContext extends ParserRuleContext {
-		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 TerminalNode DoipModule() { return getToken(YJSParser.DoipModule, 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);
-		}
-		public ContractDeclarContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final ContractDeclarContext contractDeclar() throws RecognitionException {
-		ContractDeclarContext _localctx = new ContractDeclarContext(_ctx, getState());
-		enterRule(_localctx, 2, RULE_contractDeclar);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(146);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==AtToken) {
-				{
-				setState(145);
-				annotations();
-				}
-			}
-
-			setState(148);
-			_la = _input.LA(1);
-			if ( !(((((_la - 102)) & ~0x3f) == 0 && ((1L << (_la - 102)) & ((1L << (Contract - 102)) | (1L << (Module - 102)) | (1L << (Oracle - 102)) | (1L << (DoipModule - 102)))) != 0)) ) {
-			_errHandler.recoverInline(this);
-			}
-			else {
-				if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
-				_errHandler.reportMatch(this);
-				consume();
-			}
-			setState(149);
-			match(Identifier);
-			setState(150);
-			match(OpenBrace);
-			setState(152); 
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			do {
-				{
-				{
-				setState(151);
-				clzOrFunctionDeclaration();
-				}
-				}
-				setState(154); 
-				_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)) | (1L << (Interface - 78)))) != 0) );
-			setState(156);
-			match(CloseBrace);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class AnnotationsContext extends ParserRuleContext {
-		public List<AnnotationContext> annotation() {
-			return getRuleContexts(AnnotationContext.class);
-		}
-		public AnnotationContext annotation(int i) {
-			return getRuleContext(AnnotationContext.class,i);
-		}
-		public AnnotationsContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final AnnotationsContext annotations() throws RecognitionException {
-		AnnotationsContext _localctx = new AnnotationsContext(_ctx, getState());
-		enterRule(_localctx, 4, RULE_annotations);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(159); 
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			do {
-				{
-				{
-				setState(158);
-				annotation();
-				}
-				}
-				setState(161); 
-				_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 static class AnnotationContext extends ParserRuleContext {
-		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);
-		}
-		public AnnotationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final AnnotationContext annotation() throws RecognitionException {
-		AnnotationContext _localctx = new AnnotationContext(_ctx, getState());
-		enterRule(_localctx, 6, RULE_annotation);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(163);
-			match(AtToken);
-			setState(164);
-			match(Identifier);
-			setState(165);
-			match(OpenParen);
-			setState(167);
-			_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(166);
-				annotationArgs();
-				}
-			}
-
-			setState(169);
-			match(CloseParen);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class AnnotationArgsContext extends ParserRuleContext {
-		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);
-		}
-		public AnnotationArgsContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final AnnotationArgsContext annotationArgs() throws RecognitionException {
-		AnnotationArgsContext _localctx = new AnnotationArgsContext(_ctx, getState());
-		enterRule(_localctx, 8, RULE_annotationArgs);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(171);
-			annotationLiteral();
-			setState(176);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (_la==Comma) {
-				{
-				{
-				setState(172);
-				match(Comma);
-				setState(173);
-				annotationLiteral();
-				}
-				}
-				setState(178);
-				_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 static class AnnotationLiteralContext extends ParserRuleContext {
-		public NumericLiteralContext numericLiteral() {
-			return getRuleContext(NumericLiteralContext.class,0);
-		}
-		public TerminalNode StringLiteral() { return getToken(YJSParser.StringLiteral, 0); }
-		public ObjectLiteralContext objectLiteral() {
-			return getRuleContext(ObjectLiteralContext.class,0);
-		}
-		public AnnotationLiteralContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final AnnotationLiteralContext annotationLiteral() throws RecognitionException {
-		AnnotationLiteralContext _localctx = new AnnotationLiteralContext(_ctx, getState());
-		enterRule(_localctx, 10, RULE_annotationLiteral);
-		try {
-			setState(182);
-			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case DecimalLiteral:
-			case HexIntegerLiteral:
-			case OctalIntegerLiteral:
-			case OctalIntegerLiteral2:
-			case BinaryIntegerLiteral:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(179);
-				numericLiteral();
-				}
-				break;
-			case StringLiteral:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(180);
-				match(StringLiteral);
-				}
-				break;
-			case OpenBrace:
-				enterOuterAlt(_localctx, 3);
-				{
-				setState(181);
-				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 static class ClzOrFunctionDeclarationContext extends ParserRuleContext {
-		public ClassDeclarationContext classDeclaration() {
-			return getRuleContext(ClassDeclarationContext.class,0);
-		}
-		public FunctionDeclarationContext functionDeclaration() {
-			return getRuleContext(FunctionDeclarationContext.class,0);
-		}
-		public InterfaceDeclarationContext interfaceDeclaration() {
-			return getRuleContext(InterfaceDeclarationContext.class,0);
-		}
-		public EventDeclarationContext eventDeclaration() {
-			return getRuleContext(EventDeclarationContext.class,0);
-		}
-		public ClzOrFunctionDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final ClzOrFunctionDeclarationContext clzOrFunctionDeclaration() throws RecognitionException {
-		ClzOrFunctionDeclarationContext _localctx = new ClzOrFunctionDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 12, RULE_clzOrFunctionDeclaration);
-		try {
-			setState(188);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,7,_ctx) ) {
-			case 1:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(184);
-				classDeclaration();
-				}
-				break;
-			case 2:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(185);
-				functionDeclaration();
-				}
-				break;
-			case 3:
-				enterOuterAlt(_localctx, 3);
-				{
-				setState(186);
-				interfaceDeclaration();
-				}
-				break;
-			case 4:
-				enterOuterAlt(_localctx, 4);
-				{
-				setState(187);
-				eventDeclaration();
-				}
-				break;
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class InterfaceDeclarationContext extends ParserRuleContext {
-		public TerminalNode Interface() { return getToken(YJSParser.Interface, 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 EosContext eos() {
-			return getRuleContext(EosContext.class,0);
-		}
-		public AnnotationsContext annotations() {
-			return getRuleContext(AnnotationsContext.class,0);
-		}
-		public FormalParameterListContext formalParameterList() {
-			return getRuleContext(FormalParameterListContext.class,0);
-		}
-		public InterfaceDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_interfaceDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof YJSParserListener ) ((YJSParserListener)listener).enterInterfaceDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof YJSParserListener ) ((YJSParserListener)listener).exitInterfaceDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof YJSParserVisitor ) return ((YJSParserVisitor<? extends T>)visitor).visitInterfaceDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final InterfaceDeclarationContext interfaceDeclaration() throws RecognitionException {
-		InterfaceDeclarationContext _localctx = new InterfaceDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 14, RULE_interfaceDeclaration);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(191);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==AtToken) {
-				{
-				setState(190);
-				annotations();
-				}
-			}
-
-			setState(193);
-			match(Interface);
-			setState(194);
-			match(Identifier);
-			setState(195);
-			match(OpenParen);
-			setState(197);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << OpenBracket) | (1L << OpenBrace) | (1L << Ellipsis))) != 0) || _la==Identifier) {
-				{
-				setState(196);
-				formalParameterList();
-				}
-			}
-
-			setState(199);
-			match(CloseParen);
-			setState(200);
-			eos();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class EventDeclarationContext extends ParserRuleContext {
-		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 EventGlobalOrLocalContext eventGlobalOrLocal() {
-			return getRuleContext(EventGlobalOrLocalContext.class,0);
-		}
-		public TerminalNode OpenParen() { return getToken(YJSParser.OpenParen, 0); }
-		public TerminalNode CloseParen() { return getToken(YJSParser.CloseParen, 0); }
-		public EventSemanticsContext eventSemantics() {
-			return getRuleContext(EventSemanticsContext.class,0);
-		}
-		public EventDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final EventDeclarationContext eventDeclaration() throws RecognitionException {
-		EventDeclarationContext _localctx = new EventDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 16, RULE_eventDeclaration);
-		int _la;
-		try {
-			setState(219);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,13,_ctx) ) {
-			case 1:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(202);
-				match(Event);
-				setState(204);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (_la==Global || _la==Local) {
-					{
-					setState(203);
-					eventGlobalOrLocal();
-					}
-				}
-
-				setState(206);
-				match(Identifier);
-				setState(207);
-				match(SemiColon);
-				}
-				break;
-			case 2:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(208);
-				match(Event);
-				setState(210);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (_la==Global || _la==Local) {
-					{
-					setState(209);
-					eventGlobalOrLocal();
-					}
-				}
-
-				setState(212);
-				match(Identifier);
-				setState(213);
-				match(OpenParen);
-				setState(215);
-				_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(214);
-					eventSemantics();
-					}
-				}
-
-				setState(217);
-				match(CloseParen);
-				setState(218);
-				match(SemiColon);
-				}
-				break;
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class EventGlobalOrLocalContext extends ParserRuleContext {
-		public TerminalNode Global() { return getToken(YJSParser.Global, 0); }
-		public TerminalNode Local() { return getToken(YJSParser.Local, 0); }
-		public EventGlobalOrLocalContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_eventGlobalOrLocal; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof YJSParserListener ) ((YJSParserListener)listener).enterEventGlobalOrLocal(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof YJSParserListener ) ((YJSParserListener)listener).exitEventGlobalOrLocal(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof YJSParserVisitor ) return ((YJSParserVisitor<? extends T>)visitor).visitEventGlobalOrLocal(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final EventGlobalOrLocalContext eventGlobalOrLocal() throws RecognitionException {
-		EventGlobalOrLocalContext _localctx = new EventGlobalOrLocalContext(_ctx, getState());
-		enterRule(_localctx, 18, RULE_eventGlobalOrLocal);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(221);
-			_la = _input.LA(1);
-			if ( !(_la==Global || _la==Local) ) {
-			_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 static class EventSemanticsContext extends ParserRuleContext {
-		public TerminalNode AtLeastOnce() { return getToken(YJSParser.AtLeastOnce, 0); }
-		public TerminalNode AtMostOnce() { return getToken(YJSParser.AtMostOnce, 0); }
-		public TerminalNode OnlyOnce() { return getToken(YJSParser.OnlyOnce, 0); }
-		public EventSemanticsContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final EventSemanticsContext eventSemantics() throws RecognitionException {
-		EventSemanticsContext _localctx = new EventSemanticsContext(_ctx, getState());
-		enterRule(_localctx, 20, RULE_eventSemantics);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(223);
-			_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 static class SourceElementContext extends ParserRuleContext {
-		public StatementContext statement() {
-			return getRuleContext(StatementContext.class,0);
-		}
-		public SourceElementContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final SourceElementContext sourceElement() throws RecognitionException {
-		SourceElementContext _localctx = new SourceElementContext(_ctx, getState());
-		enterRule(_localctx, 22, RULE_sourceElement);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(225);
-			statement();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class ImportStmtsContext extends ParserRuleContext {
-		public List<ImportStmtContext> importStmt() {
-			return getRuleContexts(ImportStmtContext.class);
-		}
-		public ImportStmtContext importStmt(int i) {
-			return getRuleContext(ImportStmtContext.class,i);
-		}
-		public ImportStmtsContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final ImportStmtsContext importStmts() throws RecognitionException {
-		ImportStmtsContext _localctx = new ImportStmtsContext(_ctx, getState());
-		enterRule(_localctx, 24, RULE_importStmts);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(228); 
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			do {
-				{
-				{
-				setState(227);
-				importStmt();
-				}
-				}
-				setState(230); 
-				_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 static class ImportStmtContext extends ParserRuleContext {
-		public TerminalNode Import() { return getToken(YJSParser.Import, 0); }
-		public TerminalNode StringLiteral() { return getToken(YJSParser.StringLiteral, 0); }
-		public TerminalNode SemiColon() { return getToken(YJSParser.SemiColon, 0); }
-		public ImportStmtContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final ImportStmtContext importStmt() throws RecognitionException {
-		ImportStmtContext _localctx = new ImportStmtContext(_ctx, getState());
-		enterRule(_localctx, 26, RULE_importStmt);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(232);
-			match(Import);
-			setState(233);
-			match(StringLiteral);
-			setState(234);
-			match(SemiColon);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class ExportStmtContext extends ParserRuleContext {
-		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); }
-		public ExportStmtContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final ExportStmtContext exportStmt() throws RecognitionException {
-		ExportStmtContext _localctx = new ExportStmtContext(_ctx, getState());
-		enterRule(_localctx, 28, RULE_exportStmt);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(236);
-			match(Export);
-			setState(237);
-			match(Identifier);
-			setState(238);
-			versionName();
-			setState(239);
-			match(SemiColon);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class VersionNameContext extends ParserRuleContext {
-		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);
-		}
-		public VersionNameContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final VersionNameContext versionName() throws RecognitionException {
-		VersionNameContext _localctx = new VersionNameContext(_ctx, getState());
-		enterRule(_localctx, 30, RULE_versionName);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(241);
-			match(DecimalLiteral);
-			setState(246);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (_la==Dot) {
-				{
-				{
-				setState(242);
-				match(Dot);
-				setState(243);
-				match(DecimalLiteral);
-				}
-				}
-				setState(248);
-				_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 static class StatementContext extends ParserRuleContext {
-		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);
-		}
-		public StatementContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final StatementContext statement() throws RecognitionException {
-		StatementContext _localctx = new StatementContext(_ctx, getState());
-		enterRule(_localctx, 32, RULE_statement);
-		try {
-			setState(259);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,16,_ctx) ) {
-			case 1:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(249);
-				block();
-				}
-				break;
-			case 2:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(250);
-				variableStatement();
-				}
-				break;
-			case 3:
-				enterOuterAlt(_localctx, 3);
-				{
-				setState(251);
-				emptyStatement();
-				}
-				break;
-			case 4:
-				enterOuterAlt(_localctx, 4);
-				{
-				setState(252);
-				expressionStatement();
-				}
-				break;
-			case 5:
-				enterOuterAlt(_localctx, 5);
-				{
-				setState(253);
-				ifStatement();
-				}
-				break;
-			case 6:
-				enterOuterAlt(_localctx, 6);
-				{
-				setState(254);
-				iterationStatement();
-				}
-				break;
-			case 7:
-				enterOuterAlt(_localctx, 7);
-				{
-				setState(255);
-				continueStatement();
-				}
-				break;
-			case 8:
-				enterOuterAlt(_localctx, 8);
-				{
-				setState(256);
-				breakStatement();
-				}
-				break;
-			case 9:
-				enterOuterAlt(_localctx, 9);
-				{
-				setState(257);
-				returnStatement();
-				}
-				break;
-			case 10:
-				enterOuterAlt(_localctx, 10);
-				{
-				setState(258);
-				switchStatement();
-				}
-				break;
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class BlockContext extends ParserRuleContext {
-		public TerminalNode OpenBrace() { return getToken(YJSParser.OpenBrace, 0); }
-		public TerminalNode CloseBrace() { return getToken(YJSParser.CloseBrace, 0); }
-		public StatementListContext statementList() {
-			return getRuleContext(StatementListContext.class,0);
-		}
-		public BlockContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final BlockContext block() throws RecognitionException {
-		BlockContext _localctx = new BlockContext(_ctx, getState());
-		enterRule(_localctx, 34, RULE_block);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(261);
-			match(OpenBrace);
-			setState(263);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,17,_ctx) ) {
-			case 1:
-				{
-				setState(262);
-				statementList();
-				}
-				break;
-			}
-			setState(265);
-			match(CloseBrace);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class StatementListContext extends ParserRuleContext {
-		public List<StatementContext> statement() {
-			return getRuleContexts(StatementContext.class);
-		}
-		public StatementContext statement(int i) {
-			return getRuleContext(StatementContext.class,i);
-		}
-		public StatementListContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final StatementListContext statementList() throws RecognitionException {
-		StatementListContext _localctx = new StatementListContext(_ctx, getState());
-		enterRule(_localctx, 36, RULE_statementList);
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(268); 
-			_errHandler.sync(this);
-			_alt = 1;
-			do {
-				switch (_alt) {
-				case 1:
-					{
-					{
-					setState(267);
-					statement();
-					}
-					}
-					break;
-				default:
-					throw new NoViableAltException(this);
-				}
-				setState(270); 
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,18,_ctx);
-			} while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER );
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class VariableStatementContext extends ParserRuleContext {
-		public VarModifierContext varModifier() {
-			return getRuleContext(VarModifierContext.class,0);
-		}
-		public VariableDeclarationListContext variableDeclarationList() {
-			return getRuleContext(VariableDeclarationListContext.class,0);
-		}
-		public EosContext eos() {
-			return getRuleContext(EosContext.class,0);
-		}
-		public VariableStatementContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final VariableStatementContext variableStatement() throws RecognitionException {
-		VariableStatementContext _localctx = new VariableStatementContext(_ctx, getState());
-		enterRule(_localctx, 38, RULE_variableStatement);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(272);
-			varModifier();
-			setState(273);
-			variableDeclarationList();
-			setState(274);
-			eos();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class VariableDeclarationListContext extends ParserRuleContext {
-		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);
-		}
-		public VariableDeclarationListContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final VariableDeclarationListContext variableDeclarationList() throws RecognitionException {
-		VariableDeclarationListContext _localctx = new VariableDeclarationListContext(_ctx, getState());
-		enterRule(_localctx, 40, RULE_variableDeclarationList);
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(276);
-			variableDeclaration();
-			setState(281);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,19,_ctx);
-			while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					{
-					{
-					setState(277);
-					match(Comma);
-					setState(278);
-					variableDeclaration();
-					}
-					} 
-				}
-				setState(283);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,19,_ctx);
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class VariableDeclarationContext extends ParserRuleContext {
-		public TerminalNode Identifier() { return getToken(YJSParser.Identifier, 0); }
-		public TerminalNode Assign() { return getToken(YJSParser.Assign, 0); }
-		public SingleExpressionContext singleExpression() {
-			return getRuleContext(SingleExpressionContext.class,0);
-		}
-		public VariableDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final VariableDeclarationContext variableDeclaration() throws RecognitionException {
-		VariableDeclarationContext _localctx = new VariableDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 42, RULE_variableDeclaration);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			{
-			setState(284);
-			match(Identifier);
-			}
-			setState(287);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,20,_ctx) ) {
-			case 1:
-				{
-				setState(285);
-				match(Assign);
-				setState(286);
-				singleExpression(0);
-				}
-				break;
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class EmptyStatementContext extends ParserRuleContext {
-		public TerminalNode SemiColon() { return getToken(YJSParser.SemiColon, 0); }
-		public EmptyStatementContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final EmptyStatementContext emptyStatement() throws RecognitionException {
-		EmptyStatementContext _localctx = new EmptyStatementContext(_ctx, getState());
-		enterRule(_localctx, 44, RULE_emptyStatement);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(289);
-			match(SemiColon);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class ExpressionStatementContext extends ParserRuleContext {
-		public ExpressionSequenceContext expressionSequence() {
-			return getRuleContext(ExpressionSequenceContext.class,0);
-		}
-		public EosContext eos() {
-			return getRuleContext(EosContext.class,0);
-		}
-		public ExpressionStatementContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final ExpressionStatementContext expressionStatement() throws RecognitionException {
-		ExpressionStatementContext _localctx = new ExpressionStatementContext(_ctx, getState());
-		enterRule(_localctx, 46, RULE_expressionStatement);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(291);
-			if (!(notOpenBraceAndNotFunction())) throw new FailedPredicateException(this, "notOpenBraceAndNotFunction()");
-			setState(292);
-			expressionSequence();
-			setState(293);
-			eos();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class IfStatementContext extends ParserRuleContext {
-		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); }
-		public IfStatementContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final IfStatementContext ifStatement() throws RecognitionException {
-		IfStatementContext _localctx = new IfStatementContext(_ctx, getState());
-		enterRule(_localctx, 48, RULE_ifStatement);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(295);
-			match(If);
-			setState(296);
-			match(OpenParen);
-			setState(297);
-			expressionSequence();
-			setState(298);
-			match(CloseParen);
-			setState(299);
-			statement();
-			setState(302);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,21,_ctx) ) {
-			case 1:
-				{
-				setState(300);
-				match(Else);
-				setState(301);
-				statement();
-				}
-				break;
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class IterationStatementContext extends ParserRuleContext {
-		public IterationStatementContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_iterationStatement; }
-	 
-		public IterationStatementContext() { }
-		public void copyFrom(IterationStatementContext ctx) {
-			super.copyFrom(ctx);
-		}
-	}
-	public static class DoStatementContext extends IterationStatementContext {
-		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);
-		}
-		public DoStatementContext(IterationStatementContext ctx) { copyFrom(ctx); }
-		@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 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);
-		}
-		public ForVarStatementContext(IterationStatementContext ctx) { copyFrom(ctx); }
-		@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 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); }
-		public ForVarInStatementContext(IterationStatementContext ctx) { copyFrom(ctx); }
-		@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 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);
-		}
-		public WhileStatementContext(IterationStatementContext ctx) { copyFrom(ctx); }
-		@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 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);
-		}
-		public ForStatementContext(IterationStatementContext ctx) { copyFrom(ctx); }
-		@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 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); }
-		public ForInStatementContext(IterationStatementContext ctx) { copyFrom(ctx); }
-		@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 final IterationStatementContext iterationStatement() throws RecognitionException {
-		IterationStatementContext _localctx = new IterationStatementContext(_ctx, getState());
-		enterRule(_localctx, 50, RULE_iterationStatement);
-		int _la;
-		try {
-			setState(373);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,29,_ctx) ) {
-			case 1:
-				_localctx = new DoStatementContext(_localctx);
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(304);
-				match(Do);
-				setState(305);
-				statement();
-				setState(306);
-				match(While);
-				setState(307);
-				match(OpenParen);
-				setState(308);
-				expressionSequence();
-				setState(309);
-				match(CloseParen);
-				setState(310);
-				eos();
-				}
-				break;
-			case 2:
-				_localctx = new WhileStatementContext(_localctx);
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(312);
-				match(While);
-				setState(313);
-				match(OpenParen);
-				setState(314);
-				expressionSequence();
-				setState(315);
-				match(CloseParen);
-				setState(316);
-				statement();
-				}
-				break;
-			case 3:
-				_localctx = new ForStatementContext(_localctx);
-				enterOuterAlt(_localctx, 3);
-				{
-				setState(318);
-				match(For);
-				setState(319);
-				match(OpenParen);
-				setState(321);
-				_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(320);
-					expressionSequence();
-					}
-				}
-
-				setState(323);
-				match(SemiColon);
-				setState(325);
-				_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(324);
-					expressionSequence();
-					}
-				}
-
-				setState(327);
-				match(SemiColon);
-				setState(329);
-				_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(328);
-					expressionSequence();
-					}
-				}
-
-				setState(331);
-				match(CloseParen);
-				setState(332);
-				statement();
-				}
-				break;
-			case 4:
-				_localctx = new ForVarStatementContext(_localctx);
-				enterOuterAlt(_localctx, 4);
-				{
-				setState(333);
-				match(For);
-				setState(334);
-				match(OpenParen);
-				setState(335);
-				varModifier();
-				setState(336);
-				variableDeclarationList();
-				setState(337);
-				match(SemiColon);
-				setState(339);
-				_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(338);
-					expressionSequence();
-					}
-				}
-
-				setState(341);
-				match(SemiColon);
-				setState(343);
-				_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(342);
-					expressionSequence();
-					}
-				}
-
-				setState(345);
-				match(CloseParen);
-				setState(346);
-				statement();
-				}
-				break;
-			case 5:
-				_localctx = new ForInStatementContext(_localctx);
-				enterOuterAlt(_localctx, 5);
-				{
-				setState(348);
-				match(For);
-				setState(349);
-				match(OpenParen);
-				setState(350);
-				singleExpression(0);
-				setState(354);
-				_errHandler.sync(this);
-				switch (_input.LA(1)) {
-				case In:
-					{
-					setState(351);
-					match(In);
-					}
-					break;
-				case Identifier:
-					{
-					setState(352);
-					match(Identifier);
-					setState(353);
-					if (!(p("of"))) throw new FailedPredicateException(this, "p(\"of\")");
-					}
-					break;
-				default:
-					throw new NoViableAltException(this);
-				}
-				setState(356);
-				expressionSequence();
-				setState(357);
-				match(CloseParen);
-				setState(358);
-				statement();
-				}
-				break;
-			case 6:
-				_localctx = new ForVarInStatementContext(_localctx);
-				enterOuterAlt(_localctx, 6);
-				{
-				setState(360);
-				match(For);
-				setState(361);
-				match(OpenParen);
-				setState(362);
-				varModifier();
-				setState(363);
-				variableDeclaration();
-				setState(367);
-				_errHandler.sync(this);
-				switch (_input.LA(1)) {
-				case In:
-					{
-					setState(364);
-					match(In);
-					}
-					break;
-				case Identifier:
-					{
-					setState(365);
-					match(Identifier);
-					setState(366);
-					if (!(p("of"))) throw new FailedPredicateException(this, "p(\"of\")");
-					}
-					break;
-				default:
-					throw new NoViableAltException(this);
-				}
-				setState(369);
-				expressionSequence();
-				setState(370);
-				match(CloseParen);
-				setState(371);
-				statement();
-				}
-				break;
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class VarModifierContext extends ParserRuleContext {
-		public TerminalNode Var() { return getToken(YJSParser.Var, 0); }
-		public VarModifierContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final VarModifierContext varModifier() throws RecognitionException {
-		VarModifierContext _localctx = new VarModifierContext(_ctx, getState());
-		enterRule(_localctx, 52, RULE_varModifier);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(375);
-			match(Var);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class ContinueStatementContext extends ParserRuleContext {
-		public TerminalNode Continue() { return getToken(YJSParser.Continue, 0); }
-		public EosContext eos() {
-			return getRuleContext(EosContext.class,0);
-		}
-		public TerminalNode Identifier() { return getToken(YJSParser.Identifier, 0); }
-		public ContinueStatementContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final ContinueStatementContext continueStatement() throws RecognitionException {
-		ContinueStatementContext _localctx = new ContinueStatementContext(_ctx, getState());
-		enterRule(_localctx, 54, RULE_continueStatement);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(377);
-			match(Continue);
-			setState(380);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,30,_ctx) ) {
-			case 1:
-				{
-				setState(378);
-				if (!(notLineTerminator())) throw new FailedPredicateException(this, "notLineTerminator()");
-				setState(379);
-				match(Identifier);
-				}
-				break;
-			}
-			setState(382);
-			eos();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class BreakStatementContext extends ParserRuleContext {
-		public TerminalNode Break() { return getToken(YJSParser.Break, 0); }
-		public EosContext eos() {
-			return getRuleContext(EosContext.class,0);
-		}
-		public TerminalNode Identifier() { return getToken(YJSParser.Identifier, 0); }
-		public BreakStatementContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final BreakStatementContext breakStatement() throws RecognitionException {
-		BreakStatementContext _localctx = new BreakStatementContext(_ctx, getState());
-		enterRule(_localctx, 56, RULE_breakStatement);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(384);
-			match(Break);
-			setState(387);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,31,_ctx) ) {
-			case 1:
-				{
-				setState(385);
-				if (!(notLineTerminator())) throw new FailedPredicateException(this, "notLineTerminator()");
-				setState(386);
-				match(Identifier);
-				}
-				break;
-			}
-			setState(389);
-			eos();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class ReturnStatementContext extends ParserRuleContext {
-		public TerminalNode Return() { return getToken(YJSParser.Return, 0); }
-		public EosContext eos() {
-			return getRuleContext(EosContext.class,0);
-		}
-		public ExpressionSequenceContext expressionSequence() {
-			return getRuleContext(ExpressionSequenceContext.class,0);
-		}
-		public ReturnStatementContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final ReturnStatementContext returnStatement() throws RecognitionException {
-		ReturnStatementContext _localctx = new ReturnStatementContext(_ctx, getState());
-		enterRule(_localctx, 58, RULE_returnStatement);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(391);
-			match(Return);
-			setState(394);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,32,_ctx) ) {
-			case 1:
-				{
-				setState(392);
-				if (!(notLineTerminator())) throw new FailedPredicateException(this, "notLineTerminator()");
-				setState(393);
-				expressionSequence();
-				}
-				break;
-			}
-			setState(396);
-			eos();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class WithStatementContext extends ParserRuleContext {
-		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);
-		}
-		public WithStatementContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final WithStatementContext withStatement() throws RecognitionException {
-		WithStatementContext _localctx = new WithStatementContext(_ctx, getState());
-		enterRule(_localctx, 60, RULE_withStatement);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(398);
-			match(With);
-			setState(399);
-			match(OpenParen);
-			setState(400);
-			expressionSequence();
-			setState(401);
-			match(CloseParen);
-			setState(402);
-			statement();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class SwitchStatementContext extends ParserRuleContext {
-		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);
-		}
-		public SwitchStatementContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final SwitchStatementContext switchStatement() throws RecognitionException {
-		SwitchStatementContext _localctx = new SwitchStatementContext(_ctx, getState());
-		enterRule(_localctx, 62, RULE_switchStatement);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(404);
-			match(Switch);
-			setState(405);
-			match(OpenParen);
-			setState(406);
-			expressionSequence();
-			setState(407);
-			match(CloseParen);
-			setState(408);
-			caseBlock();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class CaseBlockContext extends ParserRuleContext {
-		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);
-		}
-		public CaseBlockContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final CaseBlockContext caseBlock() throws RecognitionException {
-		CaseBlockContext _localctx = new CaseBlockContext(_ctx, getState());
-		enterRule(_localctx, 64, RULE_caseBlock);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(410);
-			match(OpenBrace);
-			setState(412);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==Case) {
-				{
-				setState(411);
-				caseClauses();
-				}
-			}
-
-			setState(418);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==Default) {
-				{
-				setState(414);
-				defaultClause();
-				setState(416);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (_la==Case) {
-					{
-					setState(415);
-					caseClauses();
-					}
-				}
-
-				}
-			}
-
-			setState(420);
-			match(CloseBrace);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class CaseClausesContext extends ParserRuleContext {
-		public List<CaseClauseContext> caseClause() {
-			return getRuleContexts(CaseClauseContext.class);
-		}
-		public CaseClauseContext caseClause(int i) {
-			return getRuleContext(CaseClauseContext.class,i);
-		}
-		public CaseClausesContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final CaseClausesContext caseClauses() throws RecognitionException {
-		CaseClausesContext _localctx = new CaseClausesContext(_ctx, getState());
-		enterRule(_localctx, 66, RULE_caseClauses);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(423); 
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			do {
-				{
-				{
-				setState(422);
-				caseClause();
-				}
-				}
-				setState(425); 
-				_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 static class CaseClauseContext extends ParserRuleContext {
-		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);
-		}
-		public CaseClauseContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final CaseClauseContext caseClause() throws RecognitionException {
-		CaseClauseContext _localctx = new CaseClauseContext(_ctx, getState());
-		enterRule(_localctx, 68, RULE_caseClause);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(427);
-			match(Case);
-			setState(428);
-			expressionSequence();
-			setState(429);
-			match(Colon);
-			setState(431);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,37,_ctx) ) {
-			case 1:
-				{
-				setState(430);
-				statementList();
-				}
-				break;
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class DefaultClauseContext extends ParserRuleContext {
-		public TerminalNode Default() { return getToken(YJSParser.Default, 0); }
-		public TerminalNode Colon() { return getToken(YJSParser.Colon, 0); }
-		public StatementListContext statementList() {
-			return getRuleContext(StatementListContext.class,0);
-		}
-		public DefaultClauseContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final DefaultClauseContext defaultClause() throws RecognitionException {
-		DefaultClauseContext _localctx = new DefaultClauseContext(_ctx, getState());
-		enterRule(_localctx, 70, RULE_defaultClause);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(433);
-			match(Default);
-			setState(434);
-			match(Colon);
-			setState(436);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,38,_ctx) ) {
-			case 1:
-				{
-				setState(435);
-				statementList();
-				}
-				break;
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class ThrowStatementContext extends ParserRuleContext {
-		public TerminalNode Throw() { return getToken(YJSParser.Throw, 0); }
-		public ExpressionSequenceContext expressionSequence() {
-			return getRuleContext(ExpressionSequenceContext.class,0);
-		}
-		public EosContext eos() {
-			return getRuleContext(EosContext.class,0);
-		}
-		public ThrowStatementContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final ThrowStatementContext throwStatement() throws RecognitionException {
-		ThrowStatementContext _localctx = new ThrowStatementContext(_ctx, getState());
-		enterRule(_localctx, 72, RULE_throwStatement);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(438);
-			match(Throw);
-			setState(439);
-			if (!(notLineTerminator())) throw new FailedPredicateException(this, "notLineTerminator()");
-			setState(440);
-			expressionSequence();
-			setState(441);
-			eos();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class TryStatementContext extends ParserRuleContext {
-		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);
-		}
-		public TryStatementContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final TryStatementContext tryStatement() throws RecognitionException {
-		TryStatementContext _localctx = new TryStatementContext(_ctx, getState());
-		enterRule(_localctx, 74, RULE_tryStatement);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(443);
-			match(Try);
-			setState(444);
-			block();
-			setState(450);
-			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case Catch:
-				{
-				setState(445);
-				catchProduction();
-				setState(447);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (_la==Finally) {
-					{
-					setState(446);
-					finallyProduction();
-					}
-				}
-
-				}
-				break;
-			case Finally:
-				{
-				setState(449);
-				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 static class CatchProductionContext extends ParserRuleContext {
-		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);
-		}
-		public CatchProductionContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final CatchProductionContext catchProduction() throws RecognitionException {
-		CatchProductionContext _localctx = new CatchProductionContext(_ctx, getState());
-		enterRule(_localctx, 76, RULE_catchProduction);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(452);
-			match(Catch);
-			setState(453);
-			match(OpenParen);
-			setState(454);
-			match(Identifier);
-			setState(455);
-			match(CloseParen);
-			setState(456);
-			block();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class FinallyProductionContext extends ParserRuleContext {
-		public TerminalNode Finally() { return getToken(YJSParser.Finally, 0); }
-		public BlockContext block() {
-			return getRuleContext(BlockContext.class,0);
-		}
-		public FinallyProductionContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final FinallyProductionContext finallyProduction() throws RecognitionException {
-		FinallyProductionContext _localctx = new FinallyProductionContext(_ctx, getState());
-		enterRule(_localctx, 78, RULE_finallyProduction);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(458);
-			match(Finally);
-			setState(459);
-			block();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class DebuggerStatementContext extends ParserRuleContext {
-		public TerminalNode Debugger() { return getToken(YJSParser.Debugger, 0); }
-		public EosContext eos() {
-			return getRuleContext(EosContext.class,0);
-		}
-		public DebuggerStatementContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final DebuggerStatementContext debuggerStatement() throws RecognitionException {
-		DebuggerStatementContext _localctx = new DebuggerStatementContext(_ctx, getState());
-		enterRule(_localctx, 80, RULE_debuggerStatement);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(461);
-			match(Debugger);
-			setState(462);
-			eos();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class FunctionDeclarationContext extends ParserRuleContext {
-		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);
-		}
-		public TerminalNode View() { return getToken(YJSParser.View, 0); }
-		public FunctionDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final FunctionDeclarationContext functionDeclaration() throws RecognitionException {
-		FunctionDeclarationContext _localctx = new FunctionDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 82, RULE_functionDeclaration);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(465);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==AtToken) {
-				{
-				setState(464);
-				annotations();
-				}
-			}
-
-			setState(468);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==Export) {
-				{
-				setState(467);
-				match(Export);
-				}
-			}
-
-			setState(470);
-			match(Function);
-			setState(471);
-			match(Identifier);
-			setState(472);
-			match(OpenParen);
-			setState(474);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << OpenBracket) | (1L << OpenBrace) | (1L << Ellipsis))) != 0) || _la==Identifier) {
-				{
-				setState(473);
-				formalParameterList();
-				}
-			}
-
-			setState(476);
-			match(CloseParen);
-			setState(478);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==View) {
-				{
-				setState(477);
-				match(View);
-				}
-			}
-
-			setState(480);
-			match(OpenBrace);
-			setState(481);
-			functionBody();
-			setState(482);
-			match(CloseBrace);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class ClassDeclarationContext extends ParserRuleContext {
-		public TerminalNode Class() { return getToken(YJSParser.Class, 0); }
-		public TerminalNode Identifier() { return getToken(YJSParser.Identifier, 0); }
-		public ClassTailContext classTail() {
-			return getRuleContext(ClassTailContext.class,0);
-		}
-		public ClassDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final ClassDeclarationContext classDeclaration() throws RecognitionException {
-		ClassDeclarationContext _localctx = new ClassDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 84, RULE_classDeclaration);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(484);
-			match(Class);
-			setState(485);
-			match(Identifier);
-			setState(486);
-			classTail();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class ClassTailContext extends ParserRuleContext {
-		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);
-		}
-		public ClassTailContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final ClassTailContext classTail() throws RecognitionException {
-		ClassTailContext _localctx = new ClassTailContext(_ctx, getState());
-		enterRule(_localctx, 86, RULE_classTail);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(490);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==Extends) {
-				{
-				setState(488);
-				match(Extends);
-				setState(489);
-				singleExpression(0);
-				}
-			}
-
-			setState(492);
-			match(OpenBrace);
-			setState(496);
-			_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(493);
-				classElement();
-				}
-				}
-				setState(498);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			setState(499);
-			match(CloseBrace);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class ClassElementContext extends ParserRuleContext {
-		public MethodDefinitionContext methodDefinition() {
-			return getRuleContext(MethodDefinitionContext.class,0);
-		}
-		public TerminalNode Static() { return getToken(YJSParser.Static, 0); }
-		public ClassElementContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final ClassElementContext classElement() throws RecognitionException {
-		ClassElementContext _localctx = new ClassElementContext(_ctx, getState());
-		enterRule(_localctx, 88, RULE_classElement);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(502);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,47,_ctx) ) {
-			case 1:
-				{
-				setState(501);
-				match(Static);
-				}
-				break;
-			}
-			setState(504);
-			methodDefinition();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class MethodDefinitionContext extends ParserRuleContext {
-		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);
-		}
-		public MethodDefinitionContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final MethodDefinitionContext methodDefinition() throws RecognitionException {
-		MethodDefinitionContext _localctx = new MethodDefinitionContext(_ctx, getState());
-		enterRule(_localctx, 90, RULE_methodDefinition);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(506);
-			propertyName();
-			setState(507);
-			match(OpenParen);
-			setState(509);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << OpenBracket) | (1L << OpenBrace) | (1L << Ellipsis))) != 0) || _la==Identifier) {
-				{
-				setState(508);
-				formalParameterList();
-				}
-			}
-
-			setState(511);
-			match(CloseParen);
-			setState(512);
-			match(OpenBrace);
-			setState(513);
-			functionBody();
-			setState(514);
-			match(CloseBrace);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class FormalParameterListContext extends ParserRuleContext {
-		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);
-		}
-		public FormalParameterListContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final FormalParameterListContext formalParameterList() throws RecognitionException {
-		FormalParameterListContext _localctx = new FormalParameterListContext(_ctx, getState());
-		enterRule(_localctx, 92, RULE_formalParameterList);
-		int _la;
-		try {
-			int _alt;
-			setState(531);
-			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case Identifier:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(516);
-				formalParameterArg();
-				setState(521);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,49,_ctx);
-				while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
-					if ( _alt==1 ) {
-						{
-						{
-						setState(517);
-						match(Comma);
-						setState(518);
-						formalParameterArg();
-						}
-						} 
-					}
-					setState(523);
-					_errHandler.sync(this);
-					_alt = getInterpreter().adaptivePredict(_input,49,_ctx);
-				}
-				setState(526);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (_la==Comma) {
-					{
-					setState(524);
-					match(Comma);
-					setState(525);
-					lastFormalParameterArg();
-					}
-				}
-
-				}
-				break;
-			case Ellipsis:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(528);
-				lastFormalParameterArg();
-				}
-				break;
-			case OpenBracket:
-				enterOuterAlt(_localctx, 3);
-				{
-				setState(529);
-				arrayLiteral();
-				}
-				break;
-			case OpenBrace:
-				enterOuterAlt(_localctx, 4);
-				{
-				setState(530);
-				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 static class FormalParameterArgContext extends ParserRuleContext {
-		public TerminalNode Identifier() { return getToken(YJSParser.Identifier, 0); }
-		public TerminalNode Assign() { return getToken(YJSParser.Assign, 0); }
-		public SingleExpressionContext singleExpression() {
-			return getRuleContext(SingleExpressionContext.class,0);
-		}
-		public FormalParameterArgContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final FormalParameterArgContext formalParameterArg() throws RecognitionException {
-		FormalParameterArgContext _localctx = new FormalParameterArgContext(_ctx, getState());
-		enterRule(_localctx, 94, RULE_formalParameterArg);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(533);
-			match(Identifier);
-			setState(536);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==Assign) {
-				{
-				setState(534);
-				match(Assign);
-				setState(535);
-				singleExpression(0);
-				}
-			}
-
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class LastFormalParameterArgContext extends ParserRuleContext {
-		public TerminalNode Ellipsis() { return getToken(YJSParser.Ellipsis, 0); }
-		public TerminalNode Identifier() { return getToken(YJSParser.Identifier, 0); }
-		public LastFormalParameterArgContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final LastFormalParameterArgContext lastFormalParameterArg() throws RecognitionException {
-		LastFormalParameterArgContext _localctx = new LastFormalParameterArgContext(_ctx, getState());
-		enterRule(_localctx, 96, RULE_lastFormalParameterArg);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(538);
-			match(Ellipsis);
-			setState(539);
-			match(Identifier);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class FunctionBodyContext extends ParserRuleContext {
-		public SourceElementsContext sourceElements() {
-			return getRuleContext(SourceElementsContext.class,0);
-		}
-		public FunctionBodyContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final FunctionBodyContext functionBody() throws RecognitionException {
-		FunctionBodyContext _localctx = new FunctionBodyContext(_ctx, getState());
-		enterRule(_localctx, 98, RULE_functionBody);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(542);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,53,_ctx) ) {
-			case 1:
-				{
-				setState(541);
-				sourceElements();
-				}
-				break;
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class SourceElementsContext extends ParserRuleContext {
-		public List<SourceElementContext> sourceElement() {
-			return getRuleContexts(SourceElementContext.class);
-		}
-		public SourceElementContext sourceElement(int i) {
-			return getRuleContext(SourceElementContext.class,i);
-		}
-		public SourceElementsContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final SourceElementsContext sourceElements() throws RecognitionException {
-		SourceElementsContext _localctx = new SourceElementsContext(_ctx, getState());
-		enterRule(_localctx, 100, RULE_sourceElements);
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(545); 
-			_errHandler.sync(this);
-			_alt = 1;
-			do {
-				switch (_alt) {
-				case 1:
-					{
-					{
-					setState(544);
-					sourceElement();
-					}
-					}
-					break;
-				default:
-					throw new NoViableAltException(this);
-				}
-				setState(547); 
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,54,_ctx);
-			} while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER );
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class ArrayLiteralContext extends ParserRuleContext {
-		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);
-		}
-		public ArrayLiteralContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final ArrayLiteralContext arrayLiteral() throws RecognitionException {
-		ArrayLiteralContext _localctx = new ArrayLiteralContext(_ctx, getState());
-		enterRule(_localctx, 102, RULE_arrayLiteral);
-		int _la;
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(549);
-			match(OpenBracket);
-			setState(553);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,55,_ctx);
-			while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					{
-					{
-					setState(550);
-					match(Comma);
-					}
-					} 
-				}
-				setState(555);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,55,_ctx);
-			}
-			setState(557);
-			_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(556);
-				elementList();
-				}
-			}
-
-			setState(562);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (_la==Comma) {
-				{
-				{
-				setState(559);
-				match(Comma);
-				}
-				}
-				setState(564);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			setState(565);
-			match(CloseBracket);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class ElementListContext extends ParserRuleContext {
-		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);
-		}
-		public ElementListContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final ElementListContext elementList() throws RecognitionException {
-		ElementListContext _localctx = new ElementListContext(_ctx, getState());
-		enterRule(_localctx, 104, RULE_elementList);
-		int _la;
-		try {
-			int _alt;
-			setState(588);
-			_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(567);
-				singleExpression(0);
-				setState(576);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,59,_ctx);
-				while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
-					if ( _alt==1 ) {
-						{
-						{
-						setState(569); 
-						_errHandler.sync(this);
-						_la = _input.LA(1);
-						do {
-							{
-							{
-							setState(568);
-							match(Comma);
-							}
-							}
-							setState(571); 
-							_errHandler.sync(this);
-							_la = _input.LA(1);
-						} while ( _la==Comma );
-						setState(573);
-						singleExpression(0);
-						}
-						} 
-					}
-					setState(578);
-					_errHandler.sync(this);
-					_alt = getInterpreter().adaptivePredict(_input,59,_ctx);
-				}
-				setState(585);
-				_errHandler.sync(this);
-				switch ( getInterpreter().adaptivePredict(_input,61,_ctx) ) {
-				case 1:
-					{
-					setState(580); 
-					_errHandler.sync(this);
-					_la = _input.LA(1);
-					do {
-						{
-						{
-						setState(579);
-						match(Comma);
-						}
-						}
-						setState(582); 
-						_errHandler.sync(this);
-						_la = _input.LA(1);
-					} while ( _la==Comma );
-					setState(584);
-					lastElement();
-					}
-					break;
-				}
-				}
-				break;
-			case Ellipsis:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(587);
-				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 static class LastElementContext extends ParserRuleContext {
-		public TerminalNode Ellipsis() { return getToken(YJSParser.Ellipsis, 0); }
-		public TerminalNode Identifier() { return getToken(YJSParser.Identifier, 0); }
-		public LastElementContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final LastElementContext lastElement() throws RecognitionException {
-		LastElementContext _localctx = new LastElementContext(_ctx, getState());
-		enterRule(_localctx, 106, RULE_lastElement);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(590);
-			match(Ellipsis);
-			setState(591);
-			match(Identifier);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class ObjectLiteralContext extends ParserRuleContext {
-		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);
-		}
-		public ObjectLiteralContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final ObjectLiteralContext objectLiteral() throws RecognitionException {
-		ObjectLiteralContext _localctx = new ObjectLiteralContext(_ctx, getState());
-		enterRule(_localctx, 108, RULE_objectLiteral);
-		int _la;
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(593);
-			match(OpenBrace);
-			setState(602);
-			_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(594);
-				propertyAssignment();
-				setState(599);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,63,_ctx);
-				while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
-					if ( _alt==1 ) {
-						{
-						{
-						setState(595);
-						match(Comma);
-						setState(596);
-						propertyAssignment();
-						}
-						} 
-					}
-					setState(601);
-					_errHandler.sync(this);
-					_alt = getInterpreter().adaptivePredict(_input,63,_ctx);
-				}
-				}
-			}
-
-			setState(605);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==Comma) {
-				{
-				setState(604);
-				match(Comma);
-				}
-			}
-
-			setState(607);
-			match(CloseBrace);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class PropertyAssignmentContext extends ParserRuleContext {
-		public PropertyAssignmentContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_propertyAssignment; }
-	 
-		public PropertyAssignmentContext() { }
-		public void copyFrom(PropertyAssignmentContext ctx) {
-			super.copyFrom(ctx);
-		}
-	}
-	public static class PropertyExpressionAssignmentContext extends PropertyAssignmentContext {
-		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); }
-		public PropertyExpressionAssignmentContext(PropertyAssignmentContext ctx) { copyFrom(ctx); }
-		@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 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); }
-		public ComputedPropertyExpressionAssignmentContext(PropertyAssignmentContext ctx) { copyFrom(ctx); }
-		@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 TerminalNode Identifier() { return getToken(YJSParser.Identifier, 0); }
-		public PropertyShorthandContext(PropertyAssignmentContext ctx) { copyFrom(ctx); }
-		@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 final PropertyAssignmentContext propertyAssignment() throws RecognitionException {
-		PropertyAssignmentContext _localctx = new PropertyAssignmentContext(_ctx, getState());
-		enterRule(_localctx, 110, RULE_propertyAssignment);
-		int _la;
-		try {
-			setState(620);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,66,_ctx) ) {
-			case 1:
-				_localctx = new PropertyExpressionAssignmentContext(_localctx);
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(609);
-				propertyName();
-				setState(610);
-				_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(611);
-				singleExpression(0);
-				}
-				break;
-			case 2:
-				_localctx = new ComputedPropertyExpressionAssignmentContext(_localctx);
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(613);
-				match(OpenBracket);
-				setState(614);
-				singleExpression(0);
-				setState(615);
-				match(CloseBracket);
-				setState(616);
-				match(Colon);
-				setState(617);
-				singleExpression(0);
-				}
-				break;
-			case 3:
-				_localctx = new PropertyShorthandContext(_localctx);
-				enterOuterAlt(_localctx, 3);
-				{
-				setState(619);
-				match(Identifier);
-				}
-				break;
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class PropertyNameContext extends ParserRuleContext {
-		public IdentifierNameContext identifierName() {
-			return getRuleContext(IdentifierNameContext.class,0);
-		}
-		public TerminalNode StringLiteral() { return getToken(YJSParser.StringLiteral, 0); }
-		public NumericLiteralContext numericLiteral() {
-			return getRuleContext(NumericLiteralContext.class,0);
-		}
-		public PropertyNameContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final PropertyNameContext propertyName() throws RecognitionException {
-		PropertyNameContext _localctx = new PropertyNameContext(_ctx, getState());
-		enterRule(_localctx, 112, RULE_propertyName);
-		try {
-			setState(625);
-			_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(622);
-				identifierName();
-				}
-				break;
-			case StringLiteral:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(623);
-				match(StringLiteral);
-				}
-				break;
-			case DecimalLiteral:
-			case HexIntegerLiteral:
-			case OctalIntegerLiteral:
-			case OctalIntegerLiteral2:
-			case BinaryIntegerLiteral:
-				enterOuterAlt(_localctx, 3);
-				{
-				setState(624);
-				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 static class ArgumentsContext extends ParserRuleContext {
-		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);
-		}
-		public ArgumentsContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final ArgumentsContext arguments() throws RecognitionException {
-		ArgumentsContext _localctx = new ArgumentsContext(_ctx, getState());
-		enterRule(_localctx, 114, RULE_arguments);
-		int _la;
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(627);
-			match(OpenParen);
-			setState(641);
-			_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(628);
-				singleExpression(0);
-				setState(633);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,68,_ctx);
-				while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
-					if ( _alt==1 ) {
-						{
-						{
-						setState(629);
-						match(Comma);
-						setState(630);
-						singleExpression(0);
-						}
-						} 
-					}
-					setState(635);
-					_errHandler.sync(this);
-					_alt = getInterpreter().adaptivePredict(_input,68,_ctx);
-				}
-				setState(638);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (_la==Comma) {
-					{
-					setState(636);
-					match(Comma);
-					setState(637);
-					lastArgument();
-					}
-				}
-
-				}
-				break;
-			case Ellipsis:
-				{
-				setState(640);
-				lastArgument();
-				}
-				break;
-			case CloseParen:
-				break;
-			default:
-				break;
-			}
-			setState(643);
-			match(CloseParen);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class LastArgumentContext extends ParserRuleContext {
-		public TerminalNode Ellipsis() { return getToken(YJSParser.Ellipsis, 0); }
-		public TerminalNode Identifier() { return getToken(YJSParser.Identifier, 0); }
-		public LastArgumentContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final LastArgumentContext lastArgument() throws RecognitionException {
-		LastArgumentContext _localctx = new LastArgumentContext(_ctx, getState());
-		enterRule(_localctx, 116, RULE_lastArgument);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(645);
-			match(Ellipsis);
-			setState(646);
-			match(Identifier);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class ExpressionSequenceContext extends ParserRuleContext {
-		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);
-		}
-		public ExpressionSequenceContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final ExpressionSequenceContext expressionSequence() throws RecognitionException {
-		ExpressionSequenceContext _localctx = new ExpressionSequenceContext(_ctx, getState());
-		enterRule(_localctx, 118, RULE_expressionSequence);
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(648);
-			singleExpression(0);
-			setState(653);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,71,_ctx);
-			while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					{
-					{
-					setState(649);
-					match(Comma);
-					setState(650);
-					singleExpression(0);
-					}
-					} 
-				}
-				setState(655);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,71,_ctx);
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class SingleExpressionContext extends ParserRuleContext {
-		public SingleExpressionContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_singleExpression; }
-	 
-		public SingleExpressionContext() { }
-		public void copyFrom(SingleExpressionContext ctx) {
-			super.copyFrom(ctx);
-		}
-	}
-	public static class TemplateStringExpressionContext extends SingleExpressionContext {
-		public SingleExpressionContext singleExpression() {
-			return getRuleContext(SingleExpressionContext.class,0);
-		}
-		public TerminalNode TemplateStringLiteral() { return getToken(YJSParser.TemplateStringLiteral, 0); }
-		public TemplateStringExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 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); }
-		public TernaryExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 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); }
-		public LogicalAndExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 TerminalNode PlusPlus() { return getToken(YJSParser.PlusPlus, 0); }
-		public SingleExpressionContext singleExpression() {
-			return getRuleContext(SingleExpressionContext.class,0);
-		}
-		public PreIncrementExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 ObjectLiteralContext objectLiteral() {
-			return getRuleContext(ObjectLiteralContext.class,0);
-		}
-		public ObjectLiteralExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 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); }
-		public InExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 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); }
-		public LogicalOrExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 TerminalNode Not() { return getToken(YJSParser.Not, 0); }
-		public SingleExpressionContext singleExpression() {
-			return getRuleContext(SingleExpressionContext.class,0);
-		}
-		public NotExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 TerminalNode MinusMinus() { return getToken(YJSParser.MinusMinus, 0); }
-		public SingleExpressionContext singleExpression() {
-			return getRuleContext(SingleExpressionContext.class,0);
-		}
-		public PreDecreaseExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 SingleExpressionContext singleExpression() {
-			return getRuleContext(SingleExpressionContext.class,0);
-		}
-		public ArgumentsContext arguments() {
-			return getRuleContext(ArgumentsContext.class,0);
-		}
-		public ArgumentsExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 TerminalNode This() { return getToken(YJSParser.This, 0); }
-		public ThisExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 TerminalNode Minus() { return getToken(YJSParser.Minus, 0); }
-		public SingleExpressionContext singleExpression() {
-			return getRuleContext(SingleExpressionContext.class,0);
-		}
-		public UnaryMinusExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 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); }
-		public AssignmentExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 SingleExpressionContext singleExpression() {
-			return getRuleContext(SingleExpressionContext.class,0);
-		}
-		public TerminalNode MinusMinus() { return getToken(YJSParser.MinusMinus, 0); }
-		public PostDecreaseExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 TerminalNode Typeof() { return getToken(YJSParser.Typeof, 0); }
-		public SingleExpressionContext singleExpression() {
-			return getRuleContext(SingleExpressionContext.class,0);
-		}
-		public TypeofExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 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); }
-		public InstanceofExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 TerminalNode Plus() { return getToken(YJSParser.Plus, 0); }
-		public SingleExpressionContext singleExpression() {
-			return getRuleContext(SingleExpressionContext.class,0);
-		}
-		public UnaryPlusExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 ArrowFunctionParametersContext arrowFunctionParameters() {
-			return getRuleContext(ArrowFunctionParametersContext.class,0);
-		}
-		public TerminalNode ARROW() { return getToken(YJSParser.ARROW, 0); }
-		public ArrowFunctionBodyContext arrowFunctionBody() {
-			return getRuleContext(ArrowFunctionBodyContext.class,0);
-		}
-		public ArrowFunctionExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 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); }
-		public EqualityExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 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); }
-		public BitXOrExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 TerminalNode Super() { return getToken(YJSParser.Super, 0); }
-		public SuperExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 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); }
-		public MultiplicativeExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 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); }
-		public BitShiftExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 TerminalNode OpenParen() { return getToken(YJSParser.OpenParen, 0); }
-		public ExpressionSequenceContext expressionSequence() {
-			return getRuleContext(ExpressionSequenceContext.class,0);
-		}
-		public TerminalNode CloseParen() { return getToken(YJSParser.CloseParen, 0); }
-		public ParenthesizedExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 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); }
-		public AdditiveExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 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); }
-		public RelationalExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 SingleExpressionContext singleExpression() {
-			return getRuleContext(SingleExpressionContext.class,0);
-		}
-		public TerminalNode PlusPlus() { return getToken(YJSParser.PlusPlus, 0); }
-		public PostIncrementExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 TerminalNode BitNot() { return getToken(YJSParser.BitNot, 0); }
-		public SingleExpressionContext singleExpression() {
-			return getRuleContext(SingleExpressionContext.class,0);
-		}
-		public BitNotExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 TerminalNode New() { return getToken(YJSParser.New, 0); }
-		public SingleExpressionContext singleExpression() {
-			return getRuleContext(SingleExpressionContext.class,0);
-		}
-		public ArgumentsContext arguments() {
-			return getRuleContext(ArgumentsContext.class,0);
-		}
-		public NewExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 LiteralContext literal() {
-			return getRuleContext(LiteralContext.class,0);
-		}
-		public LiteralExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 ArrayLiteralContext arrayLiteral() {
-			return getRuleContext(ArrayLiteralContext.class,0);
-		}
-		public ArrayLiteralExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 SingleExpressionContext singleExpression() {
-			return getRuleContext(SingleExpressionContext.class,0);
-		}
-		public TerminalNode Dot() { return getToken(YJSParser.Dot, 0); }
-		public IdentifierNameContext identifierName() {
-			return getRuleContext(IdentifierNameContext.class,0);
-		}
-		public MemberDotExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 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); }
-		public MemberIndexExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 TerminalNode Identifier() { return getToken(YJSParser.Identifier, 0); }
-		public IdentifierExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 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); }
-		public BitAndExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 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); }
-		public BitOrExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 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);
-		}
-		public AssignmentOperatorExpressionContext(SingleExpressionContext ctx) { copyFrom(ctx); }
-		@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 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 = 120;
-		enterRecursionRule(_localctx, 120, RULE_singleExpression, _p);
-		int _la;
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(690);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,73,_ctx) ) {
-			case 1:
-				{
-				_localctx = new NewExpressionContext(_localctx);
-				_ctx = _localctx;
-				_prevctx = _localctx;
-
-				setState(657);
-				match(New);
-				setState(658);
-				singleExpression(0);
-				setState(660);
-				_errHandler.sync(this);
-				switch ( getInterpreter().adaptivePredict(_input,72,_ctx) ) {
-				case 1:
-					{
-					setState(659);
-					arguments();
-					}
-					break;
-				}
-				}
-				break;
-			case 2:
-				{
-				_localctx = new TypeofExpressionContext(_localctx);
-				_ctx = _localctx;
-				_prevctx = _localctx;
-				setState(662);
-				match(Typeof);
-				setState(663);
-				singleExpression(31);
-				}
-				break;
-			case 3:
-				{
-				_localctx = new PreIncrementExpressionContext(_localctx);
-				_ctx = _localctx;
-				_prevctx = _localctx;
-				setState(664);
-				match(PlusPlus);
-				setState(665);
-				singleExpression(30);
-				}
-				break;
-			case 4:
-				{
-				_localctx = new PreDecreaseExpressionContext(_localctx);
-				_ctx = _localctx;
-				_prevctx = _localctx;
-				setState(666);
-				match(MinusMinus);
-				setState(667);
-				singleExpression(29);
-				}
-				break;
-			case 5:
-				{
-				_localctx = new UnaryPlusExpressionContext(_localctx);
-				_ctx = _localctx;
-				_prevctx = _localctx;
-				setState(668);
-				match(Plus);
-				setState(669);
-				singleExpression(28);
-				}
-				break;
-			case 6:
-				{
-				_localctx = new UnaryMinusExpressionContext(_localctx);
-				_ctx = _localctx;
-				_prevctx = _localctx;
-				setState(670);
-				match(Minus);
-				setState(671);
-				singleExpression(27);
-				}
-				break;
-			case 7:
-				{
-				_localctx = new BitNotExpressionContext(_localctx);
-				_ctx = _localctx;
-				_prevctx = _localctx;
-				setState(672);
-				match(BitNot);
-				setState(673);
-				singleExpression(26);
-				}
-				break;
-			case 8:
-				{
-				_localctx = new NotExpressionContext(_localctx);
-				_ctx = _localctx;
-				_prevctx = _localctx;
-				setState(674);
-				match(Not);
-				setState(675);
-				singleExpression(25);
-				}
-				break;
-			case 9:
-				{
-				_localctx = new ThisExpressionContext(_localctx);
-				_ctx = _localctx;
-				_prevctx = _localctx;
-				setState(676);
-				match(This);
-				}
-				break;
-			case 10:
-				{
-				_localctx = new IdentifierExpressionContext(_localctx);
-				_ctx = _localctx;
-				_prevctx = _localctx;
-				setState(677);
-				match(Identifier);
-				}
-				break;
-			case 11:
-				{
-				_localctx = new SuperExpressionContext(_localctx);
-				_ctx = _localctx;
-				_prevctx = _localctx;
-				setState(678);
-				match(Super);
-				}
-				break;
-			case 12:
-				{
-				_localctx = new LiteralExpressionContext(_localctx);
-				_ctx = _localctx;
-				_prevctx = _localctx;
-				setState(679);
-				literal();
-				}
-				break;
-			case 13:
-				{
-				_localctx = new ArrayLiteralExpressionContext(_localctx);
-				_ctx = _localctx;
-				_prevctx = _localctx;
-				setState(680);
-				arrayLiteral();
-				}
-				break;
-			case 14:
-				{
-				_localctx = new ObjectLiteralExpressionContext(_localctx);
-				_ctx = _localctx;
-				_prevctx = _localctx;
-				setState(681);
-				objectLiteral();
-				}
-				break;
-			case 15:
-				{
-				_localctx = new ParenthesizedExpressionContext(_localctx);
-				_ctx = _localctx;
-				_prevctx = _localctx;
-				setState(682);
-				match(OpenParen);
-				setState(683);
-				expressionSequence();
-				setState(684);
-				match(CloseParen);
-				}
-				break;
-			case 16:
-				{
-				_localctx = new ArrowFunctionExpressionContext(_localctx);
-				_ctx = _localctx;
-				_prevctx = _localctx;
-				setState(686);
-				arrowFunctionParameters();
-				setState(687);
-				match(ARROW);
-				setState(688);
-				arrowFunctionBody();
-				}
-				break;
-			}
-			_ctx.stop = _input.LT(-1);
-			setState(761);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,75,_ctx);
-			while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					if ( _parseListeners!=null ) triggerExitRuleEvent();
-					_prevctx = _localctx;
-					{
-					setState(759);
-					_errHandler.sync(this);
-					switch ( getInterpreter().adaptivePredict(_input,74,_ctx) ) {
-					case 1:
-						{
-						_localctx = new MultiplicativeExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
-						setState(692);
-						if (!(precpred(_ctx, 24))) throw new FailedPredicateException(this, "precpred(_ctx, 24)");
-						setState(693);
-						_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(694);
-						singleExpression(25);
-						}
-						break;
-					case 2:
-						{
-						_localctx = new AdditiveExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
-						setState(695);
-						if (!(precpred(_ctx, 23))) throw new FailedPredicateException(this, "precpred(_ctx, 23)");
-						setState(696);
-						_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(697);
-						singleExpression(24);
-						}
-						break;
-					case 3:
-						{
-						_localctx = new BitShiftExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
-						setState(698);
-						if (!(precpred(_ctx, 22))) throw new FailedPredicateException(this, "precpred(_ctx, 22)");
-						setState(699);
-						_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(700);
-						singleExpression(23);
-						}
-						break;
-					case 4:
-						{
-						_localctx = new RelationalExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
-						setState(701);
-						if (!(precpred(_ctx, 21))) throw new FailedPredicateException(this, "precpred(_ctx, 21)");
-						setState(702);
-						_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(703);
-						singleExpression(22);
-						}
-						break;
-					case 5:
-						{
-						_localctx = new InstanceofExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
-						setState(704);
-						if (!(precpred(_ctx, 20))) throw new FailedPredicateException(this, "precpred(_ctx, 20)");
-						setState(705);
-						match(Instanceof);
-						setState(706);
-						singleExpression(21);
-						}
-						break;
-					case 6:
-						{
-						_localctx = new InExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
-						setState(707);
-						if (!(precpred(_ctx, 19))) throw new FailedPredicateException(this, "precpred(_ctx, 19)");
-						setState(708);
-						match(In);
-						setState(709);
-						singleExpression(20);
-						}
-						break;
-					case 7:
-						{
-						_localctx = new EqualityExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
-						setState(710);
-						if (!(precpred(_ctx, 18))) throw new FailedPredicateException(this, "precpred(_ctx, 18)");
-						setState(711);
-						_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(712);
-						singleExpression(19);
-						}
-						break;
-					case 8:
-						{
-						_localctx = new BitAndExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
-						setState(713);
-						if (!(precpred(_ctx, 17))) throw new FailedPredicateException(this, "precpred(_ctx, 17)");
-						setState(714);
-						match(BitAnd);
-						setState(715);
-						singleExpression(18);
-						}
-						break;
-					case 9:
-						{
-						_localctx = new BitXOrExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
-						setState(716);
-						if (!(precpred(_ctx, 16))) throw new FailedPredicateException(this, "precpred(_ctx, 16)");
-						setState(717);
-						match(BitXOr);
-						setState(718);
-						singleExpression(17);
-						}
-						break;
-					case 10:
-						{
-						_localctx = new BitOrExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
-						setState(719);
-						if (!(precpred(_ctx, 15))) throw new FailedPredicateException(this, "precpred(_ctx, 15)");
-						setState(720);
-						match(BitOr);
-						setState(721);
-						singleExpression(16);
-						}
-						break;
-					case 11:
-						{
-						_localctx = new LogicalAndExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
-						setState(722);
-						if (!(precpred(_ctx, 14))) throw new FailedPredicateException(this, "precpred(_ctx, 14)");
-						setState(723);
-						match(And);
-						setState(724);
-						singleExpression(15);
-						}
-						break;
-					case 12:
-						{
-						_localctx = new LogicalOrExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
-						setState(725);
-						if (!(precpred(_ctx, 13))) throw new FailedPredicateException(this, "precpred(_ctx, 13)");
-						setState(726);
-						match(Or);
-						setState(727);
-						singleExpression(14);
-						}
-						break;
-					case 13:
-						{
-						_localctx = new TernaryExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
-						setState(728);
-						if (!(precpred(_ctx, 12))) throw new FailedPredicateException(this, "precpred(_ctx, 12)");
-						setState(729);
-						match(QuestionMark);
-						setState(730);
-						singleExpression(0);
-						setState(731);
-						match(Colon);
-						setState(732);
-						singleExpression(13);
-						}
-						break;
-					case 14:
-						{
-						_localctx = new AssignmentExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
-						setState(734);
-						if (!(precpred(_ctx, 11))) throw new FailedPredicateException(this, "precpred(_ctx, 11)");
-						setState(735);
-						match(Assign);
-						setState(736);
-						singleExpression(12);
-						}
-						break;
-					case 15:
-						{
-						_localctx = new AssignmentOperatorExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
-						setState(737);
-						if (!(precpred(_ctx, 10))) throw new FailedPredicateException(this, "precpred(_ctx, 10)");
-						setState(738);
-						assignmentOperator();
-						setState(739);
-						singleExpression(11);
-						}
-						break;
-					case 16:
-						{
-						_localctx = new MemberIndexExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
-						setState(741);
-						if (!(precpred(_ctx, 37))) throw new FailedPredicateException(this, "precpred(_ctx, 37)");
-						setState(742);
-						match(OpenBracket);
-						setState(743);
-						expressionSequence();
-						setState(744);
-						match(CloseBracket);
-						}
-						break;
-					case 17:
-						{
-						_localctx = new MemberDotExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
-						setState(746);
-						if (!(precpred(_ctx, 36))) throw new FailedPredicateException(this, "precpred(_ctx, 36)");
-						setState(747);
-						match(Dot);
-						setState(748);
-						identifierName();
-						}
-						break;
-					case 18:
-						{
-						_localctx = new ArgumentsExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
-						setState(749);
-						if (!(precpred(_ctx, 35))) throw new FailedPredicateException(this, "precpred(_ctx, 35)");
-						setState(750);
-						arguments();
-						}
-						break;
-					case 19:
-						{
-						_localctx = new PostIncrementExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
-						setState(751);
-						if (!(precpred(_ctx, 33))) throw new FailedPredicateException(this, "precpred(_ctx, 33)");
-						setState(752);
-						if (!(notLineTerminator())) throw new FailedPredicateException(this, "notLineTerminator()");
-						setState(753);
-						match(PlusPlus);
-						}
-						break;
-					case 20:
-						{
-						_localctx = new PostDecreaseExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
-						setState(754);
-						if (!(precpred(_ctx, 32))) throw new FailedPredicateException(this, "precpred(_ctx, 32)");
-						setState(755);
-						if (!(notLineTerminator())) throw new FailedPredicateException(this, "notLineTerminator()");
-						setState(756);
-						match(MinusMinus);
-						}
-						break;
-					case 21:
-						{
-						_localctx = new TemplateStringExpressionContext(new SingleExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_singleExpression);
-						setState(757);
-						if (!(precpred(_ctx, 9))) throw new FailedPredicateException(this, "precpred(_ctx, 9)");
-						setState(758);
-						match(TemplateStringLiteral);
-						}
-						break;
-					}
-					} 
-				}
-				setState(763);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,75,_ctx);
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			unrollRecursionContexts(_parentctx);
-		}
-		return _localctx;
-	}
-
-	public static class ArrowFunctionParametersContext extends ParserRuleContext {
-		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);
-		}
-		public ArrowFunctionParametersContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final ArrowFunctionParametersContext arrowFunctionParameters() throws RecognitionException {
-		ArrowFunctionParametersContext _localctx = new ArrowFunctionParametersContext(_ctx, getState());
-		enterRule(_localctx, 122, RULE_arrowFunctionParameters);
-		int _la;
-		try {
-			setState(770);
-			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case Identifier:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(764);
-				match(Identifier);
-				}
-				break;
-			case OpenParen:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(765);
-				match(OpenParen);
-				setState(767);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << OpenBracket) | (1L << OpenBrace) | (1L << Ellipsis))) != 0) || _la==Identifier) {
-					{
-					setState(766);
-					formalParameterList();
-					}
-				}
-
-				setState(769);
-				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 static class ArrowFunctionBodyContext extends ParserRuleContext {
-		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); }
-		public ArrowFunctionBodyContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final ArrowFunctionBodyContext arrowFunctionBody() throws RecognitionException {
-		ArrowFunctionBodyContext _localctx = new ArrowFunctionBodyContext(_ctx, getState());
-		enterRule(_localctx, 124, RULE_arrowFunctionBody);
-		try {
-			setState(777);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,78,_ctx) ) {
-			case 1:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(772);
-				singleExpression(0);
-				}
-				break;
-			case 2:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(773);
-				match(OpenBrace);
-				setState(774);
-				functionBody();
-				setState(775);
-				match(CloseBrace);
-				}
-				break;
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public static class AssignmentOperatorContext extends ParserRuleContext {
-		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); }
-		public AssignmentOperatorContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final AssignmentOperatorContext assignmentOperator() throws RecognitionException {
-		AssignmentOperatorContext _localctx = new AssignmentOperatorContext(_ctx, getState());
-		enterRule(_localctx, 126, RULE_assignmentOperator);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(779);
-			_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 static class LiteralContext extends ParserRuleContext {
-		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);
-		}
-		public LiteralContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final LiteralContext literal() throws RecognitionException {
-		LiteralContext _localctx = new LiteralContext(_ctx, getState());
-		enterRule(_localctx, 128, RULE_literal);
-		try {
-			setState(787);
-			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case NullLiteral:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(781);
-				match(NullLiteral);
-				}
-				break;
-			case BooleanLiteral:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(782);
-				match(BooleanLiteral);
-				}
-				break;
-			case StringLiteral:
-				enterOuterAlt(_localctx, 3);
-				{
-				setState(783);
-				match(StringLiteral);
-				}
-				break;
-			case TemplateStringLiteral:
-				enterOuterAlt(_localctx, 4);
-				{
-				setState(784);
-				match(TemplateStringLiteral);
-				}
-				break;
-			case RegularExpressionLiteral:
-				enterOuterAlt(_localctx, 5);
-				{
-				setState(785);
-				match(RegularExpressionLiteral);
-				}
-				break;
-			case DecimalLiteral:
-			case HexIntegerLiteral:
-			case OctalIntegerLiteral:
-			case OctalIntegerLiteral2:
-			case BinaryIntegerLiteral:
-				enterOuterAlt(_localctx, 6);
-				{
-				setState(786);
-				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 static class NumericLiteralContext extends ParserRuleContext {
-		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); }
-		public NumericLiteralContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final NumericLiteralContext numericLiteral() throws RecognitionException {
-		NumericLiteralContext _localctx = new NumericLiteralContext(_ctx, getState());
-		enterRule(_localctx, 130, RULE_numericLiteral);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(789);
-			_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 static class IdentifierNameContext extends ParserRuleContext {
-		public TerminalNode Identifier() { return getToken(YJSParser.Identifier, 0); }
-		public ReservedWordContext reservedWord() {
-			return getRuleContext(ReservedWordContext.class,0);
-		}
-		public IdentifierNameContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final IdentifierNameContext identifierName() throws RecognitionException {
-		IdentifierNameContext _localctx = new IdentifierNameContext(_ctx, getState());
-		enterRule(_localctx, 132, RULE_identifierName);
-		try {
-			setState(793);
-			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case Identifier:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(791);
-				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(792);
-				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 static class ReservedWordContext extends ParserRuleContext {
-		public KeywordContext keyword() {
-			return getRuleContext(KeywordContext.class,0);
-		}
-		public TerminalNode NullLiteral() { return getToken(YJSParser.NullLiteral, 0); }
-		public TerminalNode BooleanLiteral() { return getToken(YJSParser.BooleanLiteral, 0); }
-		public ReservedWordContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final ReservedWordContext reservedWord() throws RecognitionException {
-		ReservedWordContext _localctx = new ReservedWordContext(_ctx, getState());
-		enterRule(_localctx, 134, RULE_reservedWord);
-		try {
-			setState(798);
-			_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(795);
-				keyword();
-				}
-				break;
-			case NullLiteral:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(796);
-				match(NullLiteral);
-				}
-				break;
-			case BooleanLiteral:
-				enterOuterAlt(_localctx, 3);
-				{
-				setState(797);
-				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 static class KeywordContext extends ParserRuleContext {
-		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); }
-		public KeywordContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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 final KeywordContext keyword() throws RecognitionException {
-		KeywordContext _localctx = new KeywordContext(_ctx, getState());
-		enterRule(_localctx, 136, RULE_keyword);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(800);
-			_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 static class EosContext extends ParserRuleContext {
-		public TerminalNode SemiColon() { return getToken(YJSParser.SemiColon, 0); }
-		public TerminalNode EOF() { return getToken(YJSParser.EOF, 0); }
-		public EosContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@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);
-		}
-	}
-
-	public final EosContext eos() throws RecognitionException {
-		EosContext _localctx = new EosContext(_ctx, getState());
-		enterRule(_localctx, 138, RULE_eos);
-		try {
-			setState(806);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,82,_ctx) ) {
-			case 1:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(802);
-				match(SemiColon);
-				}
-				break;
-			case 2:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(803);
-				match(EOF);
-				}
-				break;
-			case 3:
-				enterOuterAlt(_localctx, 3);
-				{
-				setState(804);
-				if (!(lineTerminatorAhead())) throw new FailedPredicateException(this, "lineTerminatorAhead()");
-				}
-				break;
-			case 4:
-				enterOuterAlt(_localctx, 4);
-				{
-				setState(805);
-				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 23:
-			return expressionStatement_sempred((ExpressionStatementContext)_localctx, predIndex);
-		case 25:
-			return iterationStatement_sempred((IterationStatementContext)_localctx, predIndex);
-		case 27:
-			return continueStatement_sempred((ContinueStatementContext)_localctx, predIndex);
-		case 28:
-			return breakStatement_sempred((BreakStatementContext)_localctx, predIndex);
-		case 29:
-			return returnStatement_sempred((ReturnStatementContext)_localctx, predIndex);
-		case 36:
-			return throwStatement_sempred((ThrowStatementContext)_localctx, predIndex);
-		case 60:
-			return singleExpression_sempred((SingleExpressionContext)_localctx, predIndex);
-		case 69:
-			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 final String _serializedATN =
-		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3|\u032b\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\3\2\5\2\u0090"+
-		"\n\2\3\2\3\2\3\3\5\3\u0095\n\3\3\3\3\3\3\3\3\3\6\3\u009b\n\3\r\3\16\3"+
-		"\u009c\3\3\3\3\3\4\6\4\u00a2\n\4\r\4\16\4\u00a3\3\5\3\5\3\5\3\5\5\5\u00aa"+
-		"\n\5\3\5\3\5\3\6\3\6\3\6\7\6\u00b1\n\6\f\6\16\6\u00b4\13\6\3\7\3\7\3\7"+
-		"\5\7\u00b9\n\7\3\b\3\b\3\b\3\b\5\b\u00bf\n\b\3\t\5\t\u00c2\n\t\3\t\3\t"+
-		"\3\t\3\t\5\t\u00c8\n\t\3\t\3\t\3\t\3\n\3\n\5\n\u00cf\n\n\3\n\3\n\3\n\3"+
-		"\n\5\n\u00d5\n\n\3\n\3\n\3\n\5\n\u00da\n\n\3\n\3\n\5\n\u00de\n\n\3\13"+
-		"\3\13\3\f\3\f\3\r\3\r\3\16\6\16\u00e7\n\16\r\16\16\16\u00e8\3\17\3\17"+
-		"\3\17\3\17\3\20\3\20\3\20\3\20\3\20\3\21\3\21\3\21\7\21\u00f7\n\21\f\21"+
-		"\16\21\u00fa\13\21\3\22\3\22\3\22\3\22\3\22\3\22\3\22\3\22\3\22\3\22\5"+
-		"\22\u0106\n\22\3\23\3\23\5\23\u010a\n\23\3\23\3\23\3\24\6\24\u010f\n\24"+
-		"\r\24\16\24\u0110\3\25\3\25\3\25\3\25\3\26\3\26\3\26\7\26\u011a\n\26\f"+
-		"\26\16\26\u011d\13\26\3\27\3\27\3\27\5\27\u0122\n\27\3\30\3\30\3\31\3"+
-		"\31\3\31\3\31\3\32\3\32\3\32\3\32\3\32\3\32\3\32\5\32\u0131\n\32\3\33"+
-		"\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33"+
-		"\3\33\3\33\5\33\u0144\n\33\3\33\3\33\5\33\u0148\n\33\3\33\3\33\5\33\u014c"+
-		"\n\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\5\33\u0156\n\33\3\33\3\33"+
-		"\5\33\u015a\n\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\5\33\u0165"+
-		"\n\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\5\33\u0172"+
-		"\n\33\3\33\3\33\3\33\3\33\5\33\u0178\n\33\3\34\3\34\3\35\3\35\3\35\5\35"+
-		"\u017f\n\35\3\35\3\35\3\36\3\36\3\36\5\36\u0186\n\36\3\36\3\36\3\37\3"+
-		"\37\3\37\5\37\u018d\n\37\3\37\3\37\3 \3 \3 \3 \3 \3 \3!\3!\3!\3!\3!\3"+
-		"!\3\"\3\"\5\"\u019f\n\"\3\"\3\"\5\"\u01a3\n\"\5\"\u01a5\n\"\3\"\3\"\3"+
-		"#\6#\u01aa\n#\r#\16#\u01ab\3$\3$\3$\3$\5$\u01b2\n$\3%\3%\3%\5%\u01b7\n"+
-		"%\3&\3&\3&\3&\3&\3\'\3\'\3\'\3\'\5\'\u01c2\n\'\3\'\5\'\u01c5\n\'\3(\3"+
-		"(\3(\3(\3(\3(\3)\3)\3)\3*\3*\3*\3+\5+\u01d4\n+\3+\5+\u01d7\n+\3+\3+\3"+
-		"+\3+\5+\u01dd\n+\3+\3+\5+\u01e1\n+\3+\3+\3+\3+\3,\3,\3,\3,\3-\3-\5-\u01ed"+
-		"\n-\3-\3-\7-\u01f1\n-\f-\16-\u01f4\13-\3-\3-\3.\5.\u01f9\n.\3.\3.\3/\3"+
-		"/\3/\5/\u0200\n/\3/\3/\3/\3/\3/\3\60\3\60\3\60\7\60\u020a\n\60\f\60\16"+
-		"\60\u020d\13\60\3\60\3\60\5\60\u0211\n\60\3\60\3\60\3\60\5\60\u0216\n"+
-		"\60\3\61\3\61\3\61\5\61\u021b\n\61\3\62\3\62\3\62\3\63\5\63\u0221\n\63"+
-		"\3\64\6\64\u0224\n\64\r\64\16\64\u0225\3\65\3\65\7\65\u022a\n\65\f\65"+
-		"\16\65\u022d\13\65\3\65\5\65\u0230\n\65\3\65\7\65\u0233\n\65\f\65\16\65"+
-		"\u0236\13\65\3\65\3\65\3\66\3\66\6\66\u023c\n\66\r\66\16\66\u023d\3\66"+
-		"\7\66\u0241\n\66\f\66\16\66\u0244\13\66\3\66\6\66\u0247\n\66\r\66\16\66"+
-		"\u0248\3\66\5\66\u024c\n\66\3\66\5\66\u024f\n\66\3\67\3\67\3\67\38\38"+
-		"\38\38\78\u0258\n8\f8\168\u025b\138\58\u025d\n8\38\58\u0260\n8\38\38\3"+
-		"9\39\39\39\39\39\39\39\39\39\39\59\u026f\n9\3:\3:\3:\5:\u0274\n:\3;\3"+
-		";\3;\3;\7;\u027a\n;\f;\16;\u027d\13;\3;\3;\5;\u0281\n;\3;\5;\u0284\n;"+
-		"\3;\3;\3<\3<\3<\3=\3=\3=\7=\u028e\n=\f=\16=\u0291\13=\3>\3>\3>\3>\5>\u0297"+
-		"\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>\u02b5\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>\u02fa\n>\f>\16>\u02fd\13>\3?\3?\3?\5?\u0302"+
-		"\n?\3?\5?\u0305\n?\3@\3@\3@\3@\3@\5@\u030c\n@\3A\3A\3B\3B\3B\3B\3B\3B"+
-		"\5B\u0316\nB\3C\3C\3D\3D\5D\u031c\nD\3E\3E\3E\5E\u0321\nE\3F\3F\3G\3G"+
-		"\3G\3G\5G\u0329\nG\3G\2\3zH\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\u008a\u008c\2\16\3\2hk\3\2^_\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?Xaglt\2\u0373"+
-		"\2\u008f\3\2\2\2\4\u0094\3\2\2\2\6\u00a1\3\2\2\2\b\u00a5\3\2\2\2\n\u00ad"+
-		"\3\2\2\2\f\u00b8\3\2\2\2\16\u00be\3\2\2\2\20\u00c1\3\2\2\2\22\u00dd\3"+
-		"\2\2\2\24\u00df\3\2\2\2\26\u00e1\3\2\2\2\30\u00e3\3\2\2\2\32\u00e6\3\2"+
-		"\2\2\34\u00ea\3\2\2\2\36\u00ee\3\2\2\2 \u00f3\3\2\2\2\"\u0105\3\2\2\2"+
-		"$\u0107\3\2\2\2&\u010e\3\2\2\2(\u0112\3\2\2\2*\u0116\3\2\2\2,\u011e\3"+
-		"\2\2\2.\u0123\3\2\2\2\60\u0125\3\2\2\2\62\u0129\3\2\2\2\64\u0177\3\2\2"+
-		"\2\66\u0179\3\2\2\28\u017b\3\2\2\2:\u0182\3\2\2\2<\u0189\3\2\2\2>\u0190"+
-		"\3\2\2\2@\u0196\3\2\2\2B\u019c\3\2\2\2D\u01a9\3\2\2\2F\u01ad\3\2\2\2H"+
-		"\u01b3\3\2\2\2J\u01b8\3\2\2\2L\u01bd\3\2\2\2N\u01c6\3\2\2\2P\u01cc\3\2"+
-		"\2\2R\u01cf\3\2\2\2T\u01d3\3\2\2\2V\u01e6\3\2\2\2X\u01ec\3\2\2\2Z\u01f8"+
-		"\3\2\2\2\\\u01fc\3\2\2\2^\u0215\3\2\2\2`\u0217\3\2\2\2b\u021c\3\2\2\2"+
-		"d\u0220\3\2\2\2f\u0223\3\2\2\2h\u0227\3\2\2\2j\u024e\3\2\2\2l\u0250\3"+
-		"\2\2\2n\u0253\3\2\2\2p\u026e\3\2\2\2r\u0273\3\2\2\2t\u0275\3\2\2\2v\u0287"+
-		"\3\2\2\2x\u028a\3\2\2\2z\u02b4\3\2\2\2|\u0304\3\2\2\2~\u030b\3\2\2\2\u0080"+
-		"\u030d\3\2\2\2\u0082\u0315\3\2\2\2\u0084\u0317\3\2\2\2\u0086\u031b\3\2"+
-		"\2\2\u0088\u0320\3\2\2\2\u008a\u0322\3\2\2\2\u008c\u0328\3\2\2\2\u008e"+
-		"\u0090\5\32\16\2\u008f\u008e\3\2\2\2\u008f\u0090\3\2\2\2\u0090\u0091\3"+
-		"\2\2\2\u0091\u0092\5\4\3\2\u0092\3\3\2\2\2\u0093\u0095\5\6\4\2\u0094\u0093"+
-		"\3\2\2\2\u0094\u0095\3\2\2\2\u0095\u0096\3\2\2\2\u0096\u0097\t\2\2\2\u0097"+
-		"\u0098\7u\2\2\u0098\u009a\7\n\2\2\u0099\u009b\5\16\b\2\u009a\u0099\3\2"+
-		"\2\2\u009b\u009c\3\2\2\2\u009c\u009a\3\2\2\2\u009c\u009d\3\2\2\2\u009d"+
-		"\u009e\3\2\2\2\u009e\u009f\7\13\2\2\u009f\5\3\2\2\2\u00a0\u00a2\5\b\5"+
-		"\2\u00a1\u00a0\3\2\2\2\u00a2\u00a3\3\2\2\2\u00a3\u00a1\3\2\2\2\u00a3\u00a4"+
-		"\3\2\2\2\u00a4\7\3\2\2\2\u00a5\u00a6\7Z\2\2\u00a6\u00a7\7u\2\2\u00a7\u00a9"+
-		"\7\b\2\2\u00a8\u00aa\5\n\6\2\u00a9\u00a8\3\2\2\2\u00a9\u00aa\3\2\2\2\u00aa"+
-		"\u00ab\3\2\2\2\u00ab\u00ac\7\t\2\2\u00ac\t\3\2\2\2\u00ad\u00b2\5\f\7\2"+
-		"\u00ae\u00af\7\r\2\2\u00af\u00b1\5\f\7\2\u00b0\u00ae\3\2\2\2\u00b1\u00b4"+
-		"\3\2\2\2\u00b2\u00b0\3\2\2\2\u00b2\u00b3\3\2\2\2\u00b3\13\3\2\2\2\u00b4"+
-		"\u00b2\3\2\2\2\u00b5\u00b9\5\u0084C\2\u00b6\u00b9\7v\2\2\u00b7\u00b9\5"+
-		"n8\2\u00b8\u00b5\3\2\2\2\u00b8\u00b6\3\2\2\2\u00b8\u00b7\3\2\2\2\u00b9"+
-		"\r\3\2\2\2\u00ba\u00bf\5V,\2\u00bb\u00bf\5T+\2\u00bc\u00bf\5\20\t\2\u00bd"+
-		"\u00bf\5\22\n\2\u00be\u00ba\3\2\2\2\u00be\u00bb\3\2\2\2\u00be\u00bc\3"+
-		"\2\2\2\u00be\u00bd\3\2\2\2\u00bf\17\3\2\2\2\u00c0\u00c2\5\6\4\2\u00c1"+
-		"\u00c0\3\2\2\2\u00c1\u00c2\3\2\2\2\u00c2\u00c3\3\2\2\2\u00c3\u00c4\7p"+
-		"\2\2\u00c4\u00c5\7u\2\2\u00c5\u00c7\7\b\2\2\u00c6\u00c8\5^\60\2\u00c7"+
-		"\u00c6\3\2\2\2\u00c7\u00c8\3\2\2\2\u00c8\u00c9\3\2\2\2\u00c9\u00ca\7\t"+
-		"\2\2\u00ca\u00cb\5\u008cG\2\u00cb\21\3\2\2\2\u00cc\u00ce\7Y\2\2\u00cd"+
-		"\u00cf\5\24\13\2\u00ce\u00cd\3\2\2\2\u00ce\u00cf\3\2\2\2\u00cf\u00d0\3"+
-		"\2\2\2\u00d0\u00d1\7u\2\2\u00d1\u00de\7\f\2\2\u00d2\u00d4\7Y\2\2\u00d3"+
-		"\u00d5\5\24\13\2\u00d4\u00d3\3\2\2\2\u00d4\u00d5\3\2\2\2\u00d5\u00d6\3"+
-		"\2\2\2\u00d6\u00d7\7u\2\2\u00d7\u00d9\7\b\2\2\u00d8\u00da\5\26\f\2\u00d9"+
-		"\u00d8\3\2\2\2\u00d9\u00da\3\2\2\2\u00da\u00db\3\2\2\2\u00db\u00dc\7\t"+
-		"\2\2\u00dc\u00de\7\f\2\2\u00dd\u00cc\3\2\2\2\u00dd\u00d2\3\2\2\2\u00de"+
-		"\23\3\2\2\2\u00df\u00e0\t\3\2\2\u00e0\25\3\2\2\2\u00e1\u00e2\t\4\2\2\u00e2"+
-		"\27\3\2\2\2\u00e3\u00e4\5\"\22\2\u00e4\31\3\2\2\2\u00e5\u00e7\5\34\17"+
-		"\2\u00e6\u00e5\3\2\2\2\u00e7\u00e8\3\2\2\2\u00e8\u00e6\3\2\2\2\u00e8\u00e9"+
-		"\3\2\2\2\u00e9\33\3\2\2\2\u00ea\u00eb\7g\2\2\u00eb\u00ec\7v\2\2\u00ec"+
-		"\u00ed\7\f\2\2\u00ed\35\3\2\2\2\u00ee\u00ef\7f\2\2\u00ef\u00f0\7u\2\2"+
-		"\u00f0\u00f1\5 \21\2\u00f1\u00f2\7\f\2\2\u00f2\37\3\2\2\2\u00f3\u00f8"+
-		"\7:\2\2\u00f4\u00f5\7\22\2\2\u00f5\u00f7\7:\2\2\u00f6\u00f4\3\2\2\2\u00f7"+
-		"\u00fa\3\2\2\2\u00f8\u00f6\3\2\2\2\u00f8\u00f9\3\2\2\2\u00f9!\3\2\2\2"+
-		"\u00fa\u00f8\3\2\2\2\u00fb\u0106\5$\23\2\u00fc\u0106\5(\25\2\u00fd\u0106"+
-		"\5.\30\2\u00fe\u0106\5\60\31\2\u00ff\u0106\5\62\32\2\u0100\u0106\5\64"+
-		"\33\2\u0101\u0106\58\35\2\u0102\u0106\5:\36\2\u0103\u0106\5<\37\2\u0104"+
-		"\u0106\5@!\2\u0105\u00fb\3\2\2\2\u0105\u00fc\3\2\2\2\u0105\u00fd\3\2\2"+
-		"\2\u0105\u00fe\3\2\2\2\u0105\u00ff\3\2\2\2\u0105\u0100\3\2\2\2\u0105\u0101"+
-		"\3\2\2\2\u0105\u0102\3\2\2\2\u0105\u0103\3\2\2\2\u0105\u0104\3\2\2\2\u0106"+
-		"#\3\2\2\2\u0107\u0109\7\n\2\2\u0108\u010a\5&\24\2\u0109\u0108\3\2\2\2"+
-		"\u0109\u010a\3\2\2\2\u010a\u010b\3\2\2\2\u010b\u010c\7\13\2\2\u010c%\3"+
-		"\2\2\2\u010d\u010f\5\"\22\2\u010e\u010d\3\2\2\2\u010f\u0110\3\2\2\2\u0110"+
-		"\u010e\3\2\2\2\u0110\u0111\3\2\2\2\u0111\'\3\2\2\2\u0112\u0113\5\66\34"+
-		"\2\u0113\u0114\5*\26\2\u0114\u0115\5\u008cG\2\u0115)\3\2\2\2\u0116\u011b"+
-		"\5,\27\2\u0117\u0118\7\r\2\2\u0118\u011a\5,\27\2\u0119\u0117\3\2\2\2\u011a"+
-		"\u011d\3\2\2\2\u011b\u0119\3\2\2\2\u011b\u011c\3\2\2\2\u011c+\3\2\2\2"+
-		"\u011d\u011b\3\2\2\2\u011e\u0121\7u\2\2\u011f\u0120\7\16\2\2\u0120\u0122"+
-		"\5z>\2\u0121\u011f\3\2\2\2\u0121\u0122\3\2\2\2\u0122-\3\2\2\2\u0123\u0124"+
-		"\7\f\2\2\u0124/\3\2\2\2\u0125\u0126\6\31\2\2\u0126\u0127\5x=\2\u0127\u0128"+
-		"\5\u008cG\2\u0128\61\3\2\2\2\u0129\u012a\7T\2\2\u012a\u012b\7\b\2\2\u012b"+
-		"\u012c\5x=\2\u012c\u012d\7\t\2\2\u012d\u0130\5\"\22\2\u012e\u012f\7D\2"+
-		"\2\u012f\u0131\5\"\22\2\u0130\u012e\3\2\2\2\u0130\u0131\3\2\2\2\u0131"+
-		"\63\3\2\2\2\u0132\u0133\7@\2\2\u0133\u0134\5\"\22\2\u0134\u0135\7N\2\2"+
-		"\u0135\u0136\7\b\2\2\u0136\u0137\5x=\2\u0137\u0138\7\t\2\2\u0138\u0139"+
-		"\5\u008cG\2\u0139\u0178\3\2\2\2\u013a\u013b\7N\2\2\u013b\u013c\7\b\2\2"+
-		"\u013c\u013d\5x=\2\u013d\u013e\7\t\2\2\u013e\u013f\5\"\22\2\u013f\u0178"+
-		"\3\2\2\2\u0140\u0141\7L\2\2\u0141\u0143\7\b\2\2\u0142\u0144\5x=\2\u0143"+
-		"\u0142\3\2\2\2\u0143\u0144\3\2\2\2\u0144\u0145\3\2\2\2\u0145\u0147\7\f"+
-		"\2\2\u0146\u0148\5x=\2\u0147\u0146\3\2\2\2\u0147\u0148\3\2\2\2\u0148\u0149"+
-		"\3\2\2\2\u0149\u014b\7\f\2\2\u014a\u014c\5x=\2\u014b\u014a\3\2\2\2\u014b"+
-		"\u014c\3\2\2\2\u014c\u014d\3\2\2\2\u014d\u014e\7\t\2\2\u014e\u0178\5\""+
-		"\22\2\u014f\u0150\7L\2\2\u0150\u0151\7\b\2\2\u0151\u0152\5\66\34\2\u0152"+
-		"\u0153\5*\26\2\u0153\u0155\7\f\2\2\u0154\u0156\5x=\2\u0155\u0154\3\2\2"+
-		"\2\u0155\u0156\3\2\2\2\u0156\u0157\3\2\2\2\u0157\u0159\7\f\2\2\u0158\u015a"+
-		"\5x=\2\u0159\u0158\3\2\2\2\u0159\u015a\3\2\2\2\u015a\u015b\3\2\2\2\u015b"+
-		"\u015c\7\t\2\2\u015c\u015d\5\"\22\2\u015d\u0178\3\2\2\2\u015e\u015f\7"+
-		"L\2\2\u015f\u0160\7\b\2\2\u0160\u0164\5z>\2\u0161\u0165\7W\2\2\u0162\u0163"+
-		"\7u\2\2\u0163\u0165\6\33\3\2\u0164\u0161\3\2\2\2\u0164\u0162\3\2\2\2\u0165"+
-		"\u0166\3\2\2\2\u0166\u0167\5x=\2\u0167\u0168\7\t\2\2\u0168\u0169\5\"\22"+
-		"\2\u0169\u0178\3\2\2\2\u016a\u016b\7L\2\2\u016b\u016c\7\b\2\2\u016c\u016d"+
-		"\5\66\34\2\u016d\u0171\5,\27\2\u016e\u0172\7W\2\2\u016f\u0170\7u\2\2\u0170"+
-		"\u0172\6\33\4\2\u0171\u016e\3\2\2\2\u0171\u016f\3\2\2\2\u0172\u0173\3"+
-		"\2\2\2\u0173\u0174\5x=\2\u0174\u0175\7\t\2\2\u0175\u0176\5\"\22\2\u0176"+
-		"\u0178\3\2\2\2\u0177\u0132\3\2\2\2\u0177\u013a\3\2\2\2\u0177\u0140\3\2"+
-		"\2\2\u0177\u014f\3\2\2\2\u0177\u015e\3\2\2\2\u0177\u016a\3\2\2\2\u0178"+
-		"\65\3\2\2\2\u0179\u017a\7F\2\2\u017a\67\3\2\2\2\u017b\u017e\7K\2\2\u017c"+
-		"\u017d\6\35\5\2\u017d\u017f\7u\2\2\u017e\u017c\3\2\2\2\u017e\u017f\3\2"+
-		"\2\2\u017f\u0180\3\2\2\2\u0180\u0181\5\u008cG\2\u01819\3\2\2\2\u0182\u0185"+
-		"\7?\2\2\u0183\u0184\6\36\6\2\u0184\u0186\7u\2\2\u0185\u0183\3\2\2\2\u0185"+
-		"\u0186\3\2\2\2\u0186\u0187\3\2\2\2\u0187\u0188\5\u008cG\2\u0188;\3\2\2"+
-		"\2\u0189\u018c\7I\2\2\u018a\u018b\6\37\7\2\u018b\u018d\5x=\2\u018c\u018a"+
-		"\3\2\2\2\u018c\u018d\3\2\2\2\u018d\u018e\3\2\2\2\u018e\u018f\5\u008cG"+
-		"\2\u018f=\3\2\2\2\u0190\u0191\7R\2\2\u0191\u0192\7\b\2\2\u0192\u0193\5"+
-		"x=\2\u0193\u0194\7\t\2\2\u0194\u0195\5\"\22\2\u0195?\3\2\2\2\u0196\u0197"+
-		"\7M\2\2\u0197\u0198\7\b\2\2\u0198\u0199\5x=\2\u0199\u019a\7\t\2\2\u019a"+
-		"\u019b\5B\"\2\u019bA\3\2\2\2\u019c\u019e\7\n\2\2\u019d\u019f\5D#\2\u019e"+
-		"\u019d\3\2\2\2\u019e\u019f\3\2\2\2\u019f\u01a4\3\2\2\2\u01a0\u01a2\5H"+
-		"%\2\u01a1\u01a3\5D#\2\u01a2\u01a1\3\2\2\2\u01a2\u01a3\3\2\2\2\u01a3\u01a5"+
-		"\3\2\2\2\u01a4\u01a0\3\2\2\2\u01a4\u01a5\3\2\2\2\u01a5\u01a6\3\2\2\2\u01a6"+
-		"\u01a7\7\13\2\2\u01a7C\3\2\2\2\u01a8\u01aa\5F$\2\u01a9\u01a8\3\2\2\2\u01aa"+
-		"\u01ab\3\2\2\2\u01ab\u01a9\3\2\2\2\u01ab\u01ac\3\2\2\2\u01acE\3\2\2\2"+
-		"\u01ad\u01ae\7C\2\2\u01ae\u01af\5x=\2\u01af\u01b1\7\20\2\2\u01b0\u01b2"+
-		"\5&\24\2\u01b1\u01b0\3\2\2\2\u01b1\u01b2\3\2\2\2\u01b2G\3\2\2\2\u01b3"+
-		"\u01b4\7S\2\2\u01b4\u01b6\7\20\2\2\u01b5\u01b7\5&\24\2\u01b6\u01b5\3\2"+
-		"\2\2\u01b6\u01b7\3\2\2\2\u01b7I\3\2\2\2\u01b8\u01b9\7U\2\2\u01b9\u01ba"+
-		"\6&\b\2\u01ba\u01bb\5x=\2\u01bb\u01bc\5\u008cG\2\u01bcK\3\2\2\2\u01bd"+
-		"\u01be\7X\2\2\u01be\u01c4\5$\23\2\u01bf\u01c1\5N(\2\u01c0\u01c2\5P)\2"+
-		"\u01c1\u01c0\3\2\2\2\u01c1\u01c2\3\2\2\2\u01c2\u01c5\3\2\2\2\u01c3\u01c5"+
-		"\5P)\2\u01c4\u01bf\3\2\2\2\u01c4\u01c3\3\2\2\2\u01c5M\3\2\2\2\u01c6\u01c7"+
-		"\7G\2\2\u01c7\u01c8\7\b\2\2\u01c8\u01c9\7u\2\2\u01c9\u01ca\7\t\2\2\u01ca"+
-		"\u01cb\5$\23\2\u01cbO\3\2\2\2\u01cc\u01cd\7H\2\2\u01cd\u01ce\5$\23\2\u01ce"+
-		"Q\3\2\2\2\u01cf\u01d0\7O\2\2\u01d0\u01d1\5\u008cG\2\u01d1S\3\2\2\2\u01d2"+
-		"\u01d4\5\6\4\2\u01d3\u01d2\3\2\2\2\u01d3\u01d4\3\2\2\2\u01d4\u01d6\3\2"+
-		"\2\2\u01d5\u01d7\7f\2\2\u01d6\u01d5\3\2\2\2\u01d6\u01d7\3\2\2\2\u01d7"+
-		"\u01d8\3\2\2\2\u01d8\u01d9\7P\2\2\u01d9\u01da\7u\2\2\u01da\u01dc\7\b\2"+
-		"\2\u01db\u01dd\5^\60\2\u01dc\u01db\3\2\2\2\u01dc\u01dd\3\2\2\2\u01dd\u01de"+
-		"\3\2\2\2\u01de\u01e0\7\t\2\2\u01df\u01e1\7`\2\2\u01e0\u01df\3\2\2\2\u01e0"+
-		"\u01e1\3\2\2\2\u01e1\u01e2\3\2\2\2\u01e2\u01e3\7\n\2\2\u01e3\u01e4\5d"+
-		"\63\2\u01e4\u01e5\7\13\2\2\u01e5U\3\2\2\2\u01e6\u01e7\7a\2\2\u01e7\u01e8"+
-		"\7u\2\2\u01e8\u01e9\5X-\2\u01e9W\3\2\2\2\u01ea\u01eb\7c\2\2\u01eb\u01ed"+
-		"\5z>\2\u01ec\u01ea\3\2\2\2\u01ec\u01ed\3\2\2\2\u01ed\u01ee\3\2\2\2\u01ee"+
-		"\u01f2\7\n\2\2\u01ef\u01f1\5Z.\2\u01f0\u01ef\3\2\2\2\u01f1\u01f4\3\2\2"+
-		"\2\u01f2\u01f0\3\2\2\2\u01f2\u01f3\3\2\2\2\u01f3\u01f5\3\2\2\2\u01f4\u01f2"+
-		"\3\2\2\2\u01f5\u01f6\7\13\2\2\u01f6Y\3\2\2\2\u01f7\u01f9\7s\2\2\u01f8"+
-		"\u01f7\3\2\2\2\u01f8\u01f9\3\2\2\2\u01f9\u01fa\3\2\2\2\u01fa\u01fb\5\\"+
-		"/\2\u01fb[\3\2\2\2\u01fc\u01fd\5r:\2\u01fd\u01ff\7\b\2\2\u01fe\u0200\5"+
-		"^\60\2\u01ff\u01fe\3\2\2\2\u01ff\u0200\3\2\2\2\u0200\u0201\3\2\2\2\u0201"+
-		"\u0202\7\t\2\2\u0202\u0203\7\n\2\2\u0203\u0204\5d\63\2\u0204\u0205\7\13"+
-		"\2\2\u0205]\3\2\2\2\u0206\u020b\5`\61\2\u0207\u0208\7\r\2\2\u0208\u020a"+
-		"\5`\61\2\u0209\u0207\3\2\2\2\u020a\u020d\3\2\2\2\u020b\u0209\3\2\2\2\u020b"+
-		"\u020c\3\2\2\2\u020c\u0210\3\2\2\2\u020d\u020b\3\2\2\2\u020e\u020f\7\r"+
-		"\2\2\u020f\u0211\5b\62\2\u0210\u020e\3\2\2\2\u0210\u0211\3\2\2\2\u0211"+
-		"\u0216\3\2\2\2\u0212\u0216\5b\62\2\u0213\u0216\5h\65\2\u0214\u0216\5n"+
-		"8\2\u0215\u0206\3\2\2\2\u0215\u0212\3\2\2\2\u0215\u0213\3\2\2\2\u0215"+
-		"\u0214\3\2\2\2\u0216_\3\2\2\2\u0217\u021a\7u\2\2\u0218\u0219\7\16\2\2"+
-		"\u0219\u021b\5z>\2\u021a\u0218\3\2\2\2\u021a\u021b\3\2\2\2\u021ba\3\2"+
-		"\2\2\u021c\u021d\7\21\2\2\u021d\u021e\7u\2\2\u021ec\3\2\2\2\u021f\u0221"+
-		"\5f\64\2\u0220\u021f\3\2\2\2\u0220\u0221\3\2\2\2\u0221e\3\2\2\2\u0222"+
-		"\u0224\5\30\r\2\u0223\u0222\3\2\2\2\u0224\u0225\3\2\2\2\u0225\u0223\3"+
-		"\2\2\2\u0225\u0226\3\2\2\2\u0226g\3\2\2\2\u0227\u022b\7\6\2\2\u0228\u022a"+
-		"\7\r\2\2\u0229\u0228\3\2\2\2\u022a\u022d\3\2\2\2\u022b\u0229\3\2\2\2\u022b"+
-		"\u022c\3\2\2\2\u022c\u022f\3\2\2\2\u022d\u022b\3\2\2\2\u022e\u0230\5j"+
-		"\66\2\u022f\u022e\3\2\2\2\u022f\u0230\3\2\2\2\u0230\u0234\3\2\2\2\u0231"+
-		"\u0233\7\r\2\2\u0232\u0231\3\2\2\2\u0233\u0236\3\2\2\2\u0234\u0232\3\2"+
-		"\2\2\u0234\u0235\3\2\2\2\u0235\u0237\3\2\2\2\u0236\u0234\3\2\2\2\u0237"+
-		"\u0238\7\7\2\2\u0238i\3\2\2\2\u0239\u0242\5z>\2\u023a\u023c\7\r\2\2\u023b"+
-		"\u023a\3\2\2\2\u023c\u023d\3\2\2\2\u023d\u023b\3\2\2\2\u023d\u023e\3\2"+
-		"\2\2\u023e\u023f\3\2\2\2\u023f\u0241\5z>\2\u0240\u023b\3\2\2\2\u0241\u0244"+
-		"\3\2\2\2\u0242\u0240\3\2\2\2\u0242\u0243\3\2\2\2\u0243\u024b\3\2\2\2\u0244"+
-		"\u0242\3\2\2\2\u0245\u0247\7\r\2\2\u0246\u0245\3\2\2\2\u0247\u0248\3\2"+
-		"\2\2\u0248\u0246\3\2\2\2\u0248\u0249\3\2\2\2\u0249\u024a\3\2\2\2\u024a"+
-		"\u024c\5l\67\2\u024b\u0246\3\2\2\2\u024b\u024c\3\2\2\2\u024c\u024f\3\2"+
-		"\2\2\u024d\u024f\5l\67\2\u024e\u0239\3\2\2\2\u024e\u024d\3\2\2\2\u024f"+
-		"k\3\2\2\2\u0250\u0251\7\21\2\2\u0251\u0252\7u\2\2\u0252m\3\2\2\2\u0253"+
-		"\u025c\7\n\2\2\u0254\u0259\5p9\2\u0255\u0256\7\r\2\2\u0256\u0258\5p9\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\u025d\3\2\2\2\u025b\u0259\3\2\2\2\u025c\u0254\3\2\2\2\u025c"+
-		"\u025d\3\2\2\2\u025d\u025f\3\2\2\2\u025e\u0260\7\r\2\2\u025f\u025e\3\2"+
-		"\2\2\u025f\u0260\3\2\2\2\u0260\u0261\3\2\2\2\u0261\u0262\7\13\2\2\u0262"+
-		"o\3\2\2\2\u0263\u0264\5r:\2\u0264\u0265\t\5\2\2\u0265\u0266\5z>\2\u0266"+
-		"\u026f\3\2\2\2\u0267\u0268\7\6\2\2\u0268\u0269\5z>\2\u0269\u026a\7\7\2"+
-		"\2\u026a\u026b\7\20\2\2\u026b\u026c\5z>\2\u026c\u026f\3\2\2\2\u026d\u026f"+
-		"\7u\2\2\u026e\u0263\3\2\2\2\u026e\u0267\3\2\2\2\u026e\u026d\3\2\2\2\u026f"+
-		"q\3\2\2\2\u0270\u0274\5\u0086D\2\u0271\u0274\7v\2\2\u0272\u0274\5\u0084"+
-		"C\2\u0273\u0270\3\2\2\2\u0273\u0271\3\2\2\2\u0273\u0272\3\2\2\2\u0274"+
-		"s\3\2\2\2\u0275\u0283\7\b\2\2\u0276\u027b\5z>\2\u0277\u0278\7\r\2\2\u0278"+
-		"\u027a\5z>\2\u0279\u0277\3\2\2\2\u027a\u027d\3\2\2\2\u027b\u0279\3\2\2"+
-		"\2\u027b\u027c\3\2\2\2\u027c\u0280\3\2\2\2\u027d\u027b\3\2\2\2\u027e\u027f"+
-		"\7\r\2\2\u027f\u0281\5v<\2\u0280\u027e\3\2\2\2\u0280\u0281\3\2\2\2\u0281"+
-		"\u0284\3\2\2\2\u0282\u0284\5v<\2\u0283\u0276\3\2\2\2\u0283\u0282\3\2\2"+
-		"\2\u0283\u0284\3\2\2\2\u0284\u0285\3\2\2\2\u0285\u0286\7\t\2\2\u0286u"+
-		"\3\2\2\2\u0287\u0288\7\21\2\2\u0288\u0289\7u\2\2\u0289w\3\2\2\2\u028a"+
-		"\u028f\5z>\2\u028b\u028c\7\r\2\2\u028c\u028e\5z>\2\u028d\u028b\3\2\2\2"+
-		"\u028e\u0291\3\2\2\2\u028f\u028d\3\2\2\2\u028f\u0290\3\2\2\2\u0290y\3"+
-		"\2\2\2\u0291\u028f\3\2\2\2\u0292\u0293\b>\1\2\u0293\u0294\7E\2\2\u0294"+
-		"\u0296\5z>\2\u0295\u0297\5t;\2\u0296\u0295\3\2\2\2\u0296\u0297\3\2\2\2"+
-		"\u0297\u02b5\3\2\2\2\u0298\u0299\7B\2\2\u0299\u02b5\5z>!\u029a\u029b\7"+
-		"\23\2\2\u029b\u02b5\5z> \u029c\u029d\7\24\2\2\u029d\u02b5\5z>\37\u029e"+
-		"\u029f\7\25\2\2\u029f\u02b5\5z>\36\u02a0\u02a1\7\26\2\2\u02a1\u02b5\5"+
-		"z>\35\u02a2\u02a3\7\27\2\2\u02a3\u02b5\5z>\34\u02a4\u02a5\7\30\2\2\u02a5"+
-		"\u02b5\5z>\33\u02a6\u02b5\7Q\2\2\u02a7\u02b5\7u\2\2\u02a8\u02b5\7d\2\2"+
-		"\u02a9\u02b5\5\u0082B\2\u02aa\u02b5\5h\65\2\u02ab\u02b5\5n8\2\u02ac\u02ad"+
-		"\7\b\2\2\u02ad\u02ae\5x=\2\u02ae\u02af\7\t\2\2\u02af\u02b5\3\2\2\2\u02b0"+
-		"\u02b1\5|?\2\u02b1\u02b2\7\67\2\2\u02b2\u02b3\5~@\2\u02b3\u02b5\3\2\2"+
-		"\2\u02b4\u0292\3\2\2\2\u02b4\u0298\3\2\2\2\u02b4\u029a\3\2\2\2\u02b4\u029c"+
-		"\3\2\2\2\u02b4\u029e\3\2\2\2\u02b4\u02a0\3\2\2\2\u02b4\u02a2\3\2\2\2\u02b4"+
-		"\u02a4\3\2\2\2\u02b4\u02a6\3\2\2\2\u02b4\u02a7\3\2\2\2\u02b4\u02a8\3\2"+
-		"\2\2\u02b4\u02a9\3\2\2\2\u02b4\u02aa\3\2\2\2\u02b4\u02ab\3\2\2\2\u02b4"+
-		"\u02ac\3\2\2\2\u02b4\u02b0\3\2\2\2\u02b5\u02fb\3\2\2\2\u02b6\u02b7\f\32"+
-		"\2\2\u02b7\u02b8\t\6\2\2\u02b8\u02fa\5z>\33\u02b9\u02ba\f\31\2\2\u02ba"+
-		"\u02bb\t\7\2\2\u02bb\u02fa\5z>\32\u02bc\u02bd\f\30\2\2\u02bd\u02be\t\b"+
-		"\2\2\u02be\u02fa\5z>\31\u02bf\u02c0\f\27\2\2\u02c0\u02c1\t\t\2\2\u02c1"+
-		"\u02fa\5z>\30\u02c2\u02c3\f\26\2\2\u02c3\u02c4\7A\2\2\u02c4\u02fa\5z>"+
-		"\27\u02c5\u02c6\f\25\2\2\u02c6\u02c7\7W\2\2\u02c7\u02fa\5z>\26\u02c8\u02c9"+
-		"\f\24\2\2\u02c9\u02ca\t\n\2\2\u02ca\u02fa\5z>\25\u02cb\u02cc\f\23\2\2"+
-		"\u02cc\u02cd\7\'\2\2\u02cd\u02fa\5z>\24\u02ce\u02cf\f\22\2\2\u02cf\u02d0"+
-		"\7(\2\2\u02d0\u02fa\5z>\23\u02d1\u02d2\f\21\2\2\u02d2\u02d3\7)\2\2\u02d3"+
-		"\u02fa\5z>\22\u02d4\u02d5\f\20\2\2\u02d5\u02d6\7*\2\2\u02d6\u02fa\5z>"+
-		"\21\u02d7\u02d8\f\17\2\2\u02d8\u02d9\7+\2\2\u02d9\u02fa\5z>\20\u02da\u02db"+
-		"\f\16\2\2\u02db\u02dc\7\17\2\2\u02dc\u02dd\5z>\2\u02dd\u02de\7\20\2\2"+
-		"\u02de\u02df\5z>\17\u02df\u02fa\3\2\2\2\u02e0\u02e1\f\r\2\2\u02e1\u02e2"+
-		"\7\16\2\2\u02e2\u02fa\5z>\16\u02e3\u02e4\f\f\2\2\u02e4\u02e5\5\u0080A"+
-		"\2\u02e5\u02e6\5z>\r\u02e6\u02fa\3\2\2\2\u02e7\u02e8\f\'\2\2\u02e8\u02e9"+
-		"\7\6\2\2\u02e9\u02ea\5x=\2\u02ea\u02eb\7\7\2\2\u02eb\u02fa\3\2\2\2\u02ec"+
-		"\u02ed\f&\2\2\u02ed\u02ee\7\22\2\2\u02ee\u02fa\5\u0086D\2\u02ef\u02f0"+
-		"\f%\2\2\u02f0\u02fa\5t;\2\u02f1\u02f2\f#\2\2\u02f2\u02f3\6>\34\2\u02f3"+
-		"\u02fa\7\23\2\2\u02f4\u02f5\f\"\2\2\u02f5\u02f6\6>\36\2\u02f6\u02fa\7"+
-		"\24\2\2\u02f7\u02f8\f\13\2\2\u02f8\u02fa\7w\2\2\u02f9\u02b6\3\2\2\2\u02f9"+
-		"\u02b9\3\2\2\2\u02f9\u02bc\3\2\2\2\u02f9\u02bf\3\2\2\2\u02f9\u02c2\3\2"+
-		"\2\2\u02f9\u02c5\3\2\2\2\u02f9\u02c8\3\2\2\2\u02f9\u02cb\3\2\2\2\u02f9"+
-		"\u02ce\3\2\2\2\u02f9\u02d1\3\2\2\2\u02f9\u02d4\3\2\2\2\u02f9\u02d7\3\2"+
-		"\2\2\u02f9\u02da\3\2\2\2\u02f9\u02e0\3\2\2\2\u02f9\u02e3\3\2\2\2\u02f9"+
-		"\u02e7\3\2\2\2\u02f9\u02ec\3\2\2\2\u02f9\u02ef\3\2\2\2\u02f9\u02f1\3\2"+
-		"\2\2\u02f9\u02f4\3\2\2\2\u02f9\u02f7\3\2\2\2\u02fa\u02fd\3\2\2\2\u02fb"+
-		"\u02f9\3\2\2\2\u02fb\u02fc\3\2\2\2\u02fc{\3\2\2\2\u02fd\u02fb\3\2\2\2"+
-		"\u02fe\u0305\7u\2\2\u02ff\u0301\7\b\2\2\u0300\u0302\5^\60\2\u0301\u0300"+
-		"\3\2\2\2\u0301\u0302\3\2\2\2\u0302\u0303\3\2\2\2\u0303\u0305\7\t\2\2\u0304"+
-		"\u02fe\3\2\2\2\u0304\u02ff\3\2\2\2\u0305}\3\2\2\2\u0306\u030c\5z>\2\u0307"+
-		"\u0308\7\n\2\2\u0308\u0309\5d\63\2\u0309\u030a\7\13\2\2\u030a\u030c\3"+
-		"\2\2\2\u030b\u0306\3\2\2\2\u030b\u0307\3\2\2\2\u030c\177\3\2\2\2\u030d"+
-		"\u030e\t\13\2\2\u030e\u0081\3\2\2\2\u030f\u0316\78\2\2\u0310\u0316\79"+
-		"\2\2\u0311\u0316\7v\2\2\u0312\u0316\7w\2\2\u0313\u0316\7\5\2\2\u0314\u0316"+
-		"\5\u0084C\2\u0315\u030f\3\2\2\2\u0315\u0310\3\2\2\2\u0315\u0311\3\2\2"+
-		"\2\u0315\u0312\3\2\2\2\u0315\u0313\3\2\2\2\u0315\u0314\3\2\2\2\u0316\u0083"+
-		"\3\2\2\2\u0317\u0318\t\f\2\2\u0318\u0085\3\2\2\2\u0319\u031c\7u\2\2\u031a"+
-		"\u031c\5\u0088E\2\u031b\u0319\3\2\2\2\u031b\u031a\3\2\2\2\u031c\u0087"+
-		"\3\2\2\2\u031d\u0321\5\u008aF\2\u031e\u0321\78\2\2\u031f\u0321\79\2\2"+
-		"\u0320\u031d\3\2\2\2\u0320\u031e\3\2\2\2\u0320\u031f\3\2\2\2\u0321\u0089"+
-		"\3\2\2\2\u0322\u0323\t\r\2\2\u0323\u008b\3\2\2\2\u0324\u0329\7\f\2\2\u0325"+
-		"\u0329\7\2\2\3\u0326\u0329\6G \2\u0327\u0329\6G!\2\u0328\u0324\3\2\2\2"+
-		"\u0328\u0325\3\2\2\2\u0328\u0326\3\2\2\2\u0328\u0327\3\2\2\2\u0329\u008d"+
-		"\3\2\2\2U\u008f\u0094\u009c\u00a3\u00a9\u00b2\u00b8\u00be\u00c1\u00c7"+
-		"\u00ce\u00d4\u00d9\u00dd\u00e8\u00f8\u0105\u0109\u0110\u011b\u0121\u0130"+
-		"\u0143\u0147\u014b\u0155\u0159\u0164\u0171\u0177\u017e\u0185\u018c\u019e"+
-		"\u01a2\u01a4\u01ab\u01b1\u01b6\u01c1\u01c4\u01d3\u01d6\u01dc\u01e0\u01ec"+
-		"\u01f2\u01f8\u01ff\u020b\u0210\u0215\u021a\u0220\u0225\u022b\u022f\u0234"+
-		"\u023d\u0242\u0248\u024b\u024e\u0259\u025c\u025f\u026e\u0273\u027b\u0280"+
-		"\u0283\u028f\u0296\u02b4\u02f9\u02fb\u0301\u0304\u030b\u0315\u031b\u0320"+
-		"\u0328";
-	public static final ATN _ATN =
-		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
-	static {
-		_decisionToDFA = new DFA[_ATN.getNumberOfDecisions()];
-		for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) {
-			_decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
-		}
-	}
-}
\ No newline at end of file
+    static {
+        RuntimeMetaData.checkVersion("4.9.2", RuntimeMetaData.VERSION);
+    }
+
+    protected static final DFA[] _decisionToDFA;
+    protected static final PredictionContextCache _sharedContextCache =
+            new PredictionContextCache();
+    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, Global = 92, Local = 93, View = 94, Class = 95,
+            Enum = 96, Extends = 97, Super = 98, Const = 99, Export = 100, Import = 101,
+            Contract = 102, Module = 103, Oracle = 104, DoipModule = 105, Implements = 106,
+            Let = 107, Private = 108, Public = 109, Interface = 110, Package = 111, Protected = 112,
+            Static = 113, Yield = 114, Identifier = 115, StringLiteral = 116,
+            TemplateStringLiteral = 117, WhiteSpaces = 118, LineTerminator = 119, HtmlComment = 120,
+            CDataComment = 121, UnexpectedCharacter = 122;
+    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_interfaceDeclaration = 7,
+            RULE_eventDeclaration = 8, RULE_eventGlobalOrLocal = 9, RULE_eventSemantics = 10,
+            RULE_sourceElement = 11, RULE_importStmts = 12, RULE_importStmt = 13,
+            RULE_exportStmt = 14, RULE_versionName = 15, RULE_statement = 16, RULE_block = 17,
+            RULE_statementList = 18, RULE_variableStatement = 19, RULE_variableDeclarationList = 20,
+            RULE_variableDeclaration = 21, RULE_emptyStatement = 22, RULE_expressionStatement = 23,
+            RULE_ifStatement = 24, RULE_iterationStatement = 25, RULE_varModifier = 26,
+            RULE_continueStatement = 27, RULE_breakStatement = 28, RULE_returnStatement = 29,
+            RULE_withStatement = 30, RULE_switchStatement = 31, RULE_caseBlock = 32,
+            RULE_caseClauses = 33, RULE_caseClause = 34, RULE_defaultClause = 35,
+            RULE_throwStatement = 36, RULE_tryStatement = 37, RULE_catchProduction = 38,
+            RULE_finallyProduction = 39, RULE_debuggerStatement = 40, RULE_functionDeclaration = 41,
+            RULE_classDeclaration = 42, RULE_classTail = 43, RULE_classElement = 44,
+            RULE_methodDefinition = 45, RULE_formalParameterList = 46, RULE_formalParameterArg = 47,
+            RULE_lastFormalParameterArg = 48, RULE_functionBody = 49, RULE_sourceElements = 50,
+            RULE_arrayLiteral = 51, RULE_elementList = 52, RULE_lastElement = 53,
+            RULE_objectLiteral = 54, RULE_propertyAssignment = 55, RULE_propertyName = 56,
+            RULE_arguments = 57, RULE_lastArgument = 58, RULE_expressionSequence = 59,
+            RULE_singleExpression = 60, RULE_arrowFunctionParameters = 61,
+            RULE_arrowFunctionBody = 62, RULE_assignmentOperator = 63, RULE_literal = 64,
+            RULE_numericLiteral = 65, RULE_identifierName = 66, RULE_reservedWord = 67,
+            RULE_keyword = 68, RULE_eos = 69;
+
+    private static String[] makeRuleNames() {
+        return new String[] {"program", "contractDeclar", "annotations", "annotation",
+                "annotationArgs", "annotationLiteral", "clzOrFunctionDeclaration",
+                "interfaceDeclaration", "eventDeclaration", "eventGlobalOrLocal", "eventSemantics",
+                "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"};
+    }
+
+    public static final String[] ruleNames = makeRuleNames();
+
+    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'", "'global'", "'local'", "'view'", "'class'", "'enum'", "'extends'",
+                "'super'", "'const'", "'export'", "'import'", "'contract'", "'module'", "'oracle'",
+                "'doipmodule'", "'implements'", "'let'", "'private'", "'public'", "'interface'",
+                "'package'", "'protected'", "'static'", "'yield'"};
+    }
+
+    private static final String[] _LITERAL_NAMES = makeLiteralNames();
+
+    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", "Global", "Local", "View", "Class", "Enum",
+                "Extends", "Super", "Const", "Export", "Import", "Contract", "Module", "Oracle",
+                "DoipModule", "Implements", "Let", "Private", "Public", "Interface", "Package",
+                "Protected", "Static", "Yield", "Identifier", "StringLiteral",
+                "TemplateStringLiteral", "WhiteSpaces", "LineTerminator", "HtmlComment",
+                "CDataComment", "UnexpectedCharacter"};
+    }
+
+    private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
+    public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
+
+    /**
+     * @deprecated Use {@link #VOCABULARY} instead.
+     */
+    @Deprecated
+    public static final String[] tokenNames;
+    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>";
+            }
+        }
+    }
+
+    @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 YJSParser(TokenStream input) {
+        super(input);
+        _interp = new ParserATNSimulator(this, _ATN, _decisionToDFA, _sharedContextCache);
+    }
+
+    public static class ProgramContext extends ParserRuleContext {
+        public ContractDeclarContext contractDeclar() {
+            return getRuleContext(ContractDeclarContext.class, 0);
+        }
+
+        public ImportStmtsContext importStmts() {
+            return getRuleContext(ImportStmtsContext.class, 0);
+        }
+
+        public ProgramContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final ProgramContext program() throws RecognitionException {
+        ProgramContext _localctx = new ProgramContext(_ctx, getState());
+        enterRule(_localctx, 0, RULE_program);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(141);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if (_la == Import) {
+                    {
+                        setState(140);
+                        importStmts();
+                    }
+                }
+
+                setState(143);
+                contractDeclar();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class ContractDeclarContext extends ParserRuleContext {
+        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 TerminalNode DoipModule() {
+            return getToken(YJSParser.DoipModule, 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);
+        }
+
+        public ContractDeclarContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final ContractDeclarContext contractDeclar() throws RecognitionException {
+        ContractDeclarContext _localctx = new ContractDeclarContext(_ctx, getState());
+        enterRule(_localctx, 2, RULE_contractDeclar);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(146);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if (_la == AtToken) {
+                    {
+                        setState(145);
+                        annotations();
+                    }
+                }
+
+                setState(148);
+                _la = _input.LA(1);
+                if (!(((((_la - 102)) & ~0x3f) == 0
+                        && ((1L << (_la - 102)) & ((1L << (Contract - 102)) | (1L << (Module - 102))
+                                | (1L << (Oracle - 102)) | (1L << (DoipModule - 102)))) != 0))) {
+                    _errHandler.recoverInline(this);
+                } else {
+                    if (_input.LA(1) == Token.EOF)
+                        matchedEOF = true;
+                    _errHandler.reportMatch(this);
+                    consume();
+                }
+                setState(149);
+                match(Identifier);
+                setState(150);
+                match(OpenBrace);
+                setState(152);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                do {
+                    {
+                        {
+                            setState(151);
+                            clzOrFunctionDeclaration();
+                        }
+                    }
+                    setState(154);
+                    _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)) | (1L << (Interface - 78)))) != 0));
+                setState(156);
+                match(CloseBrace);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class AnnotationsContext extends ParserRuleContext {
+        public List<AnnotationContext> annotation() {
+            return getRuleContexts(AnnotationContext.class);
+        }
+
+        public AnnotationContext annotation(int i) {
+            return getRuleContext(AnnotationContext.class, i);
+        }
+
+        public AnnotationsContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final AnnotationsContext annotations() throws RecognitionException {
+        AnnotationsContext _localctx = new AnnotationsContext(_ctx, getState());
+        enterRule(_localctx, 4, RULE_annotations);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(159);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                do {
+                    {
+                        {
+                            setState(158);
+                            annotation();
+                        }
+                    }
+                    setState(161);
+                    _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 static class AnnotationContext extends ParserRuleContext {
+        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);
+        }
+
+        public AnnotationContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final AnnotationContext annotation() throws RecognitionException {
+        AnnotationContext _localctx = new AnnotationContext(_ctx, getState());
+        enterRule(_localctx, 6, RULE_annotation);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(163);
+                match(AtToken);
+                setState(164);
+                match(Identifier);
+                setState(165);
+                match(OpenParen);
+                setState(167);
+                _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(166);
+                        annotationArgs();
+                    }
+                }
+
+                setState(169);
+                match(CloseParen);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class AnnotationArgsContext extends ParserRuleContext {
+        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);
+        }
+
+        public AnnotationArgsContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final AnnotationArgsContext annotationArgs() throws RecognitionException {
+        AnnotationArgsContext _localctx = new AnnotationArgsContext(_ctx, getState());
+        enterRule(_localctx, 8, RULE_annotationArgs);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(171);
+                annotationLiteral();
+                setState(176);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                while (_la == Comma) {
+                    {
+                        {
+                            setState(172);
+                            match(Comma);
+                            setState(173);
+                            annotationLiteral();
+                        }
+                    }
+                    setState(178);
+                    _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 static class AnnotationLiteralContext extends ParserRuleContext {
+        public NumericLiteralContext numericLiteral() {
+            return getRuleContext(NumericLiteralContext.class, 0);
+        }
+
+        public TerminalNode StringLiteral() {
+            return getToken(YJSParser.StringLiteral, 0);
+        }
+
+        public ObjectLiteralContext objectLiteral() {
+            return getRuleContext(ObjectLiteralContext.class, 0);
+        }
+
+        public AnnotationLiteralContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final AnnotationLiteralContext annotationLiteral() throws RecognitionException {
+        AnnotationLiteralContext _localctx = new AnnotationLiteralContext(_ctx, getState());
+        enterRule(_localctx, 10, RULE_annotationLiteral);
+        try {
+            setState(182);
+            _errHandler.sync(this);
+            switch (_input.LA(1)) {
+                case DecimalLiteral:
+                case HexIntegerLiteral:
+                case OctalIntegerLiteral:
+                case OctalIntegerLiteral2:
+                case BinaryIntegerLiteral:
+                    enterOuterAlt(_localctx, 1); {
+                    setState(179);
+                    numericLiteral();
+                }
+                    break;
+                case StringLiteral:
+                    enterOuterAlt(_localctx, 2); {
+                    setState(180);
+                    match(StringLiteral);
+                }
+                    break;
+                case OpenBrace:
+                    enterOuterAlt(_localctx, 3); {
+                    setState(181);
+                    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 static class ClzOrFunctionDeclarationContext extends ParserRuleContext {
+        public ClassDeclarationContext classDeclaration() {
+            return getRuleContext(ClassDeclarationContext.class, 0);
+        }
+
+        public FunctionDeclarationContext functionDeclaration() {
+            return getRuleContext(FunctionDeclarationContext.class, 0);
+        }
+
+        public InterfaceDeclarationContext interfaceDeclaration() {
+            return getRuleContext(InterfaceDeclarationContext.class, 0);
+        }
+
+        public EventDeclarationContext eventDeclaration() {
+            return getRuleContext(EventDeclarationContext.class, 0);
+        }
+
+        public ClzOrFunctionDeclarationContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final ClzOrFunctionDeclarationContext clzOrFunctionDeclaration()
+            throws RecognitionException {
+        ClzOrFunctionDeclarationContext _localctx =
+                new ClzOrFunctionDeclarationContext(_ctx, getState());
+        enterRule(_localctx, 12, RULE_clzOrFunctionDeclaration);
+        try {
+            setState(188);
+            _errHandler.sync(this);
+            switch (getInterpreter().adaptivePredict(_input, 7, _ctx)) {
+                case 1:
+                    enterOuterAlt(_localctx, 1); {
+                    setState(184);
+                    classDeclaration();
+                }
+                    break;
+                case 2:
+                    enterOuterAlt(_localctx, 2); {
+                    setState(185);
+                    functionDeclaration();
+                }
+                    break;
+                case 3:
+                    enterOuterAlt(_localctx, 3); {
+                    setState(186);
+                    interfaceDeclaration();
+                }
+                    break;
+                case 4:
+                    enterOuterAlt(_localctx, 4); {
+                    setState(187);
+                    eventDeclaration();
+                }
+                    break;
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class InterfaceDeclarationContext extends ParserRuleContext {
+        public TerminalNode Interface() {
+            return getToken(YJSParser.Interface, 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 EosContext eos() {
+            return getRuleContext(EosContext.class, 0);
+        }
+
+        public AnnotationsContext annotations() {
+            return getRuleContext(AnnotationsContext.class, 0);
+        }
+
+        public FormalParameterListContext formalParameterList() {
+            return getRuleContext(FormalParameterListContext.class, 0);
+        }
+
+        public InterfaceDeclarationContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_interfaceDeclaration;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener)
+                ((YJSParserListener) listener).enterInterfaceDeclaration(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener)
+                ((YJSParserListener) listener).exitInterfaceDeclaration(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitInterfaceDeclaration(this);
+            else
+                return visitor.visitChildren(this);
+        }
+    }
+
+    public final InterfaceDeclarationContext interfaceDeclaration() throws RecognitionException {
+        InterfaceDeclarationContext _localctx = new InterfaceDeclarationContext(_ctx, getState());
+        enterRule(_localctx, 14, RULE_interfaceDeclaration);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(191);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if (_la == AtToken) {
+                    {
+                        setState(190);
+                        annotations();
+                    }
+                }
+
+                setState(193);
+                match(Interface);
+                setState(194);
+                match(Identifier);
+                setState(195);
+                match(OpenParen);
+                setState(197);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if ((((_la) & ~0x3f) == 0 && ((1L << _la)
+                        & ((1L << OpenBracket) | (1L << OpenBrace) | (1L << Ellipsis))) != 0)
+                        || _la == Identifier) {
+                    {
+                        setState(196);
+                        formalParameterList();
+                    }
+                }
+
+                setState(199);
+                match(CloseParen);
+                setState(200);
+                eos();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class EventDeclarationContext extends ParserRuleContext {
+        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 EventGlobalOrLocalContext eventGlobalOrLocal() {
+            return getRuleContext(EventGlobalOrLocalContext.class, 0);
+        }
+
+        public TerminalNode OpenParen() {
+            return getToken(YJSParser.OpenParen, 0);
+        }
+
+        public TerminalNode CloseParen() {
+            return getToken(YJSParser.CloseParen, 0);
+        }
+
+        public EventSemanticsContext eventSemantics() {
+            return getRuleContext(EventSemanticsContext.class, 0);
+        }
+
+        public EventDeclarationContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final EventDeclarationContext eventDeclaration() throws RecognitionException {
+        EventDeclarationContext _localctx = new EventDeclarationContext(_ctx, getState());
+        enterRule(_localctx, 16, RULE_eventDeclaration);
+        int _la;
+        try {
+            setState(219);
+            _errHandler.sync(this);
+            switch (getInterpreter().adaptivePredict(_input, 13, _ctx)) {
+                case 1:
+                    enterOuterAlt(_localctx, 1); {
+                    setState(202);
+                    match(Event);
+                    setState(204);
+                    _errHandler.sync(this);
+                    _la = _input.LA(1);
+                    if (_la == Global || _la == Local) {
+                        {
+                            setState(203);
+                            eventGlobalOrLocal();
+                        }
+                    }
+
+                    setState(206);
+                    match(Identifier);
+                    setState(207);
+                    match(SemiColon);
+                }
+                    break;
+                case 2:
+                    enterOuterAlt(_localctx, 2); {
+                    setState(208);
+                    match(Event);
+                    setState(210);
+                    _errHandler.sync(this);
+                    _la = _input.LA(1);
+                    if (_la == Global || _la == Local) {
+                        {
+                            setState(209);
+                            eventGlobalOrLocal();
+                        }
+                    }
+
+                    setState(212);
+                    match(Identifier);
+                    setState(213);
+                    match(OpenParen);
+                    setState(215);
+                    _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(214);
+                            eventSemantics();
+                        }
+                    }
+
+                    setState(217);
+                    match(CloseParen);
+                    setState(218);
+                    match(SemiColon);
+                }
+                    break;
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class EventGlobalOrLocalContext extends ParserRuleContext {
+        public TerminalNode Global() {
+            return getToken(YJSParser.Global, 0);
+        }
+
+        public TerminalNode Local() {
+            return getToken(YJSParser.Local, 0);
+        }
+
+        public EventGlobalOrLocalContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_eventGlobalOrLocal;
+        }
+
+        @Override
+        public void enterRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener)
+                ((YJSParserListener) listener).enterEventGlobalOrLocal(this);
+        }
+
+        @Override
+        public void exitRule(ParseTreeListener listener) {
+            if (listener instanceof YJSParserListener)
+                ((YJSParserListener) listener).exitEventGlobalOrLocal(this);
+        }
+
+        @Override
+        public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+            if (visitor instanceof YJSParserVisitor)
+                return ((YJSParserVisitor<? extends T>) visitor).visitEventGlobalOrLocal(this);
+            else
+                return visitor.visitChildren(this);
+        }
+    }
+
+    public final EventGlobalOrLocalContext eventGlobalOrLocal() throws RecognitionException {
+        EventGlobalOrLocalContext _localctx = new EventGlobalOrLocalContext(_ctx, getState());
+        enterRule(_localctx, 18, RULE_eventGlobalOrLocal);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(221);
+                _la = _input.LA(1);
+                if (!(_la == Global || _la == Local)) {
+                    _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 static class EventSemanticsContext extends ParserRuleContext {
+        public TerminalNode AtLeastOnce() {
+            return getToken(YJSParser.AtLeastOnce, 0);
+        }
+
+        public TerminalNode AtMostOnce() {
+            return getToken(YJSParser.AtMostOnce, 0);
+        }
+
+        public TerminalNode OnlyOnce() {
+            return getToken(YJSParser.OnlyOnce, 0);
+        }
+
+        public EventSemanticsContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final EventSemanticsContext eventSemantics() throws RecognitionException {
+        EventSemanticsContext _localctx = new EventSemanticsContext(_ctx, getState());
+        enterRule(_localctx, 20, RULE_eventSemantics);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(223);
+                _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 static class SourceElementContext extends ParserRuleContext {
+        public StatementContext statement() {
+            return getRuleContext(StatementContext.class, 0);
+        }
+
+        public SourceElementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final SourceElementContext sourceElement() throws RecognitionException {
+        SourceElementContext _localctx = new SourceElementContext(_ctx, getState());
+        enterRule(_localctx, 22, RULE_sourceElement);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(225);
+                statement();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class ImportStmtsContext extends ParserRuleContext {
+        public List<ImportStmtContext> importStmt() {
+            return getRuleContexts(ImportStmtContext.class);
+        }
+
+        public ImportStmtContext importStmt(int i) {
+            return getRuleContext(ImportStmtContext.class, i);
+        }
+
+        public ImportStmtsContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final ImportStmtsContext importStmts() throws RecognitionException {
+        ImportStmtsContext _localctx = new ImportStmtsContext(_ctx, getState());
+        enterRule(_localctx, 24, RULE_importStmts);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(228);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                do {
+                    {
+                        {
+                            setState(227);
+                            importStmt();
+                        }
+                    }
+                    setState(230);
+                    _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 static class ImportStmtContext extends ParserRuleContext {
+        public TerminalNode Import() {
+            return getToken(YJSParser.Import, 0);
+        }
+
+        public TerminalNode StringLiteral() {
+            return getToken(YJSParser.StringLiteral, 0);
+        }
+
+        public TerminalNode SemiColon() {
+            return getToken(YJSParser.SemiColon, 0);
+        }
+
+        public ImportStmtContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final ImportStmtContext importStmt() throws RecognitionException {
+        ImportStmtContext _localctx = new ImportStmtContext(_ctx, getState());
+        enterRule(_localctx, 26, RULE_importStmt);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(232);
+                match(Import);
+                setState(233);
+                match(StringLiteral);
+                setState(234);
+                match(SemiColon);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class ExportStmtContext extends ParserRuleContext {
+        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);
+        }
+
+        public ExportStmtContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final ExportStmtContext exportStmt() throws RecognitionException {
+        ExportStmtContext _localctx = new ExportStmtContext(_ctx, getState());
+        enterRule(_localctx, 28, RULE_exportStmt);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(236);
+                match(Export);
+                setState(237);
+                match(Identifier);
+                setState(238);
+                versionName();
+                setState(239);
+                match(SemiColon);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class VersionNameContext extends ParserRuleContext {
+        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);
+        }
+
+        public VersionNameContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final VersionNameContext versionName() throws RecognitionException {
+        VersionNameContext _localctx = new VersionNameContext(_ctx, getState());
+        enterRule(_localctx, 30, RULE_versionName);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(241);
+                match(DecimalLiteral);
+                setState(246);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                while (_la == Dot) {
+                    {
+                        {
+                            setState(242);
+                            match(Dot);
+                            setState(243);
+                            match(DecimalLiteral);
+                        }
+                    }
+                    setState(248);
+                    _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 static class StatementContext extends ParserRuleContext {
+        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);
+        }
+
+        public StatementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final StatementContext statement() throws RecognitionException {
+        StatementContext _localctx = new StatementContext(_ctx, getState());
+        enterRule(_localctx, 32, RULE_statement);
+        try {
+            setState(259);
+            _errHandler.sync(this);
+            switch (getInterpreter().adaptivePredict(_input, 16, _ctx)) {
+                case 1:
+                    enterOuterAlt(_localctx, 1); {
+                    setState(249);
+                    block();
+                }
+                    break;
+                case 2:
+                    enterOuterAlt(_localctx, 2); {
+                    setState(250);
+                    variableStatement();
+                }
+                    break;
+                case 3:
+                    enterOuterAlt(_localctx, 3); {
+                    setState(251);
+                    emptyStatement();
+                }
+                    break;
+                case 4:
+                    enterOuterAlt(_localctx, 4); {
+                    setState(252);
+                    expressionStatement();
+                }
+                    break;
+                case 5:
+                    enterOuterAlt(_localctx, 5); {
+                    setState(253);
+                    ifStatement();
+                }
+                    break;
+                case 6:
+                    enterOuterAlt(_localctx, 6); {
+                    setState(254);
+                    iterationStatement();
+                }
+                    break;
+                case 7:
+                    enterOuterAlt(_localctx, 7); {
+                    setState(255);
+                    continueStatement();
+                }
+                    break;
+                case 8:
+                    enterOuterAlt(_localctx, 8); {
+                    setState(256);
+                    breakStatement();
+                }
+                    break;
+                case 9:
+                    enterOuterAlt(_localctx, 9); {
+                    setState(257);
+                    returnStatement();
+                }
+                    break;
+                case 10:
+                    enterOuterAlt(_localctx, 10); {
+                    setState(258);
+                    switchStatement();
+                }
+                    break;
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class BlockContext extends ParserRuleContext {
+        public TerminalNode OpenBrace() {
+            return getToken(YJSParser.OpenBrace, 0);
+        }
+
+        public TerminalNode CloseBrace() {
+            return getToken(YJSParser.CloseBrace, 0);
+        }
+
+        public StatementListContext statementList() {
+            return getRuleContext(StatementListContext.class, 0);
+        }
+
+        public BlockContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final BlockContext block() throws RecognitionException {
+        BlockContext _localctx = new BlockContext(_ctx, getState());
+        enterRule(_localctx, 34, RULE_block);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(261);
+                match(OpenBrace);
+                setState(263);
+                _errHandler.sync(this);
+                switch (getInterpreter().adaptivePredict(_input, 17, _ctx)) {
+                    case 1: {
+                        setState(262);
+                        statementList();
+                    }
+                        break;
+                }
+                setState(265);
+                match(CloseBrace);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class StatementListContext extends ParserRuleContext {
+        public List<StatementContext> statement() {
+            return getRuleContexts(StatementContext.class);
+        }
+
+        public StatementContext statement(int i) {
+            return getRuleContext(StatementContext.class, i);
+        }
+
+        public StatementListContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final StatementListContext statementList() throws RecognitionException {
+        StatementListContext _localctx = new StatementListContext(_ctx, getState());
+        enterRule(_localctx, 36, RULE_statementList);
+        try {
+            int _alt;
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(268);
+                _errHandler.sync(this);
+                _alt = 1;
+                do {
+                    switch (_alt) {
+                        case 1: {
+                            {
+                                setState(267);
+                                statement();
+                            }
+                        }
+                            break;
+                        default:
+                            throw new NoViableAltException(this);
+                    }
+                    setState(270);
+                    _errHandler.sync(this);
+                    _alt = getInterpreter().adaptivePredict(_input, 18, _ctx);
+                } while (_alt != 2 && _alt != org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class VariableStatementContext extends ParserRuleContext {
+        public VarModifierContext varModifier() {
+            return getRuleContext(VarModifierContext.class, 0);
+        }
+
+        public VariableDeclarationListContext variableDeclarationList() {
+            return getRuleContext(VariableDeclarationListContext.class, 0);
+        }
+
+        public EosContext eos() {
+            return getRuleContext(EosContext.class, 0);
+        }
+
+        public VariableStatementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final VariableStatementContext variableStatement() throws RecognitionException {
+        VariableStatementContext _localctx = new VariableStatementContext(_ctx, getState());
+        enterRule(_localctx, 38, RULE_variableStatement);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(272);
+                varModifier();
+                setState(273);
+                variableDeclarationList();
+                setState(274);
+                eos();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class VariableDeclarationListContext extends ParserRuleContext {
+        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);
+        }
+
+        public VariableDeclarationListContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final VariableDeclarationListContext variableDeclarationList()
+            throws RecognitionException {
+        VariableDeclarationListContext _localctx =
+                new VariableDeclarationListContext(_ctx, getState());
+        enterRule(_localctx, 40, RULE_variableDeclarationList);
+        try {
+            int _alt;
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(276);
+                variableDeclaration();
+                setState(281);
+                _errHandler.sync(this);
+                _alt = getInterpreter().adaptivePredict(_input, 19, _ctx);
+                while (_alt != 2 && _alt != org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER) {
+                    if (_alt == 1) {
+                        {
+                            {
+                                setState(277);
+                                match(Comma);
+                                setState(278);
+                                variableDeclaration();
+                            }
+                        }
+                    }
+                    setState(283);
+                    _errHandler.sync(this);
+                    _alt = getInterpreter().adaptivePredict(_input, 19, _ctx);
+                }
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class VariableDeclarationContext extends ParserRuleContext {
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        public TerminalNode Assign() {
+            return getToken(YJSParser.Assign, 0);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        public VariableDeclarationContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final VariableDeclarationContext variableDeclaration() throws RecognitionException {
+        VariableDeclarationContext _localctx = new VariableDeclarationContext(_ctx, getState());
+        enterRule(_localctx, 42, RULE_variableDeclaration);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                {
+                    setState(284);
+                    match(Identifier);
+                }
+                setState(287);
+                _errHandler.sync(this);
+                switch (getInterpreter().adaptivePredict(_input, 20, _ctx)) {
+                    case 1: {
+                        setState(285);
+                        match(Assign);
+                        setState(286);
+                        singleExpression(0);
+                    }
+                        break;
+                }
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class EmptyStatementContext extends ParserRuleContext {
+        public TerminalNode SemiColon() {
+            return getToken(YJSParser.SemiColon, 0);
+        }
+
+        public EmptyStatementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final EmptyStatementContext emptyStatement() throws RecognitionException {
+        EmptyStatementContext _localctx = new EmptyStatementContext(_ctx, getState());
+        enterRule(_localctx, 44, RULE_emptyStatement);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(289);
+                match(SemiColon);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class ExpressionStatementContext extends ParserRuleContext {
+        public ExpressionSequenceContext expressionSequence() {
+            return getRuleContext(ExpressionSequenceContext.class, 0);
+        }
+
+        public EosContext eos() {
+            return getRuleContext(EosContext.class, 0);
+        }
+
+        public ExpressionStatementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final ExpressionStatementContext expressionStatement() throws RecognitionException {
+        ExpressionStatementContext _localctx = new ExpressionStatementContext(_ctx, getState());
+        enterRule(_localctx, 46, RULE_expressionStatement);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(291);
+                if (!(notOpenBraceAndNotFunction()))
+                    throw new FailedPredicateException(this, "notOpenBraceAndNotFunction()");
+                setState(292);
+                expressionSequence();
+                setState(293);
+                eos();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class IfStatementContext extends ParserRuleContext {
+        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);
+        }
+
+        public IfStatementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final IfStatementContext ifStatement() throws RecognitionException {
+        IfStatementContext _localctx = new IfStatementContext(_ctx, getState());
+        enterRule(_localctx, 48, RULE_ifStatement);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(295);
+                match(If);
+                setState(296);
+                match(OpenParen);
+                setState(297);
+                expressionSequence();
+                setState(298);
+                match(CloseParen);
+                setState(299);
+                statement();
+                setState(302);
+                _errHandler.sync(this);
+                switch (getInterpreter().adaptivePredict(_input, 21, _ctx)) {
+                    case 1: {
+                        setState(300);
+                        match(Else);
+                        setState(301);
+                        statement();
+                    }
+                        break;
+                }
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class IterationStatementContext extends ParserRuleContext {
+        public IterationStatementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_iterationStatement;
+        }
+
+        public IterationStatementContext() {}
+
+        public void copyFrom(IterationStatementContext ctx) {
+            super.copyFrom(ctx);
+        }
+    }
+    public static class DoStatementContext extends IterationStatementContext {
+        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);
+        }
+
+        public DoStatementContext(IterationStatementContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 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);
+        }
+
+        public ForVarStatementContext(IterationStatementContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 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);
+        }
+
+        public ForVarInStatementContext(IterationStatementContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 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);
+        }
+
+        public WhileStatementContext(IterationStatementContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 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);
+        }
+
+        public ForStatementContext(IterationStatementContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 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);
+        }
+
+        public ForInStatementContext(IterationStatementContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 final IterationStatementContext iterationStatement() throws RecognitionException {
+        IterationStatementContext _localctx = new IterationStatementContext(_ctx, getState());
+        enterRule(_localctx, 50, RULE_iterationStatement);
+        int _la;
+        try {
+            setState(373);
+            _errHandler.sync(this);
+            switch (getInterpreter().adaptivePredict(_input, 29, _ctx)) {
+                case 1:
+                    _localctx = new DoStatementContext(_localctx);
+                    enterOuterAlt(_localctx, 1); {
+                    setState(304);
+                    match(Do);
+                    setState(305);
+                    statement();
+                    setState(306);
+                    match(While);
+                    setState(307);
+                    match(OpenParen);
+                    setState(308);
+                    expressionSequence();
+                    setState(309);
+                    match(CloseParen);
+                    setState(310);
+                    eos();
+                }
+                    break;
+                case 2:
+                    _localctx = new WhileStatementContext(_localctx);
+                    enterOuterAlt(_localctx, 2); {
+                    setState(312);
+                    match(While);
+                    setState(313);
+                    match(OpenParen);
+                    setState(314);
+                    expressionSequence();
+                    setState(315);
+                    match(CloseParen);
+                    setState(316);
+                    statement();
+                }
+                    break;
+                case 3:
+                    _localctx = new ForStatementContext(_localctx);
+                    enterOuterAlt(_localctx, 3); {
+                    setState(318);
+                    match(For);
+                    setState(319);
+                    match(OpenParen);
+                    setState(321);
+                    _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(320);
+                            expressionSequence();
+                        }
+                    }
+
+                    setState(323);
+                    match(SemiColon);
+                    setState(325);
+                    _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(324);
+                            expressionSequence();
+                        }
+                    }
+
+                    setState(327);
+                    match(SemiColon);
+                    setState(329);
+                    _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(328);
+                            expressionSequence();
+                        }
+                    }
+
+                    setState(331);
+                    match(CloseParen);
+                    setState(332);
+                    statement();
+                }
+                    break;
+                case 4:
+                    _localctx = new ForVarStatementContext(_localctx);
+                    enterOuterAlt(_localctx, 4); {
+                    setState(333);
+                    match(For);
+                    setState(334);
+                    match(OpenParen);
+                    setState(335);
+                    varModifier();
+                    setState(336);
+                    variableDeclarationList();
+                    setState(337);
+                    match(SemiColon);
+                    setState(339);
+                    _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(338);
+                            expressionSequence();
+                        }
+                    }
+
+                    setState(341);
+                    match(SemiColon);
+                    setState(343);
+                    _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(342);
+                            expressionSequence();
+                        }
+                    }
+
+                    setState(345);
+                    match(CloseParen);
+                    setState(346);
+                    statement();
+                }
+                    break;
+                case 5:
+                    _localctx = new ForInStatementContext(_localctx);
+                    enterOuterAlt(_localctx, 5); {
+                    setState(348);
+                    match(For);
+                    setState(349);
+                    match(OpenParen);
+                    setState(350);
+                    singleExpression(0);
+                    setState(354);
+                    _errHandler.sync(this);
+                    switch (_input.LA(1)) {
+                        case In: {
+                            setState(351);
+                            match(In);
+                        }
+                            break;
+                        case Identifier: {
+                            setState(352);
+                            match(Identifier);
+                            setState(353);
+                            if (!(p("of")))
+                                throw new FailedPredicateException(this, "p(\"of\")");
+                        }
+                            break;
+                        default:
+                            throw new NoViableAltException(this);
+                    }
+                    setState(356);
+                    expressionSequence();
+                    setState(357);
+                    match(CloseParen);
+                    setState(358);
+                    statement();
+                }
+                    break;
+                case 6:
+                    _localctx = new ForVarInStatementContext(_localctx);
+                    enterOuterAlt(_localctx, 6); {
+                    setState(360);
+                    match(For);
+                    setState(361);
+                    match(OpenParen);
+                    setState(362);
+                    varModifier();
+                    setState(363);
+                    variableDeclaration();
+                    setState(367);
+                    _errHandler.sync(this);
+                    switch (_input.LA(1)) {
+                        case In: {
+                            setState(364);
+                            match(In);
+                        }
+                            break;
+                        case Identifier: {
+                            setState(365);
+                            match(Identifier);
+                            setState(366);
+                            if (!(p("of")))
+                                throw new FailedPredicateException(this, "p(\"of\")");
+                        }
+                            break;
+                        default:
+                            throw new NoViableAltException(this);
+                    }
+                    setState(369);
+                    expressionSequence();
+                    setState(370);
+                    match(CloseParen);
+                    setState(371);
+                    statement();
+                }
+                    break;
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class VarModifierContext extends ParserRuleContext {
+        public TerminalNode Var() {
+            return getToken(YJSParser.Var, 0);
+        }
+
+        public VarModifierContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final VarModifierContext varModifier() throws RecognitionException {
+        VarModifierContext _localctx = new VarModifierContext(_ctx, getState());
+        enterRule(_localctx, 52, RULE_varModifier);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(375);
+                match(Var);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class ContinueStatementContext extends ParserRuleContext {
+        public TerminalNode Continue() {
+            return getToken(YJSParser.Continue, 0);
+        }
+
+        public EosContext eos() {
+            return getRuleContext(EosContext.class, 0);
+        }
+
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        public ContinueStatementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final ContinueStatementContext continueStatement() throws RecognitionException {
+        ContinueStatementContext _localctx = new ContinueStatementContext(_ctx, getState());
+        enterRule(_localctx, 54, RULE_continueStatement);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(377);
+                match(Continue);
+                setState(380);
+                _errHandler.sync(this);
+                switch (getInterpreter().adaptivePredict(_input, 30, _ctx)) {
+                    case 1: {
+                        setState(378);
+                        if (!(notLineTerminator()))
+                            throw new FailedPredicateException(this, "notLineTerminator()");
+                        setState(379);
+                        match(Identifier);
+                    }
+                        break;
+                }
+                setState(382);
+                eos();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class BreakStatementContext extends ParserRuleContext {
+        public TerminalNode Break() {
+            return getToken(YJSParser.Break, 0);
+        }
+
+        public EosContext eos() {
+            return getRuleContext(EosContext.class, 0);
+        }
+
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        public BreakStatementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final BreakStatementContext breakStatement() throws RecognitionException {
+        BreakStatementContext _localctx = new BreakStatementContext(_ctx, getState());
+        enterRule(_localctx, 56, RULE_breakStatement);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(384);
+                match(Break);
+                setState(387);
+                _errHandler.sync(this);
+                switch (getInterpreter().adaptivePredict(_input, 31, _ctx)) {
+                    case 1: {
+                        setState(385);
+                        if (!(notLineTerminator()))
+                            throw new FailedPredicateException(this, "notLineTerminator()");
+                        setState(386);
+                        match(Identifier);
+                    }
+                        break;
+                }
+                setState(389);
+                eos();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class ReturnStatementContext extends ParserRuleContext {
+        public TerminalNode Return() {
+            return getToken(YJSParser.Return, 0);
+        }
+
+        public EosContext eos() {
+            return getRuleContext(EosContext.class, 0);
+        }
+
+        public ExpressionSequenceContext expressionSequence() {
+            return getRuleContext(ExpressionSequenceContext.class, 0);
+        }
+
+        public ReturnStatementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final ReturnStatementContext returnStatement() throws RecognitionException {
+        ReturnStatementContext _localctx = new ReturnStatementContext(_ctx, getState());
+        enterRule(_localctx, 58, RULE_returnStatement);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(391);
+                match(Return);
+                setState(394);
+                _errHandler.sync(this);
+                switch (getInterpreter().adaptivePredict(_input, 32, _ctx)) {
+                    case 1: {
+                        setState(392);
+                        if (!(notLineTerminator()))
+                            throw new FailedPredicateException(this, "notLineTerminator()");
+                        setState(393);
+                        expressionSequence();
+                    }
+                        break;
+                }
+                setState(396);
+                eos();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class WithStatementContext extends ParserRuleContext {
+        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);
+        }
+
+        public WithStatementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final WithStatementContext withStatement() throws RecognitionException {
+        WithStatementContext _localctx = new WithStatementContext(_ctx, getState());
+        enterRule(_localctx, 60, RULE_withStatement);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(398);
+                match(With);
+                setState(399);
+                match(OpenParen);
+                setState(400);
+                expressionSequence();
+                setState(401);
+                match(CloseParen);
+                setState(402);
+                statement();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class SwitchStatementContext extends ParserRuleContext {
+        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);
+        }
+
+        public SwitchStatementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final SwitchStatementContext switchStatement() throws RecognitionException {
+        SwitchStatementContext _localctx = new SwitchStatementContext(_ctx, getState());
+        enterRule(_localctx, 62, RULE_switchStatement);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(404);
+                match(Switch);
+                setState(405);
+                match(OpenParen);
+                setState(406);
+                expressionSequence();
+                setState(407);
+                match(CloseParen);
+                setState(408);
+                caseBlock();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class CaseBlockContext extends ParserRuleContext {
+        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);
+        }
+
+        public CaseBlockContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final CaseBlockContext caseBlock() throws RecognitionException {
+        CaseBlockContext _localctx = new CaseBlockContext(_ctx, getState());
+        enterRule(_localctx, 64, RULE_caseBlock);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(410);
+                match(OpenBrace);
+                setState(412);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if (_la == Case) {
+                    {
+                        setState(411);
+                        caseClauses();
+                    }
+                }
+
+                setState(418);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if (_la == Default) {
+                    {
+                        setState(414);
+                        defaultClause();
+                        setState(416);
+                        _errHandler.sync(this);
+                        _la = _input.LA(1);
+                        if (_la == Case) {
+                            {
+                                setState(415);
+                                caseClauses();
+                            }
+                        }
+
+                    }
+                }
+
+                setState(420);
+                match(CloseBrace);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class CaseClausesContext extends ParserRuleContext {
+        public List<CaseClauseContext> caseClause() {
+            return getRuleContexts(CaseClauseContext.class);
+        }
+
+        public CaseClauseContext caseClause(int i) {
+            return getRuleContext(CaseClauseContext.class, i);
+        }
+
+        public CaseClausesContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final CaseClausesContext caseClauses() throws RecognitionException {
+        CaseClausesContext _localctx = new CaseClausesContext(_ctx, getState());
+        enterRule(_localctx, 66, RULE_caseClauses);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(423);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                do {
+                    {
+                        {
+                            setState(422);
+                            caseClause();
+                        }
+                    }
+                    setState(425);
+                    _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 static class CaseClauseContext extends ParserRuleContext {
+        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);
+        }
+
+        public CaseClauseContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final CaseClauseContext caseClause() throws RecognitionException {
+        CaseClauseContext _localctx = new CaseClauseContext(_ctx, getState());
+        enterRule(_localctx, 68, RULE_caseClause);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(427);
+                match(Case);
+                setState(428);
+                expressionSequence();
+                setState(429);
+                match(Colon);
+                setState(431);
+                _errHandler.sync(this);
+                switch (getInterpreter().adaptivePredict(_input, 37, _ctx)) {
+                    case 1: {
+                        setState(430);
+                        statementList();
+                    }
+                        break;
+                }
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class DefaultClauseContext extends ParserRuleContext {
+        public TerminalNode Default() {
+            return getToken(YJSParser.Default, 0);
+        }
+
+        public TerminalNode Colon() {
+            return getToken(YJSParser.Colon, 0);
+        }
+
+        public StatementListContext statementList() {
+            return getRuleContext(StatementListContext.class, 0);
+        }
+
+        public DefaultClauseContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final DefaultClauseContext defaultClause() throws RecognitionException {
+        DefaultClauseContext _localctx = new DefaultClauseContext(_ctx, getState());
+        enterRule(_localctx, 70, RULE_defaultClause);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(433);
+                match(Default);
+                setState(434);
+                match(Colon);
+                setState(436);
+                _errHandler.sync(this);
+                switch (getInterpreter().adaptivePredict(_input, 38, _ctx)) {
+                    case 1: {
+                        setState(435);
+                        statementList();
+                    }
+                        break;
+                }
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class ThrowStatementContext extends ParserRuleContext {
+        public TerminalNode Throw() {
+            return getToken(YJSParser.Throw, 0);
+        }
+
+        public ExpressionSequenceContext expressionSequence() {
+            return getRuleContext(ExpressionSequenceContext.class, 0);
+        }
+
+        public EosContext eos() {
+            return getRuleContext(EosContext.class, 0);
+        }
+
+        public ThrowStatementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final ThrowStatementContext throwStatement() throws RecognitionException {
+        ThrowStatementContext _localctx = new ThrowStatementContext(_ctx, getState());
+        enterRule(_localctx, 72, RULE_throwStatement);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(438);
+                match(Throw);
+                setState(439);
+                if (!(notLineTerminator()))
+                    throw new FailedPredicateException(this, "notLineTerminator()");
+                setState(440);
+                expressionSequence();
+                setState(441);
+                eos();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class TryStatementContext extends ParserRuleContext {
+        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);
+        }
+
+        public TryStatementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final TryStatementContext tryStatement() throws RecognitionException {
+        TryStatementContext _localctx = new TryStatementContext(_ctx, getState());
+        enterRule(_localctx, 74, RULE_tryStatement);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(443);
+                match(Try);
+                setState(444);
+                block();
+                setState(450);
+                _errHandler.sync(this);
+                switch (_input.LA(1)) {
+                    case Catch: {
+                        setState(445);
+                        catchProduction();
+                        setState(447);
+                        _errHandler.sync(this);
+                        _la = _input.LA(1);
+                        if (_la == Finally) {
+                            {
+                                setState(446);
+                                finallyProduction();
+                            }
+                        }
+
+                    }
+                        break;
+                    case Finally: {
+                        setState(449);
+                        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 static class CatchProductionContext extends ParserRuleContext {
+        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);
+        }
+
+        public CatchProductionContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final CatchProductionContext catchProduction() throws RecognitionException {
+        CatchProductionContext _localctx = new CatchProductionContext(_ctx, getState());
+        enterRule(_localctx, 76, RULE_catchProduction);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(452);
+                match(Catch);
+                setState(453);
+                match(OpenParen);
+                setState(454);
+                match(Identifier);
+                setState(455);
+                match(CloseParen);
+                setState(456);
+                block();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class FinallyProductionContext extends ParserRuleContext {
+        public TerminalNode Finally() {
+            return getToken(YJSParser.Finally, 0);
+        }
+
+        public BlockContext block() {
+            return getRuleContext(BlockContext.class, 0);
+        }
+
+        public FinallyProductionContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final FinallyProductionContext finallyProduction() throws RecognitionException {
+        FinallyProductionContext _localctx = new FinallyProductionContext(_ctx, getState());
+        enterRule(_localctx, 78, RULE_finallyProduction);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(458);
+                match(Finally);
+                setState(459);
+                block();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class DebuggerStatementContext extends ParserRuleContext {
+        public TerminalNode Debugger() {
+            return getToken(YJSParser.Debugger, 0);
+        }
+
+        public EosContext eos() {
+            return getRuleContext(EosContext.class, 0);
+        }
+
+        public DebuggerStatementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final DebuggerStatementContext debuggerStatement() throws RecognitionException {
+        DebuggerStatementContext _localctx = new DebuggerStatementContext(_ctx, getState());
+        enterRule(_localctx, 80, RULE_debuggerStatement);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(461);
+                match(Debugger);
+                setState(462);
+                eos();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class FunctionDeclarationContext extends ParserRuleContext {
+        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);
+        }
+
+        public TerminalNode View() {
+            return getToken(YJSParser.View, 0);
+        }
+
+        public FunctionDeclarationContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final FunctionDeclarationContext functionDeclaration() throws RecognitionException {
+        FunctionDeclarationContext _localctx = new FunctionDeclarationContext(_ctx, getState());
+        enterRule(_localctx, 82, RULE_functionDeclaration);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(465);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if (_la == AtToken) {
+                    {
+                        setState(464);
+                        annotations();
+                    }
+                }
+
+                setState(468);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if (_la == Export) {
+                    {
+                        setState(467);
+                        match(Export);
+                    }
+                }
+
+                setState(470);
+                match(Function);
+                setState(471);
+                match(Identifier);
+                setState(472);
+                match(OpenParen);
+                setState(474);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if ((((_la) & ~0x3f) == 0 && ((1L << _la)
+                        & ((1L << OpenBracket) | (1L << OpenBrace) | (1L << Ellipsis))) != 0)
+                        || _la == Identifier) {
+                    {
+                        setState(473);
+                        formalParameterList();
+                    }
+                }
+
+                setState(476);
+                match(CloseParen);
+                setState(478);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if (_la == View) {
+                    {
+                        setState(477);
+                        match(View);
+                    }
+                }
+
+                setState(480);
+                match(OpenBrace);
+                setState(481);
+                functionBody();
+                setState(482);
+                match(CloseBrace);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class ClassDeclarationContext extends ParserRuleContext {
+        public TerminalNode Class() {
+            return getToken(YJSParser.Class, 0);
+        }
+
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        public ClassTailContext classTail() {
+            return getRuleContext(ClassTailContext.class, 0);
+        }
+
+        public ClassDeclarationContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final ClassDeclarationContext classDeclaration() throws RecognitionException {
+        ClassDeclarationContext _localctx = new ClassDeclarationContext(_ctx, getState());
+        enterRule(_localctx, 84, RULE_classDeclaration);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(484);
+                match(Class);
+                setState(485);
+                match(Identifier);
+                setState(486);
+                classTail();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class ClassTailContext extends ParserRuleContext {
+        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);
+        }
+
+        public ClassTailContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final ClassTailContext classTail() throws RecognitionException {
+        ClassTailContext _localctx = new ClassTailContext(_ctx, getState());
+        enterRule(_localctx, 86, RULE_classTail);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(490);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if (_la == Extends) {
+                    {
+                        setState(488);
+                        match(Extends);
+                        setState(489);
+                        singleExpression(0);
+                    }
+                }
+
+                setState(492);
+                match(OpenBrace);
+                setState(496);
+                _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(493);
+                            classElement();
+                        }
+                    }
+                    setState(498);
+                    _errHandler.sync(this);
+                    _la = _input.LA(1);
+                }
+                setState(499);
+                match(CloseBrace);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class ClassElementContext extends ParserRuleContext {
+        public MethodDefinitionContext methodDefinition() {
+            return getRuleContext(MethodDefinitionContext.class, 0);
+        }
+
+        public TerminalNode Static() {
+            return getToken(YJSParser.Static, 0);
+        }
+
+        public ClassElementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final ClassElementContext classElement() throws RecognitionException {
+        ClassElementContext _localctx = new ClassElementContext(_ctx, getState());
+        enterRule(_localctx, 88, RULE_classElement);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(502);
+                _errHandler.sync(this);
+                switch (getInterpreter().adaptivePredict(_input, 47, _ctx)) {
+                    case 1: {
+                        setState(501);
+                        match(Static);
+                    }
+                        break;
+                }
+                setState(504);
+                methodDefinition();
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class MethodDefinitionContext extends ParserRuleContext {
+        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);
+        }
+
+        public MethodDefinitionContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final MethodDefinitionContext methodDefinition() throws RecognitionException {
+        MethodDefinitionContext _localctx = new MethodDefinitionContext(_ctx, getState());
+        enterRule(_localctx, 90, RULE_methodDefinition);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(506);
+                propertyName();
+                setState(507);
+                match(OpenParen);
+                setState(509);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if ((((_la) & ~0x3f) == 0 && ((1L << _la)
+                        & ((1L << OpenBracket) | (1L << OpenBrace) | (1L << Ellipsis))) != 0)
+                        || _la == Identifier) {
+                    {
+                        setState(508);
+                        formalParameterList();
+                    }
+                }
+
+                setState(511);
+                match(CloseParen);
+                setState(512);
+                match(OpenBrace);
+                setState(513);
+                functionBody();
+                setState(514);
+                match(CloseBrace);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class FormalParameterListContext extends ParserRuleContext {
+        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);
+        }
+
+        public FormalParameterListContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final FormalParameterListContext formalParameterList() throws RecognitionException {
+        FormalParameterListContext _localctx = new FormalParameterListContext(_ctx, getState());
+        enterRule(_localctx, 92, RULE_formalParameterList);
+        int _la;
+        try {
+            int _alt;
+            setState(531);
+            _errHandler.sync(this);
+            switch (_input.LA(1)) {
+                case Identifier:
+                    enterOuterAlt(_localctx, 1); {
+                    setState(516);
+                    formalParameterArg();
+                    setState(521);
+                    _errHandler.sync(this);
+                    _alt = getInterpreter().adaptivePredict(_input, 49, _ctx);
+                    while (_alt != 2 && _alt != org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER) {
+                        if (_alt == 1) {
+                            {
+                                {
+                                    setState(517);
+                                    match(Comma);
+                                    setState(518);
+                                    formalParameterArg();
+                                }
+                            }
+                        }
+                        setState(523);
+                        _errHandler.sync(this);
+                        _alt = getInterpreter().adaptivePredict(_input, 49, _ctx);
+                    }
+                    setState(526);
+                    _errHandler.sync(this);
+                    _la = _input.LA(1);
+                    if (_la == Comma) {
+                        {
+                            setState(524);
+                            match(Comma);
+                            setState(525);
+                            lastFormalParameterArg();
+                        }
+                    }
+
+                }
+                    break;
+                case Ellipsis:
+                    enterOuterAlt(_localctx, 2); {
+                    setState(528);
+                    lastFormalParameterArg();
+                }
+                    break;
+                case OpenBracket:
+                    enterOuterAlt(_localctx, 3); {
+                    setState(529);
+                    arrayLiteral();
+                }
+                    break;
+                case OpenBrace:
+                    enterOuterAlt(_localctx, 4); {
+                    setState(530);
+                    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 static class FormalParameterArgContext extends ParserRuleContext {
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        public TerminalNode Assign() {
+            return getToken(YJSParser.Assign, 0);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        public FormalParameterArgContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final FormalParameterArgContext formalParameterArg() throws RecognitionException {
+        FormalParameterArgContext _localctx = new FormalParameterArgContext(_ctx, getState());
+        enterRule(_localctx, 94, RULE_formalParameterArg);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(533);
+                match(Identifier);
+                setState(536);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if (_la == Assign) {
+                    {
+                        setState(534);
+                        match(Assign);
+                        setState(535);
+                        singleExpression(0);
+                    }
+                }
+
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class LastFormalParameterArgContext extends ParserRuleContext {
+        public TerminalNode Ellipsis() {
+            return getToken(YJSParser.Ellipsis, 0);
+        }
+
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        public LastFormalParameterArgContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final LastFormalParameterArgContext lastFormalParameterArg()
+            throws RecognitionException {
+        LastFormalParameterArgContext _localctx =
+                new LastFormalParameterArgContext(_ctx, getState());
+        enterRule(_localctx, 96, RULE_lastFormalParameterArg);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(538);
+                match(Ellipsis);
+                setState(539);
+                match(Identifier);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class FunctionBodyContext extends ParserRuleContext {
+        public SourceElementsContext sourceElements() {
+            return getRuleContext(SourceElementsContext.class, 0);
+        }
+
+        public FunctionBodyContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final FunctionBodyContext functionBody() throws RecognitionException {
+        FunctionBodyContext _localctx = new FunctionBodyContext(_ctx, getState());
+        enterRule(_localctx, 98, RULE_functionBody);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(542);
+                _errHandler.sync(this);
+                switch (getInterpreter().adaptivePredict(_input, 53, _ctx)) {
+                    case 1: {
+                        setState(541);
+                        sourceElements();
+                    }
+                        break;
+                }
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class SourceElementsContext extends ParserRuleContext {
+        public List<SourceElementContext> sourceElement() {
+            return getRuleContexts(SourceElementContext.class);
+        }
+
+        public SourceElementContext sourceElement(int i) {
+            return getRuleContext(SourceElementContext.class, i);
+        }
+
+        public SourceElementsContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final SourceElementsContext sourceElements() throws RecognitionException {
+        SourceElementsContext _localctx = new SourceElementsContext(_ctx, getState());
+        enterRule(_localctx, 100, RULE_sourceElements);
+        try {
+            int _alt;
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(545);
+                _errHandler.sync(this);
+                _alt = 1;
+                do {
+                    switch (_alt) {
+                        case 1: {
+                            {
+                                setState(544);
+                                sourceElement();
+                            }
+                        }
+                            break;
+                        default:
+                            throw new NoViableAltException(this);
+                    }
+                    setState(547);
+                    _errHandler.sync(this);
+                    _alt = getInterpreter().adaptivePredict(_input, 54, _ctx);
+                } while (_alt != 2 && _alt != org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class ArrayLiteralContext extends ParserRuleContext {
+        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);
+        }
+
+        public ArrayLiteralContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final ArrayLiteralContext arrayLiteral() throws RecognitionException {
+        ArrayLiteralContext _localctx = new ArrayLiteralContext(_ctx, getState());
+        enterRule(_localctx, 102, RULE_arrayLiteral);
+        int _la;
+        try {
+            int _alt;
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(549);
+                match(OpenBracket);
+                setState(553);
+                _errHandler.sync(this);
+                _alt = getInterpreter().adaptivePredict(_input, 55, _ctx);
+                while (_alt != 2 && _alt != org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER) {
+                    if (_alt == 1) {
+                        {
+                            {
+                                setState(550);
+                                match(Comma);
+                            }
+                        }
+                    }
+                    setState(555);
+                    _errHandler.sync(this);
+                    _alt = getInterpreter().adaptivePredict(_input, 55, _ctx);
+                }
+                setState(557);
+                _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(556);
+                        elementList();
+                    }
+                }
+
+                setState(562);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                while (_la == Comma) {
+                    {
+                        {
+                            setState(559);
+                            match(Comma);
+                        }
+                    }
+                    setState(564);
+                    _errHandler.sync(this);
+                    _la = _input.LA(1);
+                }
+                setState(565);
+                match(CloseBracket);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class ElementListContext extends ParserRuleContext {
+        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);
+        }
+
+        public ElementListContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final ElementListContext elementList() throws RecognitionException {
+        ElementListContext _localctx = new ElementListContext(_ctx, getState());
+        enterRule(_localctx, 104, RULE_elementList);
+        int _la;
+        try {
+            int _alt;
+            setState(588);
+            _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(567);
+                    singleExpression(0);
+                    setState(576);
+                    _errHandler.sync(this);
+                    _alt = getInterpreter().adaptivePredict(_input, 59, _ctx);
+                    while (_alt != 2 && _alt != org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER) {
+                        if (_alt == 1) {
+                            {
+                                {
+                                    setState(569);
+                                    _errHandler.sync(this);
+                                    _la = _input.LA(1);
+                                    do {
+                                        {
+                                            {
+                                                setState(568);
+                                                match(Comma);
+                                            }
+                                        }
+                                        setState(571);
+                                        _errHandler.sync(this);
+                                        _la = _input.LA(1);
+                                    } while (_la == Comma);
+                                    setState(573);
+                                    singleExpression(0);
+                                }
+                            }
+                        }
+                        setState(578);
+                        _errHandler.sync(this);
+                        _alt = getInterpreter().adaptivePredict(_input, 59, _ctx);
+                    }
+                    setState(585);
+                    _errHandler.sync(this);
+                    switch (getInterpreter().adaptivePredict(_input, 61, _ctx)) {
+                        case 1: {
+                            setState(580);
+                            _errHandler.sync(this);
+                            _la = _input.LA(1);
+                            do {
+                                {
+                                    {
+                                        setState(579);
+                                        match(Comma);
+                                    }
+                                }
+                                setState(582);
+                                _errHandler.sync(this);
+                                _la = _input.LA(1);
+                            } while (_la == Comma);
+                            setState(584);
+                            lastElement();
+                        }
+                            break;
+                    }
+                }
+                    break;
+                case Ellipsis:
+                    enterOuterAlt(_localctx, 2); {
+                    setState(587);
+                    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 static class LastElementContext extends ParserRuleContext {
+        public TerminalNode Ellipsis() {
+            return getToken(YJSParser.Ellipsis, 0);
+        }
+
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        public LastElementContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final LastElementContext lastElement() throws RecognitionException {
+        LastElementContext _localctx = new LastElementContext(_ctx, getState());
+        enterRule(_localctx, 106, RULE_lastElement);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(590);
+                match(Ellipsis);
+                setState(591);
+                match(Identifier);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class ObjectLiteralContext extends ParserRuleContext {
+        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);
+        }
+
+        public ObjectLiteralContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final ObjectLiteralContext objectLiteral() throws RecognitionException {
+        ObjectLiteralContext _localctx = new ObjectLiteralContext(_ctx, getState());
+        enterRule(_localctx, 108, RULE_objectLiteral);
+        int _la;
+        try {
+            int _alt;
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(593);
+                match(OpenBrace);
+                setState(602);
+                _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(594);
+                        propertyAssignment();
+                        setState(599);
+                        _errHandler.sync(this);
+                        _alt = getInterpreter().adaptivePredict(_input, 63, _ctx);
+                        while (_alt != 2
+                                && _alt != org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER) {
+                            if (_alt == 1) {
+                                {
+                                    {
+                                        setState(595);
+                                        match(Comma);
+                                        setState(596);
+                                        propertyAssignment();
+                                    }
+                                }
+                            }
+                            setState(601);
+                            _errHandler.sync(this);
+                            _alt = getInterpreter().adaptivePredict(_input, 63, _ctx);
+                        }
+                    }
+                }
+
+                setState(605);
+                _errHandler.sync(this);
+                _la = _input.LA(1);
+                if (_la == Comma) {
+                    {
+                        setState(604);
+                        match(Comma);
+                    }
+                }
+
+                setState(607);
+                match(CloseBrace);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class PropertyAssignmentContext extends ParserRuleContext {
+        public PropertyAssignmentContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_propertyAssignment;
+        }
+
+        public PropertyAssignmentContext() {}
+
+        public void copyFrom(PropertyAssignmentContext ctx) {
+            super.copyFrom(ctx);
+        }
+    }
+    public static class PropertyExpressionAssignmentContext extends PropertyAssignmentContext {
+        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);
+        }
+
+        public PropertyExpressionAssignmentContext(PropertyAssignmentContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 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);
+        }
+
+        public ComputedPropertyExpressionAssignmentContext(PropertyAssignmentContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        public PropertyShorthandContext(PropertyAssignmentContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 final PropertyAssignmentContext propertyAssignment() throws RecognitionException {
+        PropertyAssignmentContext _localctx = new PropertyAssignmentContext(_ctx, getState());
+        enterRule(_localctx, 110, RULE_propertyAssignment);
+        int _la;
+        try {
+            setState(620);
+            _errHandler.sync(this);
+            switch (getInterpreter().adaptivePredict(_input, 66, _ctx)) {
+                case 1:
+                    _localctx = new PropertyExpressionAssignmentContext(_localctx);
+                    enterOuterAlt(_localctx, 1); {
+                    setState(609);
+                    propertyName();
+                    setState(610);
+                    _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(611);
+                    singleExpression(0);
+                }
+                    break;
+                case 2:
+                    _localctx = new ComputedPropertyExpressionAssignmentContext(_localctx);
+                    enterOuterAlt(_localctx, 2); {
+                    setState(613);
+                    match(OpenBracket);
+                    setState(614);
+                    singleExpression(0);
+                    setState(615);
+                    match(CloseBracket);
+                    setState(616);
+                    match(Colon);
+                    setState(617);
+                    singleExpression(0);
+                }
+                    break;
+                case 3:
+                    _localctx = new PropertyShorthandContext(_localctx);
+                    enterOuterAlt(_localctx, 3); {
+                    setState(619);
+                    match(Identifier);
+                }
+                    break;
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class PropertyNameContext extends ParserRuleContext {
+        public IdentifierNameContext identifierName() {
+            return getRuleContext(IdentifierNameContext.class, 0);
+        }
+
+        public TerminalNode StringLiteral() {
+            return getToken(YJSParser.StringLiteral, 0);
+        }
+
+        public NumericLiteralContext numericLiteral() {
+            return getRuleContext(NumericLiteralContext.class, 0);
+        }
+
+        public PropertyNameContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final PropertyNameContext propertyName() throws RecognitionException {
+        PropertyNameContext _localctx = new PropertyNameContext(_ctx, getState());
+        enterRule(_localctx, 112, RULE_propertyName);
+        try {
+            setState(625);
+            _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(622);
+                    identifierName();
+                }
+                    break;
+                case StringLiteral:
+                    enterOuterAlt(_localctx, 2); {
+                    setState(623);
+                    match(StringLiteral);
+                }
+                    break;
+                case DecimalLiteral:
+                case HexIntegerLiteral:
+                case OctalIntegerLiteral:
+                case OctalIntegerLiteral2:
+                case BinaryIntegerLiteral:
+                    enterOuterAlt(_localctx, 3); {
+                    setState(624);
+                    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 static class ArgumentsContext extends ParserRuleContext {
+        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);
+        }
+
+        public ArgumentsContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final ArgumentsContext arguments() throws RecognitionException {
+        ArgumentsContext _localctx = new ArgumentsContext(_ctx, getState());
+        enterRule(_localctx, 114, RULE_arguments);
+        int _la;
+        try {
+            int _alt;
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(627);
+                match(OpenParen);
+                setState(641);
+                _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(628);
+                        singleExpression(0);
+                        setState(633);
+                        _errHandler.sync(this);
+                        _alt = getInterpreter().adaptivePredict(_input, 68, _ctx);
+                        while (_alt != 2
+                                && _alt != org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER) {
+                            if (_alt == 1) {
+                                {
+                                    {
+                                        setState(629);
+                                        match(Comma);
+                                        setState(630);
+                                        singleExpression(0);
+                                    }
+                                }
+                            }
+                            setState(635);
+                            _errHandler.sync(this);
+                            _alt = getInterpreter().adaptivePredict(_input, 68, _ctx);
+                        }
+                        setState(638);
+                        _errHandler.sync(this);
+                        _la = _input.LA(1);
+                        if (_la == Comma) {
+                            {
+                                setState(636);
+                                match(Comma);
+                                setState(637);
+                                lastArgument();
+                            }
+                        }
+
+                    }
+                        break;
+                    case Ellipsis: {
+                        setState(640);
+                        lastArgument();
+                    }
+                        break;
+                    case CloseParen:
+                        break;
+                    default:
+                        break;
+                }
+                setState(643);
+                match(CloseParen);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class LastArgumentContext extends ParserRuleContext {
+        public TerminalNode Ellipsis() {
+            return getToken(YJSParser.Ellipsis, 0);
+        }
+
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        public LastArgumentContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final LastArgumentContext lastArgument() throws RecognitionException {
+        LastArgumentContext _localctx = new LastArgumentContext(_ctx, getState());
+        enterRule(_localctx, 116, RULE_lastArgument);
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(645);
+                match(Ellipsis);
+                setState(646);
+                match(Identifier);
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class ExpressionSequenceContext extends ParserRuleContext {
+        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);
+        }
+
+        public ExpressionSequenceContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final ExpressionSequenceContext expressionSequence() throws RecognitionException {
+        ExpressionSequenceContext _localctx = new ExpressionSequenceContext(_ctx, getState());
+        enterRule(_localctx, 118, RULE_expressionSequence);
+        try {
+            int _alt;
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(648);
+                singleExpression(0);
+                setState(653);
+                _errHandler.sync(this);
+                _alt = getInterpreter().adaptivePredict(_input, 71, _ctx);
+                while (_alt != 2 && _alt != org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER) {
+                    if (_alt == 1) {
+                        {
+                            {
+                                setState(649);
+                                match(Comma);
+                                setState(650);
+                                singleExpression(0);
+                            }
+                        }
+                    }
+                    setState(655);
+                    _errHandler.sync(this);
+                    _alt = getInterpreter().adaptivePredict(_input, 71, _ctx);
+                }
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class SingleExpressionContext extends ParserRuleContext {
+        public SingleExpressionContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @Override
+        public int getRuleIndex() {
+            return RULE_singleExpression;
+        }
+
+        public SingleExpressionContext() {}
+
+        public void copyFrom(SingleExpressionContext ctx) {
+            super.copyFrom(ctx);
+        }
+    }
+    public static class TemplateStringExpressionContext extends SingleExpressionContext {
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        public TerminalNode TemplateStringLiteral() {
+            return getToken(YJSParser.TemplateStringLiteral, 0);
+        }
+
+        public TemplateStringExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 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);
+        }
+
+        public TernaryExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 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);
+        }
+
+        public LogicalAndExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 TerminalNode PlusPlus() {
+            return getToken(YJSParser.PlusPlus, 0);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        public PreIncrementExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 ObjectLiteralContext objectLiteral() {
+            return getRuleContext(ObjectLiteralContext.class, 0);
+        }
+
+        public ObjectLiteralExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 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);
+        }
+
+        public InExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 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);
+        }
+
+        public LogicalOrExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 TerminalNode Not() {
+            return getToken(YJSParser.Not, 0);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        public NotExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 TerminalNode MinusMinus() {
+            return getToken(YJSParser.MinusMinus, 0);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        public PreDecreaseExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        public ArgumentsContext arguments() {
+            return getRuleContext(ArgumentsContext.class, 0);
+        }
+
+        public ArgumentsExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 TerminalNode This() {
+            return getToken(YJSParser.This, 0);
+        }
+
+        public ThisExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 TerminalNode Minus() {
+            return getToken(YJSParser.Minus, 0);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        public UnaryMinusExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 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);
+        }
+
+        public AssignmentExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        public TerminalNode MinusMinus() {
+            return getToken(YJSParser.MinusMinus, 0);
+        }
+
+        public PostDecreaseExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 TerminalNode Typeof() {
+            return getToken(YJSParser.Typeof, 0);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        public TypeofExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 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);
+        }
+
+        public InstanceofExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 TerminalNode Plus() {
+            return getToken(YJSParser.Plus, 0);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        public UnaryPlusExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 ArrowFunctionParametersContext arrowFunctionParameters() {
+            return getRuleContext(ArrowFunctionParametersContext.class, 0);
+        }
+
+        public TerminalNode ARROW() {
+            return getToken(YJSParser.ARROW, 0);
+        }
+
+        public ArrowFunctionBodyContext arrowFunctionBody() {
+            return getRuleContext(ArrowFunctionBodyContext.class, 0);
+        }
+
+        public ArrowFunctionExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 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);
+        }
+
+        public EqualityExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 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);
+        }
+
+        public BitXOrExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 TerminalNode Super() {
+            return getToken(YJSParser.Super, 0);
+        }
+
+        public SuperExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 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);
+        }
+
+        public MultiplicativeExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 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);
+        }
+
+        public BitShiftExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 TerminalNode OpenParen() {
+            return getToken(YJSParser.OpenParen, 0);
+        }
+
+        public ExpressionSequenceContext expressionSequence() {
+            return getRuleContext(ExpressionSequenceContext.class, 0);
+        }
+
+        public TerminalNode CloseParen() {
+            return getToken(YJSParser.CloseParen, 0);
+        }
+
+        public ParenthesizedExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 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);
+        }
+
+        public AdditiveExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 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);
+        }
+
+        public RelationalExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        public TerminalNode PlusPlus() {
+            return getToken(YJSParser.PlusPlus, 0);
+        }
+
+        public PostIncrementExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 TerminalNode BitNot() {
+            return getToken(YJSParser.BitNot, 0);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        public BitNotExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 TerminalNode New() {
+            return getToken(YJSParser.New, 0);
+        }
+
+        public SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        public ArgumentsContext arguments() {
+            return getRuleContext(ArgumentsContext.class, 0);
+        }
+
+        public NewExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 LiteralContext literal() {
+            return getRuleContext(LiteralContext.class, 0);
+        }
+
+        public LiteralExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 ArrayLiteralContext arrayLiteral() {
+            return getRuleContext(ArrayLiteralContext.class, 0);
+        }
+
+        public ArrayLiteralExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 SingleExpressionContext singleExpression() {
+            return getRuleContext(SingleExpressionContext.class, 0);
+        }
+
+        public TerminalNode Dot() {
+            return getToken(YJSParser.Dot, 0);
+        }
+
+        public IdentifierNameContext identifierName() {
+            return getRuleContext(IdentifierNameContext.class, 0);
+        }
+
+        public MemberDotExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 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);
+        }
+
+        public MemberIndexExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        public IdentifierExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 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);
+        }
+
+        public BitAndExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 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);
+        }
+
+        public BitOrExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 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);
+        }
+
+        public AssignmentOperatorExpressionContext(SingleExpressionContext ctx) {
+            copyFrom(ctx);
+        }
+
+        @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 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 = 120;
+        enterRecursionRule(_localctx, 120, RULE_singleExpression, _p);
+        int _la;
+        try {
+            int _alt;
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(690);
+                _errHandler.sync(this);
+                switch (getInterpreter().adaptivePredict(_input, 73, _ctx)) {
+                    case 1: {
+                        _localctx = new NewExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+
+                        setState(657);
+                        match(New);
+                        setState(658);
+                        singleExpression(0);
+                        setState(660);
+                        _errHandler.sync(this);
+                        switch (getInterpreter().adaptivePredict(_input, 72, _ctx)) {
+                            case 1: {
+                                setState(659);
+                                arguments();
+                            }
+                                break;
+                        }
+                    }
+                        break;
+                    case 2: {
+                        _localctx = new TypeofExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(662);
+                        match(Typeof);
+                        setState(663);
+                        singleExpression(31);
+                    }
+                        break;
+                    case 3: {
+                        _localctx = new PreIncrementExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(664);
+                        match(PlusPlus);
+                        setState(665);
+                        singleExpression(30);
+                    }
+                        break;
+                    case 4: {
+                        _localctx = new PreDecreaseExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(666);
+                        match(MinusMinus);
+                        setState(667);
+                        singleExpression(29);
+                    }
+                        break;
+                    case 5: {
+                        _localctx = new UnaryPlusExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(668);
+                        match(Plus);
+                        setState(669);
+                        singleExpression(28);
+                    }
+                        break;
+                    case 6: {
+                        _localctx = new UnaryMinusExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(670);
+                        match(Minus);
+                        setState(671);
+                        singleExpression(27);
+                    }
+                        break;
+                    case 7: {
+                        _localctx = new BitNotExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(672);
+                        match(BitNot);
+                        setState(673);
+                        singleExpression(26);
+                    }
+                        break;
+                    case 8: {
+                        _localctx = new NotExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(674);
+                        match(Not);
+                        setState(675);
+                        singleExpression(25);
+                    }
+                        break;
+                    case 9: {
+                        _localctx = new ThisExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(676);
+                        match(This);
+                    }
+                        break;
+                    case 10: {
+                        _localctx = new IdentifierExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(677);
+                        match(Identifier);
+                    }
+                        break;
+                    case 11: {
+                        _localctx = new SuperExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(678);
+                        match(Super);
+                    }
+                        break;
+                    case 12: {
+                        _localctx = new LiteralExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(679);
+                        literal();
+                    }
+                        break;
+                    case 13: {
+                        _localctx = new ArrayLiteralExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(680);
+                        arrayLiteral();
+                    }
+                        break;
+                    case 14: {
+                        _localctx = new ObjectLiteralExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(681);
+                        objectLiteral();
+                    }
+                        break;
+                    case 15: {
+                        _localctx = new ParenthesizedExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(682);
+                        match(OpenParen);
+                        setState(683);
+                        expressionSequence();
+                        setState(684);
+                        match(CloseParen);
+                    }
+                        break;
+                    case 16: {
+                        _localctx = new ArrowFunctionExpressionContext(_localctx);
+                        _ctx = _localctx;
+                        _prevctx = _localctx;
+                        setState(686);
+                        arrowFunctionParameters();
+                        setState(687);
+                        match(ARROW);
+                        setState(688);
+                        arrowFunctionBody();
+                    }
+                        break;
+                }
+                _ctx.stop = _input.LT(-1);
+                setState(761);
+                _errHandler.sync(this);
+                _alt = getInterpreter().adaptivePredict(_input, 75, _ctx);
+                while (_alt != 2 && _alt != org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER) {
+                    if (_alt == 1) {
+                        if (_parseListeners != null)
+                            triggerExitRuleEvent();
+                        _prevctx = _localctx;
+                        {
+                            setState(759);
+                            _errHandler.sync(this);
+                            switch (getInterpreter().adaptivePredict(_input, 74, _ctx)) {
+                                case 1: {
+                                    _localctx = new MultiplicativeExpressionContext(
+                                            new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState,
+                                            RULE_singleExpression);
+                                    setState(692);
+                                    if (!(precpred(_ctx, 24)))
+                                        throw new FailedPredicateException(this,
+                                                "precpred(_ctx, 24)");
+                                    setState(693);
+                                    _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(694);
+                                    singleExpression(25);
+                                }
+                                    break;
+                                case 2: {
+                                    _localctx = new AdditiveExpressionContext(
+                                            new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState,
+                                            RULE_singleExpression);
+                                    setState(695);
+                                    if (!(precpred(_ctx, 23)))
+                                        throw new FailedPredicateException(this,
+                                                "precpred(_ctx, 23)");
+                                    setState(696);
+                                    _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(697);
+                                    singleExpression(24);
+                                }
+                                    break;
+                                case 3: {
+                                    _localctx = new BitShiftExpressionContext(
+                                            new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState,
+                                            RULE_singleExpression);
+                                    setState(698);
+                                    if (!(precpred(_ctx, 22)))
+                                        throw new FailedPredicateException(this,
+                                                "precpred(_ctx, 22)");
+                                    setState(699);
+                                    _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(700);
+                                    singleExpression(23);
+                                }
+                                    break;
+                                case 4: {
+                                    _localctx = new RelationalExpressionContext(
+                                            new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState,
+                                            RULE_singleExpression);
+                                    setState(701);
+                                    if (!(precpred(_ctx, 21)))
+                                        throw new FailedPredicateException(this,
+                                                "precpred(_ctx, 21)");
+                                    setState(702);
+                                    _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(703);
+                                    singleExpression(22);
+                                }
+                                    break;
+                                case 5: {
+                                    _localctx = new InstanceofExpressionContext(
+                                            new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState,
+                                            RULE_singleExpression);
+                                    setState(704);
+                                    if (!(precpred(_ctx, 20)))
+                                        throw new FailedPredicateException(this,
+                                                "precpred(_ctx, 20)");
+                                    setState(705);
+                                    match(Instanceof);
+                                    setState(706);
+                                    singleExpression(21);
+                                }
+                                    break;
+                                case 6: {
+                                    _localctx = new InExpressionContext(
+                                            new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState,
+                                            RULE_singleExpression);
+                                    setState(707);
+                                    if (!(precpred(_ctx, 19)))
+                                        throw new FailedPredicateException(this,
+                                                "precpred(_ctx, 19)");
+                                    setState(708);
+                                    match(In);
+                                    setState(709);
+                                    singleExpression(20);
+                                }
+                                    break;
+                                case 7: {
+                                    _localctx = new EqualityExpressionContext(
+                                            new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState,
+                                            RULE_singleExpression);
+                                    setState(710);
+                                    if (!(precpred(_ctx, 18)))
+                                        throw new FailedPredicateException(this,
+                                                "precpred(_ctx, 18)");
+                                    setState(711);
+                                    _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(712);
+                                    singleExpression(19);
+                                }
+                                    break;
+                                case 8: {
+                                    _localctx = new BitAndExpressionContext(
+                                            new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState,
+                                            RULE_singleExpression);
+                                    setState(713);
+                                    if (!(precpred(_ctx, 17)))
+                                        throw new FailedPredicateException(this,
+                                                "precpred(_ctx, 17)");
+                                    setState(714);
+                                    match(BitAnd);
+                                    setState(715);
+                                    singleExpression(18);
+                                }
+                                    break;
+                                case 9: {
+                                    _localctx = new BitXOrExpressionContext(
+                                            new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState,
+                                            RULE_singleExpression);
+                                    setState(716);
+                                    if (!(precpred(_ctx, 16)))
+                                        throw new FailedPredicateException(this,
+                                                "precpred(_ctx, 16)");
+                                    setState(717);
+                                    match(BitXOr);
+                                    setState(718);
+                                    singleExpression(17);
+                                }
+                                    break;
+                                case 10: {
+                                    _localctx = new BitOrExpressionContext(
+                                            new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState,
+                                            RULE_singleExpression);
+                                    setState(719);
+                                    if (!(precpred(_ctx, 15)))
+                                        throw new FailedPredicateException(this,
+                                                "precpred(_ctx, 15)");
+                                    setState(720);
+                                    match(BitOr);
+                                    setState(721);
+                                    singleExpression(16);
+                                }
+                                    break;
+                                case 11: {
+                                    _localctx = new LogicalAndExpressionContext(
+                                            new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState,
+                                            RULE_singleExpression);
+                                    setState(722);
+                                    if (!(precpred(_ctx, 14)))
+                                        throw new FailedPredicateException(this,
+                                                "precpred(_ctx, 14)");
+                                    setState(723);
+                                    match(And);
+                                    setState(724);
+                                    singleExpression(15);
+                                }
+                                    break;
+                                case 12: {
+                                    _localctx = new LogicalOrExpressionContext(
+                                            new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState,
+                                            RULE_singleExpression);
+                                    setState(725);
+                                    if (!(precpred(_ctx, 13)))
+                                        throw new FailedPredicateException(this,
+                                                "precpred(_ctx, 13)");
+                                    setState(726);
+                                    match(Or);
+                                    setState(727);
+                                    singleExpression(14);
+                                }
+                                    break;
+                                case 13: {
+                                    _localctx = new TernaryExpressionContext(
+                                            new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState,
+                                            RULE_singleExpression);
+                                    setState(728);
+                                    if (!(precpred(_ctx, 12)))
+                                        throw new FailedPredicateException(this,
+                                                "precpred(_ctx, 12)");
+                                    setState(729);
+                                    match(QuestionMark);
+                                    setState(730);
+                                    singleExpression(0);
+                                    setState(731);
+                                    match(Colon);
+                                    setState(732);
+                                    singleExpression(13);
+                                }
+                                    break;
+                                case 14: {
+                                    _localctx = new AssignmentExpressionContext(
+                                            new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState,
+                                            RULE_singleExpression);
+                                    setState(734);
+                                    if (!(precpred(_ctx, 11)))
+                                        throw new FailedPredicateException(this,
+                                                "precpred(_ctx, 11)");
+                                    setState(735);
+                                    match(Assign);
+                                    setState(736);
+                                    singleExpression(12);
+                                }
+                                    break;
+                                case 15: {
+                                    _localctx = new AssignmentOperatorExpressionContext(
+                                            new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState,
+                                            RULE_singleExpression);
+                                    setState(737);
+                                    if (!(precpred(_ctx, 10)))
+                                        throw new FailedPredicateException(this,
+                                                "precpred(_ctx, 10)");
+                                    setState(738);
+                                    assignmentOperator();
+                                    setState(739);
+                                    singleExpression(11);
+                                }
+                                    break;
+                                case 16: {
+                                    _localctx = new MemberIndexExpressionContext(
+                                            new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState,
+                                            RULE_singleExpression);
+                                    setState(741);
+                                    if (!(precpred(_ctx, 37)))
+                                        throw new FailedPredicateException(this,
+                                                "precpred(_ctx, 37)");
+                                    setState(742);
+                                    match(OpenBracket);
+                                    setState(743);
+                                    expressionSequence();
+                                    setState(744);
+                                    match(CloseBracket);
+                                }
+                                    break;
+                                case 17: {
+                                    _localctx = new MemberDotExpressionContext(
+                                            new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState,
+                                            RULE_singleExpression);
+                                    setState(746);
+                                    if (!(precpred(_ctx, 36)))
+                                        throw new FailedPredicateException(this,
+                                                "precpred(_ctx, 36)");
+                                    setState(747);
+                                    match(Dot);
+                                    setState(748);
+                                    identifierName();
+                                }
+                                    break;
+                                case 18: {
+                                    _localctx = new ArgumentsExpressionContext(
+                                            new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState,
+                                            RULE_singleExpression);
+                                    setState(749);
+                                    if (!(precpred(_ctx, 35)))
+                                        throw new FailedPredicateException(this,
+                                                "precpred(_ctx, 35)");
+                                    setState(750);
+                                    arguments();
+                                }
+                                    break;
+                                case 19: {
+                                    _localctx = new PostIncrementExpressionContext(
+                                            new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState,
+                                            RULE_singleExpression);
+                                    setState(751);
+                                    if (!(precpred(_ctx, 33)))
+                                        throw new FailedPredicateException(this,
+                                                "precpred(_ctx, 33)");
+                                    setState(752);
+                                    if (!(notLineTerminator()))
+                                        throw new FailedPredicateException(this,
+                                                "notLineTerminator()");
+                                    setState(753);
+                                    match(PlusPlus);
+                                }
+                                    break;
+                                case 20: {
+                                    _localctx = new PostDecreaseExpressionContext(
+                                            new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState,
+                                            RULE_singleExpression);
+                                    setState(754);
+                                    if (!(precpred(_ctx, 32)))
+                                        throw new FailedPredicateException(this,
+                                                "precpred(_ctx, 32)");
+                                    setState(755);
+                                    if (!(notLineTerminator()))
+                                        throw new FailedPredicateException(this,
+                                                "notLineTerminator()");
+                                    setState(756);
+                                    match(MinusMinus);
+                                }
+                                    break;
+                                case 21: {
+                                    _localctx = new TemplateStringExpressionContext(
+                                            new SingleExpressionContext(_parentctx, _parentState));
+                                    pushNewRecursionContext(_localctx, _startState,
+                                            RULE_singleExpression);
+                                    setState(757);
+                                    if (!(precpred(_ctx, 9)))
+                                        throw new FailedPredicateException(this,
+                                                "precpred(_ctx, 9)");
+                                    setState(758);
+                                    match(TemplateStringLiteral);
+                                }
+                                    break;
+                            }
+                        }
+                    }
+                    setState(763);
+                    _errHandler.sync(this);
+                    _alt = getInterpreter().adaptivePredict(_input, 75, _ctx);
+                }
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            unrollRecursionContexts(_parentctx);
+        }
+        return _localctx;
+    }
+
+    public static class ArrowFunctionParametersContext extends ParserRuleContext {
+        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);
+        }
+
+        public ArrowFunctionParametersContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final ArrowFunctionParametersContext arrowFunctionParameters()
+            throws RecognitionException {
+        ArrowFunctionParametersContext _localctx =
+                new ArrowFunctionParametersContext(_ctx, getState());
+        enterRule(_localctx, 122, RULE_arrowFunctionParameters);
+        int _la;
+        try {
+            setState(770);
+            _errHandler.sync(this);
+            switch (_input.LA(1)) {
+                case Identifier:
+                    enterOuterAlt(_localctx, 1); {
+                    setState(764);
+                    match(Identifier);
+                }
+                    break;
+                case OpenParen:
+                    enterOuterAlt(_localctx, 2); {
+                    setState(765);
+                    match(OpenParen);
+                    setState(767);
+                    _errHandler.sync(this);
+                    _la = _input.LA(1);
+                    if ((((_la) & ~0x3f) == 0 && ((1L << _la)
+                            & ((1L << OpenBracket) | (1L << OpenBrace) | (1L << Ellipsis))) != 0)
+                            || _la == Identifier) {
+                        {
+                            setState(766);
+                            formalParameterList();
+                        }
+                    }
+
+                    setState(769);
+                    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 static class ArrowFunctionBodyContext extends ParserRuleContext {
+        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);
+        }
+
+        public ArrowFunctionBodyContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final ArrowFunctionBodyContext arrowFunctionBody() throws RecognitionException {
+        ArrowFunctionBodyContext _localctx = new ArrowFunctionBodyContext(_ctx, getState());
+        enterRule(_localctx, 124, RULE_arrowFunctionBody);
+        try {
+            setState(777);
+            _errHandler.sync(this);
+            switch (getInterpreter().adaptivePredict(_input, 78, _ctx)) {
+                case 1:
+                    enterOuterAlt(_localctx, 1); {
+                    setState(772);
+                    singleExpression(0);
+                }
+                    break;
+                case 2:
+                    enterOuterAlt(_localctx, 2); {
+                    setState(773);
+                    match(OpenBrace);
+                    setState(774);
+                    functionBody();
+                    setState(775);
+                    match(CloseBrace);
+                }
+                    break;
+            }
+        } catch (RecognitionException re) {
+            _localctx.exception = re;
+            _errHandler.reportError(this, re);
+            _errHandler.recover(this, re);
+        } finally {
+            exitRule();
+        }
+        return _localctx;
+    }
+
+    public static class AssignmentOperatorContext extends ParserRuleContext {
+        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);
+        }
+
+        public AssignmentOperatorContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final AssignmentOperatorContext assignmentOperator() throws RecognitionException {
+        AssignmentOperatorContext _localctx = new AssignmentOperatorContext(_ctx, getState());
+        enterRule(_localctx, 126, RULE_assignmentOperator);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(779);
+                _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 static class LiteralContext extends ParserRuleContext {
+        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);
+        }
+
+        public LiteralContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final LiteralContext literal() throws RecognitionException {
+        LiteralContext _localctx = new LiteralContext(_ctx, getState());
+        enterRule(_localctx, 128, RULE_literal);
+        try {
+            setState(787);
+            _errHandler.sync(this);
+            switch (_input.LA(1)) {
+                case NullLiteral:
+                    enterOuterAlt(_localctx, 1); {
+                    setState(781);
+                    match(NullLiteral);
+                }
+                    break;
+                case BooleanLiteral:
+                    enterOuterAlt(_localctx, 2); {
+                    setState(782);
+                    match(BooleanLiteral);
+                }
+                    break;
+                case StringLiteral:
+                    enterOuterAlt(_localctx, 3); {
+                    setState(783);
+                    match(StringLiteral);
+                }
+                    break;
+                case TemplateStringLiteral:
+                    enterOuterAlt(_localctx, 4); {
+                    setState(784);
+                    match(TemplateStringLiteral);
+                }
+                    break;
+                case RegularExpressionLiteral:
+                    enterOuterAlt(_localctx, 5); {
+                    setState(785);
+                    match(RegularExpressionLiteral);
+                }
+                    break;
+                case DecimalLiteral:
+                case HexIntegerLiteral:
+                case OctalIntegerLiteral:
+                case OctalIntegerLiteral2:
+                case BinaryIntegerLiteral:
+                    enterOuterAlt(_localctx, 6); {
+                    setState(786);
+                    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 static class NumericLiteralContext extends ParserRuleContext {
+        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);
+        }
+
+        public NumericLiteralContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final NumericLiteralContext numericLiteral() throws RecognitionException {
+        NumericLiteralContext _localctx = new NumericLiteralContext(_ctx, getState());
+        enterRule(_localctx, 130, RULE_numericLiteral);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(789);
+                _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 static class IdentifierNameContext extends ParserRuleContext {
+        public TerminalNode Identifier() {
+            return getToken(YJSParser.Identifier, 0);
+        }
+
+        public ReservedWordContext reservedWord() {
+            return getRuleContext(ReservedWordContext.class, 0);
+        }
+
+        public IdentifierNameContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final IdentifierNameContext identifierName() throws RecognitionException {
+        IdentifierNameContext _localctx = new IdentifierNameContext(_ctx, getState());
+        enterRule(_localctx, 132, RULE_identifierName);
+        try {
+            setState(793);
+            _errHandler.sync(this);
+            switch (_input.LA(1)) {
+                case Identifier:
+                    enterOuterAlt(_localctx, 1); {
+                    setState(791);
+                    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(792);
+                    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 static class ReservedWordContext extends ParserRuleContext {
+        public KeywordContext keyword() {
+            return getRuleContext(KeywordContext.class, 0);
+        }
+
+        public TerminalNode NullLiteral() {
+            return getToken(YJSParser.NullLiteral, 0);
+        }
+
+        public TerminalNode BooleanLiteral() {
+            return getToken(YJSParser.BooleanLiteral, 0);
+        }
+
+        public ReservedWordContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final ReservedWordContext reservedWord() throws RecognitionException {
+        ReservedWordContext _localctx = new ReservedWordContext(_ctx, getState());
+        enterRule(_localctx, 134, RULE_reservedWord);
+        try {
+            setState(798);
+            _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(795);
+                    keyword();
+                }
+                    break;
+                case NullLiteral:
+                    enterOuterAlt(_localctx, 2); {
+                    setState(796);
+                    match(NullLiteral);
+                }
+                    break;
+                case BooleanLiteral:
+                    enterOuterAlt(_localctx, 3); {
+                    setState(797);
+                    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 static class KeywordContext extends ParserRuleContext {
+        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);
+        }
+
+        public KeywordContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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 final KeywordContext keyword() throws RecognitionException {
+        KeywordContext _localctx = new KeywordContext(_ctx, getState());
+        enterRule(_localctx, 136, RULE_keyword);
+        int _la;
+        try {
+            enterOuterAlt(_localctx, 1);
+            {
+                setState(800);
+                _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 static class EosContext extends ParserRuleContext {
+        public TerminalNode SemiColon() {
+            return getToken(YJSParser.SemiColon, 0);
+        }
+
+        public TerminalNode EOF() {
+            return getToken(YJSParser.EOF, 0);
+        }
+
+        public EosContext(ParserRuleContext parent, int invokingState) {
+            super(parent, invokingState);
+        }
+
+        @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);
+        }
+    }
+
+    public final EosContext eos() throws RecognitionException {
+        EosContext _localctx = new EosContext(_ctx, getState());
+        enterRule(_localctx, 138, RULE_eos);
+        try {
+            setState(806);
+            _errHandler.sync(this);
+            switch (getInterpreter().adaptivePredict(_input, 82, _ctx)) {
+                case 1:
+                    enterOuterAlt(_localctx, 1); {
+                    setState(802);
+                    match(SemiColon);
+                }
+                    break;
+                case 2:
+                    enterOuterAlt(_localctx, 2); {
+                    setState(803);
+                    match(EOF);
+                }
+                    break;
+                case 3:
+                    enterOuterAlt(_localctx, 3); {
+                    setState(804);
+                    if (!(lineTerminatorAhead()))
+                        throw new FailedPredicateException(this, "lineTerminatorAhead()");
+                }
+                    break;
+                case 4:
+                    enterOuterAlt(_localctx, 4); {
+                    setState(805);
+                    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 23:
+                return expressionStatement_sempred((ExpressionStatementContext) _localctx,
+                        predIndex);
+            case 25:
+                return iterationStatement_sempred((IterationStatementContext) _localctx, predIndex);
+            case 27:
+                return continueStatement_sempred((ContinueStatementContext) _localctx, predIndex);
+            case 28:
+                return breakStatement_sempred((BreakStatementContext) _localctx, predIndex);
+            case 29:
+                return returnStatement_sempred((ReturnStatementContext) _localctx, predIndex);
+            case 36:
+                return throwStatement_sempred((ThrowStatementContext) _localctx, predIndex);
+            case 60:
+                return singleExpression_sempred((SingleExpressionContext) _localctx, predIndex);
+            case 69:
+                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 final String _serializedATN =
+            "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3|\u032b\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\3\2\5\2\u0090"
+                    + "\n\2\3\2\3\2\3\3\5\3\u0095\n\3\3\3\3\3\3\3\3\3\6\3\u009b\n\3\r\3\16\3"
+                    + "\u009c\3\3\3\3\3\4\6\4\u00a2\n\4\r\4\16\4\u00a3\3\5\3\5\3\5\3\5\5\5\u00aa"
+                    + "\n\5\3\5\3\5\3\6\3\6\3\6\7\6\u00b1\n\6\f\6\16\6\u00b4\13\6\3\7\3\7\3\7"
+                    + "\5\7\u00b9\n\7\3\b\3\b\3\b\3\b\5\b\u00bf\n\b\3\t\5\t\u00c2\n\t\3\t\3\t"
+                    + "\3\t\3\t\5\t\u00c8\n\t\3\t\3\t\3\t\3\n\3\n\5\n\u00cf\n\n\3\n\3\n\3\n\3"
+                    + "\n\5\n\u00d5\n\n\3\n\3\n\3\n\5\n\u00da\n\n\3\n\3\n\5\n\u00de\n\n\3\13"
+                    + "\3\13\3\f\3\f\3\r\3\r\3\16\6\16\u00e7\n\16\r\16\16\16\u00e8\3\17\3\17"
+                    + "\3\17\3\17\3\20\3\20\3\20\3\20\3\20\3\21\3\21\3\21\7\21\u00f7\n\21\f\21"
+                    + "\16\21\u00fa\13\21\3\22\3\22\3\22\3\22\3\22\3\22\3\22\3\22\3\22\3\22\5"
+                    + "\22\u0106\n\22\3\23\3\23\5\23\u010a\n\23\3\23\3\23\3\24\6\24\u010f\n\24"
+                    + "\r\24\16\24\u0110\3\25\3\25\3\25\3\25\3\26\3\26\3\26\7\26\u011a\n\26\f"
+                    + "\26\16\26\u011d\13\26\3\27\3\27\3\27\5\27\u0122\n\27\3\30\3\30\3\31\3"
+                    + "\31\3\31\3\31\3\32\3\32\3\32\3\32\3\32\3\32\3\32\5\32\u0131\n\32\3\33"
+                    + "\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33"
+                    + "\3\33\3\33\5\33\u0144\n\33\3\33\3\33\5\33\u0148\n\33\3\33\3\33\5\33\u014c"
+                    + "\n\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\5\33\u0156\n\33\3\33\3\33"
+                    + "\5\33\u015a\n\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\5\33\u0165"
+                    + "\n\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\5\33\u0172"
+                    + "\n\33\3\33\3\33\3\33\3\33\5\33\u0178\n\33\3\34\3\34\3\35\3\35\3\35\5\35"
+                    + "\u017f\n\35\3\35\3\35\3\36\3\36\3\36\5\36\u0186\n\36\3\36\3\36\3\37\3"
+                    + "\37\3\37\5\37\u018d\n\37\3\37\3\37\3 \3 \3 \3 \3 \3 \3!\3!\3!\3!\3!\3"
+                    + "!\3\"\3\"\5\"\u019f\n\"\3\"\3\"\5\"\u01a3\n\"\5\"\u01a5\n\"\3\"\3\"\3"
+                    + "#\6#\u01aa\n#\r#\16#\u01ab\3$\3$\3$\3$\5$\u01b2\n$\3%\3%\3%\5%\u01b7\n"
+                    + "%\3&\3&\3&\3&\3&\3\'\3\'\3\'\3\'\5\'\u01c2\n\'\3\'\5\'\u01c5\n\'\3(\3"
+                    + "(\3(\3(\3(\3(\3)\3)\3)\3*\3*\3*\3+\5+\u01d4\n+\3+\5+\u01d7\n+\3+\3+\3"
+                    + "+\3+\5+\u01dd\n+\3+\3+\5+\u01e1\n+\3+\3+\3+\3+\3,\3,\3,\3,\3-\3-\5-\u01ed"
+                    + "\n-\3-\3-\7-\u01f1\n-\f-\16-\u01f4\13-\3-\3-\3.\5.\u01f9\n.\3.\3.\3/\3"
+                    + "/\3/\5/\u0200\n/\3/\3/\3/\3/\3/\3\60\3\60\3\60\7\60\u020a\n\60\f\60\16"
+                    + "\60\u020d\13\60\3\60\3\60\5\60\u0211\n\60\3\60\3\60\3\60\5\60\u0216\n"
+                    + "\60\3\61\3\61\3\61\5\61\u021b\n\61\3\62\3\62\3\62\3\63\5\63\u0221\n\63"
+                    + "\3\64\6\64\u0224\n\64\r\64\16\64\u0225\3\65\3\65\7\65\u022a\n\65\f\65"
+                    + "\16\65\u022d\13\65\3\65\5\65\u0230\n\65\3\65\7\65\u0233\n\65\f\65\16\65"
+                    + "\u0236\13\65\3\65\3\65\3\66\3\66\6\66\u023c\n\66\r\66\16\66\u023d\3\66"
+                    + "\7\66\u0241\n\66\f\66\16\66\u0244\13\66\3\66\6\66\u0247\n\66\r\66\16\66"
+                    + "\u0248\3\66\5\66\u024c\n\66\3\66\5\66\u024f\n\66\3\67\3\67\3\67\38\38"
+                    + "\38\38\78\u0258\n8\f8\168\u025b\138\58\u025d\n8\38\58\u0260\n8\38\38\3"
+                    + "9\39\39\39\39\39\39\39\39\39\39\59\u026f\n9\3:\3:\3:\5:\u0274\n:\3;\3"
+                    + ";\3;\3;\7;\u027a\n;\f;\16;\u027d\13;\3;\3;\5;\u0281\n;\3;\5;\u0284\n;"
+                    + "\3;\3;\3<\3<\3<\3=\3=\3=\7=\u028e\n=\f=\16=\u0291\13=\3>\3>\3>\3>\5>\u0297"
+                    + "\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>\u02b5\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>\u02fa\n>\f>\16>\u02fd\13>\3?\3?\3?\5?\u0302"
+                    + "\n?\3?\5?\u0305\n?\3@\3@\3@\3@\3@\5@\u030c\n@\3A\3A\3B\3B\3B\3B\3B\3B"
+                    + "\5B\u0316\nB\3C\3C\3D\3D\5D\u031c\nD\3E\3E\3E\5E\u0321\nE\3F\3F\3G\3G"
+                    + "\3G\3G\5G\u0329\nG\3G\2\3zH\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\u008a\u008c\2\16\3\2hk\3\2^_\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?Xaglt\2\u0373"
+                    + "\2\u008f\3\2\2\2\4\u0094\3\2\2\2\6\u00a1\3\2\2\2\b\u00a5\3\2\2\2\n\u00ad"
+                    + "\3\2\2\2\f\u00b8\3\2\2\2\16\u00be\3\2\2\2\20\u00c1\3\2\2\2\22\u00dd\3"
+                    + "\2\2\2\24\u00df\3\2\2\2\26\u00e1\3\2\2\2\30\u00e3\3\2\2\2\32\u00e6\3\2"
+                    + "\2\2\34\u00ea\3\2\2\2\36\u00ee\3\2\2\2 \u00f3\3\2\2\2\"\u0105\3\2\2\2"
+                    + "$\u0107\3\2\2\2&\u010e\3\2\2\2(\u0112\3\2\2\2*\u0116\3\2\2\2,\u011e\3"
+                    + "\2\2\2.\u0123\3\2\2\2\60\u0125\3\2\2\2\62\u0129\3\2\2\2\64\u0177\3\2\2"
+                    + "\2\66\u0179\3\2\2\28\u017b\3\2\2\2:\u0182\3\2\2\2<\u0189\3\2\2\2>\u0190"
+                    + "\3\2\2\2@\u0196\3\2\2\2B\u019c\3\2\2\2D\u01a9\3\2\2\2F\u01ad\3\2\2\2H"
+                    + "\u01b3\3\2\2\2J\u01b8\3\2\2\2L\u01bd\3\2\2\2N\u01c6\3\2\2\2P\u01cc\3\2"
+                    + "\2\2R\u01cf\3\2\2\2T\u01d3\3\2\2\2V\u01e6\3\2\2\2X\u01ec\3\2\2\2Z\u01f8"
+                    + "\3\2\2\2\\\u01fc\3\2\2\2^\u0215\3\2\2\2`\u0217\3\2\2\2b\u021c\3\2\2\2"
+                    + "d\u0220\3\2\2\2f\u0223\3\2\2\2h\u0227\3\2\2\2j\u024e\3\2\2\2l\u0250\3"
+                    + "\2\2\2n\u0253\3\2\2\2p\u026e\3\2\2\2r\u0273\3\2\2\2t\u0275\3\2\2\2v\u0287"
+                    + "\3\2\2\2x\u028a\3\2\2\2z\u02b4\3\2\2\2|\u0304\3\2\2\2~\u030b\3\2\2\2\u0080"
+                    + "\u030d\3\2\2\2\u0082\u0315\3\2\2\2\u0084\u0317\3\2\2\2\u0086\u031b\3\2"
+                    + "\2\2\u0088\u0320\3\2\2\2\u008a\u0322\3\2\2\2\u008c\u0328\3\2\2\2\u008e"
+                    + "\u0090\5\32\16\2\u008f\u008e\3\2\2\2\u008f\u0090\3\2\2\2\u0090\u0091\3"
+                    + "\2\2\2\u0091\u0092\5\4\3\2\u0092\3\3\2\2\2\u0093\u0095\5\6\4\2\u0094\u0093"
+                    + "\3\2\2\2\u0094\u0095\3\2\2\2\u0095\u0096\3\2\2\2\u0096\u0097\t\2\2\2\u0097"
+                    + "\u0098\7u\2\2\u0098\u009a\7\n\2\2\u0099\u009b\5\16\b\2\u009a\u0099\3\2"
+                    + "\2\2\u009b\u009c\3\2\2\2\u009c\u009a\3\2\2\2\u009c\u009d\3\2\2\2\u009d"
+                    + "\u009e\3\2\2\2\u009e\u009f\7\13\2\2\u009f\5\3\2\2\2\u00a0\u00a2\5\b\5"
+                    + "\2\u00a1\u00a0\3\2\2\2\u00a2\u00a3\3\2\2\2\u00a3\u00a1\3\2\2\2\u00a3\u00a4"
+                    + "\3\2\2\2\u00a4\7\3\2\2\2\u00a5\u00a6\7Z\2\2\u00a6\u00a7\7u\2\2\u00a7\u00a9"
+                    + "\7\b\2\2\u00a8\u00aa\5\n\6\2\u00a9\u00a8\3\2\2\2\u00a9\u00aa\3\2\2\2\u00aa"
+                    + "\u00ab\3\2\2\2\u00ab\u00ac\7\t\2\2\u00ac\t\3\2\2\2\u00ad\u00b2\5\f\7\2"
+                    + "\u00ae\u00af\7\r\2\2\u00af\u00b1\5\f\7\2\u00b0\u00ae\3\2\2\2\u00b1\u00b4"
+                    + "\3\2\2\2\u00b2\u00b0\3\2\2\2\u00b2\u00b3\3\2\2\2\u00b3\13\3\2\2\2\u00b4"
+                    + "\u00b2\3\2\2\2\u00b5\u00b9\5\u0084C\2\u00b6\u00b9\7v\2\2\u00b7\u00b9\5"
+                    + "n8\2\u00b8\u00b5\3\2\2\2\u00b8\u00b6\3\2\2\2\u00b8\u00b7\3\2\2\2\u00b9"
+                    + "\r\3\2\2\2\u00ba\u00bf\5V,\2\u00bb\u00bf\5T+\2\u00bc\u00bf\5\20\t\2\u00bd"
+                    + "\u00bf\5\22\n\2\u00be\u00ba\3\2\2\2\u00be\u00bb\3\2\2\2\u00be\u00bc\3"
+                    + "\2\2\2\u00be\u00bd\3\2\2\2\u00bf\17\3\2\2\2\u00c0\u00c2\5\6\4\2\u00c1"
+                    + "\u00c0\3\2\2\2\u00c1\u00c2\3\2\2\2\u00c2\u00c3\3\2\2\2\u00c3\u00c4\7p"
+                    + "\2\2\u00c4\u00c5\7u\2\2\u00c5\u00c7\7\b\2\2\u00c6\u00c8\5^\60\2\u00c7"
+                    + "\u00c6\3\2\2\2\u00c7\u00c8\3\2\2\2\u00c8\u00c9\3\2\2\2\u00c9\u00ca\7\t"
+                    + "\2\2\u00ca\u00cb\5\u008cG\2\u00cb\21\3\2\2\2\u00cc\u00ce\7Y\2\2\u00cd"
+                    + "\u00cf\5\24\13\2\u00ce\u00cd\3\2\2\2\u00ce\u00cf\3\2\2\2\u00cf\u00d0\3"
+                    + "\2\2\2\u00d0\u00d1\7u\2\2\u00d1\u00de\7\f\2\2\u00d2\u00d4\7Y\2\2\u00d3"
+                    + "\u00d5\5\24\13\2\u00d4\u00d3\3\2\2\2\u00d4\u00d5\3\2\2\2\u00d5\u00d6\3"
+                    + "\2\2\2\u00d6\u00d7\7u\2\2\u00d7\u00d9\7\b\2\2\u00d8\u00da\5\26\f\2\u00d9"
+                    + "\u00d8\3\2\2\2\u00d9\u00da\3\2\2\2\u00da\u00db\3\2\2\2\u00db\u00dc\7\t"
+                    + "\2\2\u00dc\u00de\7\f\2\2\u00dd\u00cc\3\2\2\2\u00dd\u00d2\3\2\2\2\u00de"
+                    + "\23\3\2\2\2\u00df\u00e0\t\3\2\2\u00e0\25\3\2\2\2\u00e1\u00e2\t\4\2\2\u00e2"
+                    + "\27\3\2\2\2\u00e3\u00e4\5\"\22\2\u00e4\31\3\2\2\2\u00e5\u00e7\5\34\17"
+                    + "\2\u00e6\u00e5\3\2\2\2\u00e7\u00e8\3\2\2\2\u00e8\u00e6\3\2\2\2\u00e8\u00e9"
+                    + "\3\2\2\2\u00e9\33\3\2\2\2\u00ea\u00eb\7g\2\2\u00eb\u00ec\7v\2\2\u00ec"
+                    + "\u00ed\7\f\2\2\u00ed\35\3\2\2\2\u00ee\u00ef\7f\2\2\u00ef\u00f0\7u\2\2"
+                    + "\u00f0\u00f1\5 \21\2\u00f1\u00f2\7\f\2\2\u00f2\37\3\2\2\2\u00f3\u00f8"
+                    + "\7:\2\2\u00f4\u00f5\7\22\2\2\u00f5\u00f7\7:\2\2\u00f6\u00f4\3\2\2\2\u00f7"
+                    + "\u00fa\3\2\2\2\u00f8\u00f6\3\2\2\2\u00f8\u00f9\3\2\2\2\u00f9!\3\2\2\2"
+                    + "\u00fa\u00f8\3\2\2\2\u00fb\u0106\5$\23\2\u00fc\u0106\5(\25\2\u00fd\u0106"
+                    + "\5.\30\2\u00fe\u0106\5\60\31\2\u00ff\u0106\5\62\32\2\u0100\u0106\5\64"
+                    + "\33\2\u0101\u0106\58\35\2\u0102\u0106\5:\36\2\u0103\u0106\5<\37\2\u0104"
+                    + "\u0106\5@!\2\u0105\u00fb\3\2\2\2\u0105\u00fc\3\2\2\2\u0105\u00fd\3\2\2"
+                    + "\2\u0105\u00fe\3\2\2\2\u0105\u00ff\3\2\2\2\u0105\u0100\3\2\2\2\u0105\u0101"
+                    + "\3\2\2\2\u0105\u0102\3\2\2\2\u0105\u0103\3\2\2\2\u0105\u0104\3\2\2\2\u0106"
+                    + "#\3\2\2\2\u0107\u0109\7\n\2\2\u0108\u010a\5&\24\2\u0109\u0108\3\2\2\2"
+                    + "\u0109\u010a\3\2\2\2\u010a\u010b\3\2\2\2\u010b\u010c\7\13\2\2\u010c%\3"
+                    + "\2\2\2\u010d\u010f\5\"\22\2\u010e\u010d\3\2\2\2\u010f\u0110\3\2\2\2\u0110"
+                    + "\u010e\3\2\2\2\u0110\u0111\3\2\2\2\u0111\'\3\2\2\2\u0112\u0113\5\66\34"
+                    + "\2\u0113\u0114\5*\26\2\u0114\u0115\5\u008cG\2\u0115)\3\2\2\2\u0116\u011b"
+                    + "\5,\27\2\u0117\u0118\7\r\2\2\u0118\u011a\5,\27\2\u0119\u0117\3\2\2\2\u011a"
+                    + "\u011d\3\2\2\2\u011b\u0119\3\2\2\2\u011b\u011c\3\2\2\2\u011c+\3\2\2\2"
+                    + "\u011d\u011b\3\2\2\2\u011e\u0121\7u\2\2\u011f\u0120\7\16\2\2\u0120\u0122"
+                    + "\5z>\2\u0121\u011f\3\2\2\2\u0121\u0122\3\2\2\2\u0122-\3\2\2\2\u0123\u0124"
+                    + "\7\f\2\2\u0124/\3\2\2\2\u0125\u0126\6\31\2\2\u0126\u0127\5x=\2\u0127\u0128"
+                    + "\5\u008cG\2\u0128\61\3\2\2\2\u0129\u012a\7T\2\2\u012a\u012b\7\b\2\2\u012b"
+                    + "\u012c\5x=\2\u012c\u012d\7\t\2\2\u012d\u0130\5\"\22\2\u012e\u012f\7D\2"
+                    + "\2\u012f\u0131\5\"\22\2\u0130\u012e\3\2\2\2\u0130\u0131\3\2\2\2\u0131"
+                    + "\63\3\2\2\2\u0132\u0133\7@\2\2\u0133\u0134\5\"\22\2\u0134\u0135\7N\2\2"
+                    + "\u0135\u0136\7\b\2\2\u0136\u0137\5x=\2\u0137\u0138\7\t\2\2\u0138\u0139"
+                    + "\5\u008cG\2\u0139\u0178\3\2\2\2\u013a\u013b\7N\2\2\u013b\u013c\7\b\2\2"
+                    + "\u013c\u013d\5x=\2\u013d\u013e\7\t\2\2\u013e\u013f\5\"\22\2\u013f\u0178"
+                    + "\3\2\2\2\u0140\u0141\7L\2\2\u0141\u0143\7\b\2\2\u0142\u0144\5x=\2\u0143"
+                    + "\u0142\3\2\2\2\u0143\u0144\3\2\2\2\u0144\u0145\3\2\2\2\u0145\u0147\7\f"
+                    + "\2\2\u0146\u0148\5x=\2\u0147\u0146\3\2\2\2\u0147\u0148\3\2\2\2\u0148\u0149"
+                    + "\3\2\2\2\u0149\u014b\7\f\2\2\u014a\u014c\5x=\2\u014b\u014a\3\2\2\2\u014b"
+                    + "\u014c\3\2\2\2\u014c\u014d\3\2\2\2\u014d\u014e\7\t\2\2\u014e\u0178\5\""
+                    + "\22\2\u014f\u0150\7L\2\2\u0150\u0151\7\b\2\2\u0151\u0152\5\66\34\2\u0152"
+                    + "\u0153\5*\26\2\u0153\u0155\7\f\2\2\u0154\u0156\5x=\2\u0155\u0154\3\2\2"
+                    + "\2\u0155\u0156\3\2\2\2\u0156\u0157\3\2\2\2\u0157\u0159\7\f\2\2\u0158\u015a"
+                    + "\5x=\2\u0159\u0158\3\2\2\2\u0159\u015a\3\2\2\2\u015a\u015b\3\2\2\2\u015b"
+                    + "\u015c\7\t\2\2\u015c\u015d\5\"\22\2\u015d\u0178\3\2\2\2\u015e\u015f\7"
+                    + "L\2\2\u015f\u0160\7\b\2\2\u0160\u0164\5z>\2\u0161\u0165\7W\2\2\u0162\u0163"
+                    + "\7u\2\2\u0163\u0165\6\33\3\2\u0164\u0161\3\2\2\2\u0164\u0162\3\2\2\2\u0165"
+                    + "\u0166\3\2\2\2\u0166\u0167\5x=\2\u0167\u0168\7\t\2\2\u0168\u0169\5\"\22"
+                    + "\2\u0169\u0178\3\2\2\2\u016a\u016b\7L\2\2\u016b\u016c\7\b\2\2\u016c\u016d"
+                    + "\5\66\34\2\u016d\u0171\5,\27\2\u016e\u0172\7W\2\2\u016f\u0170\7u\2\2\u0170"
+                    + "\u0172\6\33\4\2\u0171\u016e\3\2\2\2\u0171\u016f\3\2\2\2\u0172\u0173\3"
+                    + "\2\2\2\u0173\u0174\5x=\2\u0174\u0175\7\t\2\2\u0175\u0176\5\"\22\2\u0176"
+                    + "\u0178\3\2\2\2\u0177\u0132\3\2\2\2\u0177\u013a\3\2\2\2\u0177\u0140\3\2"
+                    + "\2\2\u0177\u014f\3\2\2\2\u0177\u015e\3\2\2\2\u0177\u016a\3\2\2\2\u0178"
+                    + "\65\3\2\2\2\u0179\u017a\7F\2\2\u017a\67\3\2\2\2\u017b\u017e\7K\2\2\u017c"
+                    + "\u017d\6\35\5\2\u017d\u017f\7u\2\2\u017e\u017c\3\2\2\2\u017e\u017f\3\2"
+                    + "\2\2\u017f\u0180\3\2\2\2\u0180\u0181\5\u008cG\2\u01819\3\2\2\2\u0182\u0185"
+                    + "\7?\2\2\u0183\u0184\6\36\6\2\u0184\u0186\7u\2\2\u0185\u0183\3\2\2\2\u0185"
+                    + "\u0186\3\2\2\2\u0186\u0187\3\2\2\2\u0187\u0188\5\u008cG\2\u0188;\3\2\2"
+                    + "\2\u0189\u018c\7I\2\2\u018a\u018b\6\37\7\2\u018b\u018d\5x=\2\u018c\u018a"
+                    + "\3\2\2\2\u018c\u018d\3\2\2\2\u018d\u018e\3\2\2\2\u018e\u018f\5\u008cG"
+                    + "\2\u018f=\3\2\2\2\u0190\u0191\7R\2\2\u0191\u0192\7\b\2\2\u0192\u0193\5"
+                    + "x=\2\u0193\u0194\7\t\2\2\u0194\u0195\5\"\22\2\u0195?\3\2\2\2\u0196\u0197"
+                    + "\7M\2\2\u0197\u0198\7\b\2\2\u0198\u0199\5x=\2\u0199\u019a\7\t\2\2\u019a"
+                    + "\u019b\5B\"\2\u019bA\3\2\2\2\u019c\u019e\7\n\2\2\u019d\u019f\5D#\2\u019e"
+                    + "\u019d\3\2\2\2\u019e\u019f\3\2\2\2\u019f\u01a4\3\2\2\2\u01a0\u01a2\5H"
+                    + "%\2\u01a1\u01a3\5D#\2\u01a2\u01a1\3\2\2\2\u01a2\u01a3\3\2\2\2\u01a3\u01a5"
+                    + "\3\2\2\2\u01a4\u01a0\3\2\2\2\u01a4\u01a5\3\2\2\2\u01a5\u01a6\3\2\2\2\u01a6"
+                    + "\u01a7\7\13\2\2\u01a7C\3\2\2\2\u01a8\u01aa\5F$\2\u01a9\u01a8\3\2\2\2\u01aa"
+                    + "\u01ab\3\2\2\2\u01ab\u01a9\3\2\2\2\u01ab\u01ac\3\2\2\2\u01acE\3\2\2\2"
+                    + "\u01ad\u01ae\7C\2\2\u01ae\u01af\5x=\2\u01af\u01b1\7\20\2\2\u01b0\u01b2"
+                    + "\5&\24\2\u01b1\u01b0\3\2\2\2\u01b1\u01b2\3\2\2\2\u01b2G\3\2\2\2\u01b3"
+                    + "\u01b4\7S\2\2\u01b4\u01b6\7\20\2\2\u01b5\u01b7\5&\24\2\u01b6\u01b5\3\2"
+                    + "\2\2\u01b6\u01b7\3\2\2\2\u01b7I\3\2\2\2\u01b8\u01b9\7U\2\2\u01b9\u01ba"
+                    + "\6&\b\2\u01ba\u01bb\5x=\2\u01bb\u01bc\5\u008cG\2\u01bcK\3\2\2\2\u01bd"
+                    + "\u01be\7X\2\2\u01be\u01c4\5$\23\2\u01bf\u01c1\5N(\2\u01c0\u01c2\5P)\2"
+                    + "\u01c1\u01c0\3\2\2\2\u01c1\u01c2\3\2\2\2\u01c2\u01c5\3\2\2\2\u01c3\u01c5"
+                    + "\5P)\2\u01c4\u01bf\3\2\2\2\u01c4\u01c3\3\2\2\2\u01c5M\3\2\2\2\u01c6\u01c7"
+                    + "\7G\2\2\u01c7\u01c8\7\b\2\2\u01c8\u01c9\7u\2\2\u01c9\u01ca\7\t\2\2\u01ca"
+                    + "\u01cb\5$\23\2\u01cbO\3\2\2\2\u01cc\u01cd\7H\2\2\u01cd\u01ce\5$\23\2\u01ce"
+                    + "Q\3\2\2\2\u01cf\u01d0\7O\2\2\u01d0\u01d1\5\u008cG\2\u01d1S\3\2\2\2\u01d2"
+                    + "\u01d4\5\6\4\2\u01d3\u01d2\3\2\2\2\u01d3\u01d4\3\2\2\2\u01d4\u01d6\3\2"
+                    + "\2\2\u01d5\u01d7\7f\2\2\u01d6\u01d5\3\2\2\2\u01d6\u01d7\3\2\2\2\u01d7"
+                    + "\u01d8\3\2\2\2\u01d8\u01d9\7P\2\2\u01d9\u01da\7u\2\2\u01da\u01dc\7\b\2"
+                    + "\2\u01db\u01dd\5^\60\2\u01dc\u01db\3\2\2\2\u01dc\u01dd\3\2\2\2\u01dd\u01de"
+                    + "\3\2\2\2\u01de\u01e0\7\t\2\2\u01df\u01e1\7`\2\2\u01e0\u01df\3\2\2\2\u01e0"
+                    + "\u01e1\3\2\2\2\u01e1\u01e2\3\2\2\2\u01e2\u01e3\7\n\2\2\u01e3\u01e4\5d"
+                    + "\63\2\u01e4\u01e5\7\13\2\2\u01e5U\3\2\2\2\u01e6\u01e7\7a\2\2\u01e7\u01e8"
+                    + "\7u\2\2\u01e8\u01e9\5X-\2\u01e9W\3\2\2\2\u01ea\u01eb\7c\2\2\u01eb\u01ed"
+                    + "\5z>\2\u01ec\u01ea\3\2\2\2\u01ec\u01ed\3\2\2\2\u01ed\u01ee\3\2\2\2\u01ee"
+                    + "\u01f2\7\n\2\2\u01ef\u01f1\5Z.\2\u01f0\u01ef\3\2\2\2\u01f1\u01f4\3\2\2"
+                    + "\2\u01f2\u01f0\3\2\2\2\u01f2\u01f3\3\2\2\2\u01f3\u01f5\3\2\2\2\u01f4\u01f2"
+                    + "\3\2\2\2\u01f5\u01f6\7\13\2\2\u01f6Y\3\2\2\2\u01f7\u01f9\7s\2\2\u01f8"
+                    + "\u01f7\3\2\2\2\u01f8\u01f9\3\2\2\2\u01f9\u01fa\3\2\2\2\u01fa\u01fb\5\\"
+                    + "/\2\u01fb[\3\2\2\2\u01fc\u01fd\5r:\2\u01fd\u01ff\7\b\2\2\u01fe\u0200\5"
+                    + "^\60\2\u01ff\u01fe\3\2\2\2\u01ff\u0200\3\2\2\2\u0200\u0201\3\2\2\2\u0201"
+                    + "\u0202\7\t\2\2\u0202\u0203\7\n\2\2\u0203\u0204\5d\63\2\u0204\u0205\7\13"
+                    + "\2\2\u0205]\3\2\2\2\u0206\u020b\5`\61\2\u0207\u0208\7\r\2\2\u0208\u020a"
+                    + "\5`\61\2\u0209\u0207\3\2\2\2\u020a\u020d\3\2\2\2\u020b\u0209\3\2\2\2\u020b"
+                    + "\u020c\3\2\2\2\u020c\u0210\3\2\2\2\u020d\u020b\3\2\2\2\u020e\u020f\7\r"
+                    + "\2\2\u020f\u0211\5b\62\2\u0210\u020e\3\2\2\2\u0210\u0211\3\2\2\2\u0211"
+                    + "\u0216\3\2\2\2\u0212\u0216\5b\62\2\u0213\u0216\5h\65\2\u0214\u0216\5n"
+                    + "8\2\u0215\u0206\3\2\2\2\u0215\u0212\3\2\2\2\u0215\u0213\3\2\2\2\u0215"
+                    + "\u0214\3\2\2\2\u0216_\3\2\2\2\u0217\u021a\7u\2\2\u0218\u0219\7\16\2\2"
+                    + "\u0219\u021b\5z>\2\u021a\u0218\3\2\2\2\u021a\u021b\3\2\2\2\u021ba\3\2"
+                    + "\2\2\u021c\u021d\7\21\2\2\u021d\u021e\7u\2\2\u021ec\3\2\2\2\u021f\u0221"
+                    + "\5f\64\2\u0220\u021f\3\2\2\2\u0220\u0221\3\2\2\2\u0221e\3\2\2\2\u0222"
+                    + "\u0224\5\30\r\2\u0223\u0222\3\2\2\2\u0224\u0225\3\2\2\2\u0225\u0223\3"
+                    + "\2\2\2\u0225\u0226\3\2\2\2\u0226g\3\2\2\2\u0227\u022b\7\6\2\2\u0228\u022a"
+                    + "\7\r\2\2\u0229\u0228\3\2\2\2\u022a\u022d\3\2\2\2\u022b\u0229\3\2\2\2\u022b"
+                    + "\u022c\3\2\2\2\u022c\u022f\3\2\2\2\u022d\u022b\3\2\2\2\u022e\u0230\5j"
+                    + "\66\2\u022f\u022e\3\2\2\2\u022f\u0230\3\2\2\2\u0230\u0234\3\2\2\2\u0231"
+                    + "\u0233\7\r\2\2\u0232\u0231\3\2\2\2\u0233\u0236\3\2\2\2\u0234\u0232\3\2"
+                    + "\2\2\u0234\u0235\3\2\2\2\u0235\u0237\3\2\2\2\u0236\u0234\3\2\2\2\u0237"
+                    + "\u0238\7\7\2\2\u0238i\3\2\2\2\u0239\u0242\5z>\2\u023a\u023c\7\r\2\2\u023b"
+                    + "\u023a\3\2\2\2\u023c\u023d\3\2\2\2\u023d\u023b\3\2\2\2\u023d\u023e\3\2"
+                    + "\2\2\u023e\u023f\3\2\2\2\u023f\u0241\5z>\2\u0240\u023b\3\2\2\2\u0241\u0244"
+                    + "\3\2\2\2\u0242\u0240\3\2\2\2\u0242\u0243\3\2\2\2\u0243\u024b\3\2\2\2\u0244"
+                    + "\u0242\3\2\2\2\u0245\u0247\7\r\2\2\u0246\u0245\3\2\2\2\u0247\u0248\3\2"
+                    + "\2\2\u0248\u0246\3\2\2\2\u0248\u0249\3\2\2\2\u0249\u024a\3\2\2\2\u024a"
+                    + "\u024c\5l\67\2\u024b\u0246\3\2\2\2\u024b\u024c\3\2\2\2\u024c\u024f\3\2"
+                    + "\2\2\u024d\u024f\5l\67\2\u024e\u0239\3\2\2\2\u024e\u024d\3\2\2\2\u024f"
+                    + "k\3\2\2\2\u0250\u0251\7\21\2\2\u0251\u0252\7u\2\2\u0252m\3\2\2\2\u0253"
+                    + "\u025c\7\n\2\2\u0254\u0259\5p9\2\u0255\u0256\7\r\2\2\u0256\u0258\5p9\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\u025d\3\2\2\2\u025b\u0259\3\2\2\2\u025c\u0254\3\2\2\2\u025c"
+                    + "\u025d\3\2\2\2\u025d\u025f\3\2\2\2\u025e\u0260\7\r\2\2\u025f\u025e\3\2"
+                    + "\2\2\u025f\u0260\3\2\2\2\u0260\u0261\3\2\2\2\u0261\u0262\7\13\2\2\u0262"
+                    + "o\3\2\2\2\u0263\u0264\5r:\2\u0264\u0265\t\5\2\2\u0265\u0266\5z>\2\u0266"
+                    + "\u026f\3\2\2\2\u0267\u0268\7\6\2\2\u0268\u0269\5z>\2\u0269\u026a\7\7\2"
+                    + "\2\u026a\u026b\7\20\2\2\u026b\u026c\5z>\2\u026c\u026f\3\2\2\2\u026d\u026f"
+                    + "\7u\2\2\u026e\u0263\3\2\2\2\u026e\u0267\3\2\2\2\u026e\u026d\3\2\2\2\u026f"
+                    + "q\3\2\2\2\u0270\u0274\5\u0086D\2\u0271\u0274\7v\2\2\u0272\u0274\5\u0084"
+                    + "C\2\u0273\u0270\3\2\2\2\u0273\u0271\3\2\2\2\u0273\u0272\3\2\2\2\u0274"
+                    + "s\3\2\2\2\u0275\u0283\7\b\2\2\u0276\u027b\5z>\2\u0277\u0278\7\r\2\2\u0278"
+                    + "\u027a\5z>\2\u0279\u0277\3\2\2\2\u027a\u027d\3\2\2\2\u027b\u0279\3\2\2"
+                    + "\2\u027b\u027c\3\2\2\2\u027c\u0280\3\2\2\2\u027d\u027b\3\2\2\2\u027e\u027f"
+                    + "\7\r\2\2\u027f\u0281\5v<\2\u0280\u027e\3\2\2\2\u0280\u0281\3\2\2\2\u0281"
+                    + "\u0284\3\2\2\2\u0282\u0284\5v<\2\u0283\u0276\3\2\2\2\u0283\u0282\3\2\2"
+                    + "\2\u0283\u0284\3\2\2\2\u0284\u0285\3\2\2\2\u0285\u0286\7\t\2\2\u0286u"
+                    + "\3\2\2\2\u0287\u0288\7\21\2\2\u0288\u0289\7u\2\2\u0289w\3\2\2\2\u028a"
+                    + "\u028f\5z>\2\u028b\u028c\7\r\2\2\u028c\u028e\5z>\2\u028d\u028b\3\2\2\2"
+                    + "\u028e\u0291\3\2\2\2\u028f\u028d\3\2\2\2\u028f\u0290\3\2\2\2\u0290y\3"
+                    + "\2\2\2\u0291\u028f\3\2\2\2\u0292\u0293\b>\1\2\u0293\u0294\7E\2\2\u0294"
+                    + "\u0296\5z>\2\u0295\u0297\5t;\2\u0296\u0295\3\2\2\2\u0296\u0297\3\2\2\2"
+                    + "\u0297\u02b5\3\2\2\2\u0298\u0299\7B\2\2\u0299\u02b5\5z>!\u029a\u029b\7"
+                    + "\23\2\2\u029b\u02b5\5z> \u029c\u029d\7\24\2\2\u029d\u02b5\5z>\37\u029e"
+                    + "\u029f\7\25\2\2\u029f\u02b5\5z>\36\u02a0\u02a1\7\26\2\2\u02a1\u02b5\5"
+                    + "z>\35\u02a2\u02a3\7\27\2\2\u02a3\u02b5\5z>\34\u02a4\u02a5\7\30\2\2\u02a5"
+                    + "\u02b5\5z>\33\u02a6\u02b5\7Q\2\2\u02a7\u02b5\7u\2\2\u02a8\u02b5\7d\2\2"
+                    + "\u02a9\u02b5\5\u0082B\2\u02aa\u02b5\5h\65\2\u02ab\u02b5\5n8\2\u02ac\u02ad"
+                    + "\7\b\2\2\u02ad\u02ae\5x=\2\u02ae\u02af\7\t\2\2\u02af\u02b5\3\2\2\2\u02b0"
+                    + "\u02b1\5|?\2\u02b1\u02b2\7\67\2\2\u02b2\u02b3\5~@\2\u02b3\u02b5\3\2\2"
+                    + "\2\u02b4\u0292\3\2\2\2\u02b4\u0298\3\2\2\2\u02b4\u029a\3\2\2\2\u02b4\u029c"
+                    + "\3\2\2\2\u02b4\u029e\3\2\2\2\u02b4\u02a0\3\2\2\2\u02b4\u02a2\3\2\2\2\u02b4"
+                    + "\u02a4\3\2\2\2\u02b4\u02a6\3\2\2\2\u02b4\u02a7\3\2\2\2\u02b4\u02a8\3\2"
+                    + "\2\2\u02b4\u02a9\3\2\2\2\u02b4\u02aa\3\2\2\2\u02b4\u02ab\3\2\2\2\u02b4"
+                    + "\u02ac\3\2\2\2\u02b4\u02b0\3\2\2\2\u02b5\u02fb\3\2\2\2\u02b6\u02b7\f\32"
+                    + "\2\2\u02b7\u02b8\t\6\2\2\u02b8\u02fa\5z>\33\u02b9\u02ba\f\31\2\2\u02ba"
+                    + "\u02bb\t\7\2\2\u02bb\u02fa\5z>\32\u02bc\u02bd\f\30\2\2\u02bd\u02be\t\b"
+                    + "\2\2\u02be\u02fa\5z>\31\u02bf\u02c0\f\27\2\2\u02c0\u02c1\t\t\2\2\u02c1"
+                    + "\u02fa\5z>\30\u02c2\u02c3\f\26\2\2\u02c3\u02c4\7A\2\2\u02c4\u02fa\5z>"
+                    + "\27\u02c5\u02c6\f\25\2\2\u02c6\u02c7\7W\2\2\u02c7\u02fa\5z>\26\u02c8\u02c9"
+                    + "\f\24\2\2\u02c9\u02ca\t\n\2\2\u02ca\u02fa\5z>\25\u02cb\u02cc\f\23\2\2"
+                    + "\u02cc\u02cd\7\'\2\2\u02cd\u02fa\5z>\24\u02ce\u02cf\f\22\2\2\u02cf\u02d0"
+                    + "\7(\2\2\u02d0\u02fa\5z>\23\u02d1\u02d2\f\21\2\2\u02d2\u02d3\7)\2\2\u02d3"
+                    + "\u02fa\5z>\22\u02d4\u02d5\f\20\2\2\u02d5\u02d6\7*\2\2\u02d6\u02fa\5z>"
+                    + "\21\u02d7\u02d8\f\17\2\2\u02d8\u02d9\7+\2\2\u02d9\u02fa\5z>\20\u02da\u02db"
+                    + "\f\16\2\2\u02db\u02dc\7\17\2\2\u02dc\u02dd\5z>\2\u02dd\u02de\7\20\2\2"
+                    + "\u02de\u02df\5z>\17\u02df\u02fa\3\2\2\2\u02e0\u02e1\f\r\2\2\u02e1\u02e2"
+                    + "\7\16\2\2\u02e2\u02fa\5z>\16\u02e3\u02e4\f\f\2\2\u02e4\u02e5\5\u0080A"
+                    + "\2\u02e5\u02e6\5z>\r\u02e6\u02fa\3\2\2\2\u02e7\u02e8\f\'\2\2\u02e8\u02e9"
+                    + "\7\6\2\2\u02e9\u02ea\5x=\2\u02ea\u02eb\7\7\2\2\u02eb\u02fa\3\2\2\2\u02ec"
+                    + "\u02ed\f&\2\2\u02ed\u02ee\7\22\2\2\u02ee\u02fa\5\u0086D\2\u02ef\u02f0"
+                    + "\f%\2\2\u02f0\u02fa\5t;\2\u02f1\u02f2\f#\2\2\u02f2\u02f3\6>\34\2\u02f3"
+                    + "\u02fa\7\23\2\2\u02f4\u02f5\f\"\2\2\u02f5\u02f6\6>\36\2\u02f6\u02fa\7"
+                    + "\24\2\2\u02f7\u02f8\f\13\2\2\u02f8\u02fa\7w\2\2\u02f9\u02b6\3\2\2\2\u02f9"
+                    + "\u02b9\3\2\2\2\u02f9\u02bc\3\2\2\2\u02f9\u02bf\3\2\2\2\u02f9\u02c2\3\2"
+                    + "\2\2\u02f9\u02c5\3\2\2\2\u02f9\u02c8\3\2\2\2\u02f9\u02cb\3\2\2\2\u02f9"
+                    + "\u02ce\3\2\2\2\u02f9\u02d1\3\2\2\2\u02f9\u02d4\3\2\2\2\u02f9\u02d7\3\2"
+                    + "\2\2\u02f9\u02da\3\2\2\2\u02f9\u02e0\3\2\2\2\u02f9\u02e3\3\2\2\2\u02f9"
+                    + "\u02e7\3\2\2\2\u02f9\u02ec\3\2\2\2\u02f9\u02ef\3\2\2\2\u02f9\u02f1\3\2"
+                    + "\2\2\u02f9\u02f4\3\2\2\2\u02f9\u02f7\3\2\2\2\u02fa\u02fd\3\2\2\2\u02fb"
+                    + "\u02f9\3\2\2\2\u02fb\u02fc\3\2\2\2\u02fc{\3\2\2\2\u02fd\u02fb\3\2\2\2"
+                    + "\u02fe\u0305\7u\2\2\u02ff\u0301\7\b\2\2\u0300\u0302\5^\60\2\u0301\u0300"
+                    + "\3\2\2\2\u0301\u0302\3\2\2\2\u0302\u0303\3\2\2\2\u0303\u0305\7\t\2\2\u0304"
+                    + "\u02fe\3\2\2\2\u0304\u02ff\3\2\2\2\u0305}\3\2\2\2\u0306\u030c\5z>\2\u0307"
+                    + "\u0308\7\n\2\2\u0308\u0309\5d\63\2\u0309\u030a\7\13\2\2\u030a\u030c\3"
+                    + "\2\2\2\u030b\u0306\3\2\2\2\u030b\u0307\3\2\2\2\u030c\177\3\2\2\2\u030d"
+                    + "\u030e\t\13\2\2\u030e\u0081\3\2\2\2\u030f\u0316\78\2\2\u0310\u0316\79"
+                    + "\2\2\u0311\u0316\7v\2\2\u0312\u0316\7w\2\2\u0313\u0316\7\5\2\2\u0314\u0316"
+                    + "\5\u0084C\2\u0315\u030f\3\2\2\2\u0315\u0310\3\2\2\2\u0315\u0311\3\2\2"
+                    + "\2\u0315\u0312\3\2\2\2\u0315\u0313\3\2\2\2\u0315\u0314\3\2\2\2\u0316\u0083"
+                    + "\3\2\2\2\u0317\u0318\t\f\2\2\u0318\u0085\3\2\2\2\u0319\u031c\7u\2\2\u031a"
+                    + "\u031c\5\u0088E\2\u031b\u0319\3\2\2\2\u031b\u031a\3\2\2\2\u031c\u0087"
+                    + "\3\2\2\2\u031d\u0321\5\u008aF\2\u031e\u0321\78\2\2\u031f\u0321\79\2\2"
+                    + "\u0320\u031d\3\2\2\2\u0320\u031e\3\2\2\2\u0320\u031f\3\2\2\2\u0321\u0089"
+                    + "\3\2\2\2\u0322\u0323\t\r\2\2\u0323\u008b\3\2\2\2\u0324\u0329\7\f\2\2\u0325"
+                    + "\u0329\7\2\2\3\u0326\u0329\6G \2\u0327\u0329\6G!\2\u0328\u0324\3\2\2\2"
+                    + "\u0328\u0325\3\2\2\2\u0328\u0326\3\2\2\2\u0328\u0327\3\2\2\2\u0329\u008d"
+                    + "\3\2\2\2U\u008f\u0094\u009c\u00a3\u00a9\u00b2\u00b8\u00be\u00c1\u00c7"
+                    + "\u00ce\u00d4\u00d9\u00dd\u00e8\u00f8\u0105\u0109\u0110\u011b\u0121\u0130"
+                    + "\u0143\u0147\u014b\u0155\u0159\u0164\u0171\u0177\u017e\u0185\u018c\u019e"
+                    + "\u01a2\u01a4\u01ab\u01b1\u01b6\u01c1\u01c4\u01d3\u01d6\u01dc\u01e0\u01ec"
+                    + "\u01f2\u01f8\u01ff\u020b\u0210\u0215\u021a\u0220\u0225\u022b\u022f\u0234"
+                    + "\u023d\u0242\u0248\u024b\u024e\u0259\u025c\u025f\u026e\u0273\u027b\u0280"
+                    + "\u0283\u028f\u0296\u02b4\u02f9\u02fb\u0301\u0304\u030b\u0315\u031b\u0320"
+                    + "\u0328";
+    public static final ATN _ATN = new ATNDeserializer().deserialize(_serializedATN.toCharArray());
+    static {
+        _decisionToDFA = new DFA[_ATN.getNumberOfDecisions()];
+        for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) {
+            _decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
+        }
+    }
+}
diff --git a/src/main/gen/org/bdware/sc/parser/YJSParserBaseListener.java b/src/main/gen/org/bdware/sc/parser/YJSParserBaseListener.java
index 49f816a..eb0d6bd 100644
--- a/src/main/gen/org/bdware/sc/parser/YJSParserBaseListener.java
+++ b/src/main/gen/org/bdware/sc/parser/YJSParserBaseListener.java
@@ -6,1390 +6,2313 @@ 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.
+ * 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 enterInterfaceDeclaration(YJSParser.InterfaceDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitInterfaceDeclaration(YJSParser.InterfaceDeclarationContext 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 enterEventGlobalOrLocal(YJSParser.EventGlobalOrLocalContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitEventGlobalOrLocal(YJSParser.EventGlobalOrLocalContext 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 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 enterProgram(YJSParser.ProgramContext 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
+    /**
+     * {@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 enterInterfaceDeclaration(YJSParser.InterfaceDeclarationContext ctx) {}
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>
+     * The default implementation does nothing.
+     * </p>
+     */
+    @Override
+    public void exitInterfaceDeclaration(YJSParser.InterfaceDeclarationContext 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 enterEventGlobalOrLocal(YJSParser.EventGlobalOrLocalContext ctx) {}
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>
+     * The default implementation does nothing.
+     * </p>
+     */
+    @Override
+    public void exitEventGlobalOrLocal(YJSParser.EventGlobalOrLocalContext 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 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) {}
+}
diff --git a/src/main/gen/org/bdware/sc/parser/YJSParserBaseVisitor.java b/src/main/gen/org/bdware/sc/parser/YJSParserBaseVisitor.java
index b6b5af6..45b3cda 100644
--- a/src/main/gen/org/bdware/sc/parser/YJSParserBaseVisitor.java
+++ b/src/main/gen/org/bdware/sc/parser/YJSParserBaseVisitor.java
@@ -1,805 +1,1484 @@
 // Generated from YJSParser.g4 by ANTLR 4.9.2
 package org.bdware.sc.parser;
+
 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.
+ * 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.
+ * @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 visitInterfaceDeclaration(YJSParser.InterfaceDeclarationContext 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 visitEventGlobalOrLocal(YJSParser.EventGlobalOrLocalContext 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 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
+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 visitInterfaceDeclaration(YJSParser.InterfaceDeclarationContext 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 visitEventGlobalOrLocal(YJSParser.EventGlobalOrLocalContext 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 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);
+    }
+}
diff --git a/src/main/gen/org/bdware/sc/parser/YJSParserListener.java b/src/main/gen/org/bdware/sc/parser/YJSParserListener.java
index 982ff00..177611c 100644
--- a/src/main/gen/org/bdware/sc/parser/YJSParserListener.java
+++ b/src/main/gen/org/bdware/sc/parser/YJSParserListener.java
@@ -1,1232 +1,1685 @@
 // Generated from YJSParser.g4 by ANTLR 4.9.2
 package org.bdware.sc.parser;
+
 import org.antlr.v4.runtime.tree.ParseTreeListener;
 
 /**
- * This interface defines a complete listener for a parse tree produced by
- * {@link YJSParser}.
+ * 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#interfaceDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterInterfaceDeclaration(YJSParser.InterfaceDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link YJSParser#interfaceDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitInterfaceDeclaration(YJSParser.InterfaceDeclarationContext 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#eventGlobalOrLocal}.
-	 * @param ctx the parse tree
-	 */
-	void enterEventGlobalOrLocal(YJSParser.EventGlobalOrLocalContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link YJSParser#eventGlobalOrLocal}.
-	 * @param ctx the parse tree
-	 */
-	void exitEventGlobalOrLocal(YJSParser.EventGlobalOrLocalContext 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#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
+    /**
+     * 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#interfaceDeclaration}.
+     * 
+     * @param ctx the parse tree
+     */
+    void enterInterfaceDeclaration(YJSParser.InterfaceDeclarationContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#interfaceDeclaration}.
+     * 
+     * @param ctx the parse tree
+     */
+    void exitInterfaceDeclaration(YJSParser.InterfaceDeclarationContext 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#eventGlobalOrLocal}.
+     * 
+     * @param ctx the parse tree
+     */
+    void enterEventGlobalOrLocal(YJSParser.EventGlobalOrLocalContext ctx);
+
+    /**
+     * Exit a parse tree produced by {@link YJSParser#eventGlobalOrLocal}.
+     * 
+     * @param ctx the parse tree
+     */
+    void exitEventGlobalOrLocal(YJSParser.EventGlobalOrLocalContext 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#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);
+}
diff --git a/src/main/gen/org/bdware/sc/parser/YJSParserVisitor.java b/src/main/gen/org/bdware/sc/parser/YJSParserVisitor.java
index 3e08f03..3b1e761 100644
--- a/src/main/gen/org/bdware/sc/parser/YJSParserVisitor.java
+++ b/src/main/gen/org/bdware/sc/parser/YJSParserVisitor.java
@@ -1,737 +1,963 @@
 // Generated from YJSParser.g4 by ANTLR 4.9.2
 package org.bdware.sc.parser;
+
 import org.antlr.v4.runtime.tree.ParseTreeVisitor;
 
 /**
- * This interface defines a complete generic visitor for a parse tree produced
- * by {@link YJSParser}.
+ * 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.
+ * @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#interfaceDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitInterfaceDeclaration(YJSParser.InterfaceDeclarationContext 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#eventGlobalOrLocal}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitEventGlobalOrLocal(YJSParser.EventGlobalOrLocalContext 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#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
+    /**
+     * 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#interfaceDeclaration}.
+     * 
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitInterfaceDeclaration(YJSParser.InterfaceDeclarationContext 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#eventGlobalOrLocal}.
+     * 
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitEventGlobalOrLocal(YJSParser.EventGlobalOrLocalContext 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#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);
+}
diff --git a/src/main/pythongen/org/bdware/sc/commParser/BDLedger/Block.java b/src/main/pythongen/org/bdware/sc/commParser/BDLedger/Block.java
index c28973c..3cdd731 100644
--- a/src/main/pythongen/org/bdware/sc/commParser/BDLedger/Block.java
+++ b/src/main/pythongen/org/bdware/sc/commParser/BDLedger/Block.java
@@ -40,35 +40,35 @@ public class Block {
         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;
-//	}
+    // 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];
diff --git a/src/main/pythongen/org/bdware/sc/commParser/BDLedger/Transaction.java b/src/main/pythongen/org/bdware/sc/commParser/BDLedger/Transaction.java
index 428cc58..edd6b0b 100644
--- a/src/main/pythongen/org/bdware/sc/commParser/BDLedger/Transaction.java
+++ b/src/main/pythongen/org/bdware/sc/commParser/BDLedger/Transaction.java
@@ -14,7 +14,7 @@ public class Transaction {
     public long nonce;
     public int type;
     public byte[] data;
-    //扩展字段
+    // 扩展字段
     public int timestamp;
     public byte[] hash;
 
@@ -97,4 +97,4 @@ public class Transaction {
         }
         return null;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/pythongen/org/bdware/sc/commParser/LocalLogAdapter.java b/src/main/pythongen/org/bdware/sc/commParser/LocalLogAdapter.java
index 1ae6955..7013445 100644
--- a/src/main/pythongen/org/bdware/sc/commParser/LocalLogAdapter.java
+++ b/src/main/pythongen/org/bdware/sc/commParser/LocalLogAdapter.java
@@ -12,11 +12,11 @@ public class LocalLogAdapter {
 
         this.trans.Data = chaintrans.getData().getBytes();
         this.trans.SrcID = chaintrans.getKey().getBytes();
-        this.trans.Txid = chaintrans.getData().getBytes();   //交易id对应本地日志库中什么字段呢
+        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();
+        // 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_bak.java b/src/main/pythongen/org/bdware/sc/commParser/Transaction_bak.java
index ae3e3f9..118881c 100644
--- a/src/main/pythongen/org/bdware/sc/commParser/Transaction_bak.java
+++ b/src/main/pythongen/org/bdware/sc/commParser/Transaction_bak.java
@@ -38,7 +38,8 @@ public class Transaction_bak {
     public byte[] getTransactionHash() {
         try {
             MessageDigest md = MessageDigest.getInstance("SHA-256");
-            System.out.println("[Transaction]: getTransactionHash-->" + HashUtil.byteArray2Str(toHashByteArray()));
+            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) + " ==> "
@@ -95,4 +96,4 @@ public class Transaction_bak {
         }
         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
index bb8f3e9..d4c4485 100644
--- a/src/main/pythongen/org/bdware/sc/commParser/XuperChainAdapter.java
+++ b/src/main/pythongen/org/bdware/sc/commParser/XuperChainAdapter.java
@@ -1,17 +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();
-//		}
-//	}
+    // 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
index 73be876..6a9c48a 100644
--- a/src/main/pythongen/org/bdware/sc/common/Transaction.java
+++ b/src/main/pythongen/org/bdware/sc/common/Transaction.java
@@ -5,10 +5,10 @@ package org.bdware.sc.common;
  */
 public class Transaction {
     String key;
-    String from;  //pubKey
-    String to;  //action
+    String from; // pubKey
+    String to; // action
     String data;
-    String requestID;  //date
+    String requestID; // date
 
     public String getKey() {
         return this.key;
diff --git a/src/test/java/org/bdware/MultiIndextTimeRocksDBUtilTest.java b/src/test/java/org/bdware/MultiIndextTimeRocksDBUtilTest.java
index ffd46d5..6521200 100644
--- a/src/test/java/org/bdware/MultiIndextTimeRocksDBUtilTest.java
+++ b/src/test/java/org/bdware/MultiIndextTimeRocksDBUtilTest.java
@@ -36,7 +36,8 @@ public class MultiIndextTimeRocksDBUtilTest {
         for (int i = 0; i < tt.size(); i++) {
             long val = tt.get(i).get("timestamp").getAsLong();
             LOGGER.info(String.format("pre %d cu %d suc %d", util.queryOffset("abc_123", val - 1L),
-                    util.queryOffset("abc_123", val), util.queryOffset("abc_123", val + 1L), util.queryOffset("abc_123", val - 1L)));
+                    util.queryOffset("abc_123", val), util.queryOffset("abc_123", val + 1L),
+                    util.queryOffset("abc_123", val - 1L)));
         }
 
     }
diff --git a/src/test/java/org/bdware/analysis/dynamic/test/FieldSensitiveDynamicTaintAnalysisTest.java b/src/test/java/org/bdware/analysis/dynamic/test/FieldSensitiveDynamicTaintAnalysisTest.java
index ad987da..bbd16b5 100644
--- a/src/test/java/org/bdware/analysis/dynamic/test/FieldSensitiveDynamicTaintAnalysisTest.java
+++ b/src/test/java/org/bdware/analysis/dynamic/test/FieldSensitiveDynamicTaintAnalysisTest.java
@@ -12,8 +12,10 @@ 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";
+        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();
@@ -26,7 +28,8 @@ public class FieldSensitiveDynamicTaintAnalysisTest {
                 TaintCFG cfg = new TaintCFG(mn);
                 TracedFile tf = new TracedFile(new FileInputStream(tracePath));
                 TaintResult.printer.setLabelOrder(cfg.getLabelOrder());
-                FieldSensitiveDynamicTaintAnalysis analysis = new FieldSensitiveDynamicTaintAnalysis(cfg, tf);
+                FieldSensitiveDynamicTaintAnalysis analysis =
+                        new FieldSensitiveDynamicTaintAnalysis(cfg, tf);
                 analysis.analysis();
                 cfg.printSelf();
             }
diff --git a/src/test/java/org/bdware/analysis/dynamic/test/TracedFileTest.java b/src/test/java/org/bdware/analysis/dynamic/test/TracedFileTest.java
index 26b238d..a72a71a 100644
--- a/src/test/java/org/bdware/analysis/dynamic/test/TracedFileTest.java
+++ b/src/test/java/org/bdware/analysis/dynamic/test/TracedFileTest.java
@@ -11,6 +11,6 @@ public class TracedFileTest {
         String traceFile = "/Users/hulingxuan/git/SmartContract/output/main.trace";
         InputStream in = new FileInputStream(traceFile);
         TracedFile tf = new TracedFile(in);
-//	    tf.trans.add(Transaction);
+        // 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
index 9aac1b7..e2ecee4 100644
--- a/src/test/java/org/bdware/analysis/example/test/FieldSensitiveTaintAnalysisTest.java
+++ b/src/test/java/org/bdware/analysis/example/test/FieldSensitiveTaintAnalysisTest.java
@@ -11,7 +11,8 @@ 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 =
+                "./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));
diff --git a/src/test/java/org/bdware/analysis/test/CFGraphTest.java b/src/test/java/org/bdware/analysis/test/CFGraphTest.java
index ae1e85a..7602673 100644
--- a/src/test/java/org/bdware/analysis/test/CFGraphTest.java
+++ b/src/test/java/org/bdware/analysis/test/CFGraphTest.java
@@ -12,7 +12,8 @@ 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/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();
diff --git a/src/test/java/org/bdware/sc/AvatarHelperTest.java b/src/test/java/org/bdware/sc/AvatarHelperTest.java
index 0069814..1ba8514 100644
--- a/src/test/java/org/bdware/sc/AvatarHelperTest.java
+++ b/src/test/java/org/bdware/sc/AvatarHelperTest.java
@@ -11,8 +11,8 @@ public class AvatarHelperTest {
     @Test
     public void test() throws IOException {
         String random = "absadlkjdsalfkjdsalfd;fkldsajfas";
-        FileUtils.writeByteArrayToFile(
-                new File("./build/llllogo.png"), AvatarHelper.create(random));
+        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
index f8129a5..e34a6b9 100644
--- a/src/test/java/org/bdware/sc/LedgerUtilTest.java
+++ b/src/test/java/org/bdware/sc/LedgerUtilTest.java
@@ -5,16 +5,18 @@ 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);
+    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
index b2b637b..35cd680 100644
--- a/src/test/java/org/bdware/sc/SockGetTest.java
+++ b/src/test/java/org/bdware/sc/SockGetTest.java
@@ -5,12 +5,12 @@ import org.junit.Test;
 
 public class SockGetTest {
     @Test
-    public void test(){
-        SocketGet get = new SocketGet("127.0.0.1",18000);
+    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));
+        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
index da41204..43f91b5 100644
--- a/src/test/java/org/bdware/sc/bean/ContractRequestTest.java
+++ b/src/test/java/org/bdware/sc/bean/ContractRequestTest.java
@@ -11,9 +11,9 @@ public class ContractRequestTest {
         req.action = "main";
         req.setArg("arg1");
         String key =
-                "{\"privateKey\":\"589d94ee5688358a1c5c18430dd9c75097ddddebf769f139da36a807911d20f8\"," +
-                        "\"publicKey\":\"04d1924329f72ced148f6f333fb985ccbaa31b1e3aacf10be5f43d4a4ff5a" +
-                        "d88899a005e79e37fc06993e1d66ada8cf8b711cb36f59538bb7d3e39e70fa9360ddd\"}";
+                "{\"privateKey\":\"589d94ee5688358a1c5c18430dd9c75097ddddebf769f139da36a807911d20f8\","
+                        + "\"publicKey\":\"04d1924329f72ced148f6f333fb985ccbaa31b1e3aacf10be5f43d4a4ff5a"
+                        + "d88899a005e79e37fc06993e1d66ada8cf8b711cb36f59538bb7d3e39e70fa9360ddd\"}";
         SM2KeyPair pair = SM2KeyPair.fromJson(key);
         req.doSignature(pair);
         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
index 302d137..68d10ca 100644
--- a/src/test/java/org/bdware/sc/bean/test/EnumDecodeTest2.java
+++ b/src/test/java/org/bdware/sc/bean/test/EnumDecodeTest2.java
@@ -7,7 +7,7 @@ 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(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
index c874985..dfd3b6f 100644
--- a/src/test/java/org/bdware/sc/boundary/utils/SM2UtilTest.java
+++ b/src/test/java/org/bdware/sc/boundary/utils/SM2UtilTest.java
@@ -22,9 +22,10 @@ public class SM2UtilTest {
 
     @Test
     public void loadKey() throws Exception {
-        String keyStr = "{\"privateKey\": \"b4ab74a0d8691fc45fd214bdaf45b1dc6ac288a93d1518599fc824ab29310a1a\",\n" +
-                "  \"publicKey\": \"04fef570617a3a2dfba6a4dd25050919266735f683f69aee8df4cd600f34b7440a26e90af3b92b63bad7c013f32c2665599ddde33c87736efa667eb027cdd8572f\"\n" +
-                " }";
+        String keyStr =
+                "{\"privateKey\": \"b4ab74a0d8691fc45fd214bdaf45b1dc6ac288a93d1518599fc824ab29310a1a\",\n"
+                        + "  \"publicKey\": \"04fef570617a3a2dfba6a4dd25050919266735f683f69aee8df4cd600f34b7440a26e90af3b92b63bad7c013f32c2665599ddde33c87736efa667eb027cdd8572f\"\n"
+                        + " }";
         SM2KeyPair keyPair = SM2KeyPair.fromJson(keyStr);
         byte[] result = SM2Util.sign(keyPair.getPrivateKeyParameter(), "abc".getBytes());
         System.out.println(result.length);
@@ -32,15 +33,20 @@ public class SM2UtilTest {
 
     @Test
     public void verify2() {
-        String toVerify = "GeneralContract|plainTextTransmission|{\"ledger\":\"test\",\"data\":\"上链信息为json格式\"}|04398dfde44290595cd098cd2f904b36367c69f9011719d43fb0955f823cf1386764769bc7c0a5649dcb316d552998a5c106afd268d9db8b6482ce527544a7bd15";
-        String sign = "30440220137771d7505abde700c89cfa376f67c564dfdec6ffdb08cb08ff70544be6cb6f0220587296439bedf43f4b0bfec2d7030a8250d369e53af623e50a734e3b6cb780cb";
-        String pubkey = "04398dfde44290595cd098cd2f904b36367c69f9011719d43fb0955f823cf1386764769bc7c0a5649dcb316d552998a5c106afd268d9db8b6482ce527544a7bd15";
+        String toVerify =
+                "GeneralContract|plainTextTransmission|{\"ledger\":\"test\",\"data\":\"上链信息为json格式\"}|04398dfde44290595cd098cd2f904b36367c69f9011719d43fb0955f823cf1386764769bc7c0a5649dcb316d552998a5c106afd268d9db8b6482ce527544a7bd15";
+        String sign =
+                "30440220137771d7505abde700c89cfa376f67c564dfdec6ffdb08cb08ff70544be6cb6f0220587296439bedf43f4b0bfec2d7030a8250d369e53af623e50a734e3b6cb780cb";
+        String pubkey =
+                "04398dfde44290595cd098cd2f904b36367c69f9011719d43fb0955f823cf1386764769bc7c0a5649dcb316d552998a5c106afd268d9db8b6482ce527544a7bd15";
         ContractRequest cr = new ContractRequest();
         cr.setContractID("GeneralContract");
         cr.setAction("plainTextTransmission");
         cr.setArg("{\"ledger\":\"test\",\"data\":\"上链信息为json格式\"}");
-        cr.setPublicKey("04398dfde44290595cd098cd2f904b36367c69f9011719d43fb0955f823cf1386764769bc7c0a5649dcb316d552998a5c106afd268d9db8b6482ce527544a7bd15");
-        cr.setSignature("30440220137771d7505abde700c89cfa376f67c564dfdec6ffdb08cb08ff70544be6cb6f0220587296439bedf43f4b0bfec2d7030a8250d369e53af623e50a734e3b6cb780cb");
+        cr.setPublicKey(
+                "04398dfde44290595cd098cd2f904b36367c69f9011719d43fb0955f823cf1386764769bc7c0a5649dcb316d552998a5c106afd268d9db8b6482ce527544a7bd15");
+        cr.setSignature(
+                "30440220137771d7505abde700c89cfa376f67c564dfdec6ffdb08cb08ff70544be6cb6f0220587296439bedf43f4b0bfec2d7030a8250d369e53af623e50a734e3b6cb780cb");
 
         System.out.println(cr.verifySignature());
     }
@@ -51,12 +57,12 @@ public class SM2UtilTest {
                 "09146332716e7767327923056946406e49570e5909146332716e7767327923056946406e49570e59";
         byte[] bytes = ByteUtils.fromHexString(gstr);
         // String str = new BASE64Encoder().encode(bytes);
-        //   System.out.println(str);
+        // System.out.println(str);
     }
 
     @Test
     public void genKey() throws Exception {
-        //   SM2KeyPair pair = new SM2().generateKeyPair();
+        // SM2KeyPair pair = new SM2().generateKeyPair();
         AsymmetricCipherKeyPair keyy = SM2Util.generateKeyPairParameter();
         KeyPair key = SM2Util.generateKeyPair(null);
         BCECPrivateKey priKey = (BCECPrivateKey) key.getPrivate();
@@ -95,9 +101,8 @@ public class SM2UtilTest {
     public void boundrySign() throws Exception {
         String content = "hello";
 
-        BigInteger privKey =
-                new BigInteger(
-                        "b7e504cf951792554bf4a9874be37cb1279d38939444388e2046ee9603b4f0c4", 16);
+        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());
@@ -115,11 +120,8 @@ public class SM2UtilTest {
                 "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);
+        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);
     }
@@ -128,7 +130,8 @@ public class SM2UtilTest {
     public void encrypt() throws Exception {
         String pubkey =
                 "0417b2fd4174ca9dcc5c5fa315febc5ea2488676f746e127fafb50a3b4c31daad863994775cac6f6139f0d6400c94dbeeb11a6962eaf8176fced641d69b475d446";
-        String data = "dafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdf";
+        String data =
+                "dafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdfdafdsafasfasdf";
         byte[] data2 = SM2Util.encrypt(SM2KeyPair.publicKeyStr2ECPoint(pubkey), data.getBytes());
 
         System.out.println(ByteUtils.toHexString(data2));
@@ -142,51 +145,52 @@ public class SM2UtilTest {
 
     @Test
     public void dosignTest() throws Exception {
-        String tosign = "action=startContract&script=contract%20shortc%7B%0A%09export%20function%20main(arg)%7B%0A%09%09return%20arg.length%3B%09%0A%09%7D%0A%7D&pubKey=041a3875bb1a8d6acfc1142c60e3cc7c11831d4878c6dbbf9bb0929716d6cf402492b9629a4ced9198ae2c419f8d3d6ae810a431458d38901e5597636b715584d4";
-        // keyPair = SM2KeyPair.fromJson("{\"privateKey\":\"94728f3d95f19b3b5b11a31fdb603b5b2e8b377d9520d0680ac4f270cc82ec51\",\"publicKey\":\"041a3875bb1a8d6acfc1142c60e3cc7c11831d4878c6dbbf9bb0929716d6cf402492b9629a4ced9198ae2c419f8d3d6ae810a431458d38901e5597636b715584d4\"}");
-        keyPair = SM2KeyPair.fromJson("{\"privateKey\":\"589d94ee5688358a1c5c18430dd9c75097ddddebf769f139da36a807911d20f8\",\"publicKey\":\"04d1924329f72ced148f6f333fb985ccbaa31b1e3aacf10be5f43d4a4ff5ad88899a005e79e37fc06993e1d66ada8cf8b711cb36f59538bb7d3e39e70fa9360ddd\"}");
-        String signature = ByteUtils.toHexString(
-                SM2Util.sign(
-                        keyPair.getPrivateKeyParameter(), tosign.getBytes()));
+        String tosign =
+                "action=startContract&script=contract%20shortc%7B%0A%09export%20function%20main(arg)%7B%0A%09%09return%20arg.length%3B%09%0A%09%7D%0A%7D&pubKey=041a3875bb1a8d6acfc1142c60e3cc7c11831d4878c6dbbf9bb0929716d6cf402492b9629a4ced9198ae2c419f8d3d6ae810a431458d38901e5597636b715584d4";
+        // keyPair =
+        // SM2KeyPair.fromJson("{\"privateKey\":\"94728f3d95f19b3b5b11a31fdb603b5b2e8b377d9520d0680ac4f270cc82ec51\",\"publicKey\":\"041a3875bb1a8d6acfc1142c60e3cc7c11831d4878c6dbbf9bb0929716d6cf402492b9629a4ced9198ae2c419f8d3d6ae810a431458d38901e5597636b715584d4\"}");
+        keyPair = SM2KeyPair.fromJson(
+                "{\"privateKey\":\"589d94ee5688358a1c5c18430dd9c75097ddddebf769f139da36a807911d20f8\",\"publicKey\":\"04d1924329f72ced148f6f333fb985ccbaa31b1e3aacf10be5f43d4a4ff5ad88899a005e79e37fc06993e1d66ada8cf8b711cb36f59538bb7d3e39e70fa9360ddd\"}");
+        String signature = ByteUtils
+                .toHexString(SM2Util.sign(keyPair.getPrivateKeyParameter(), tosign.getBytes()));
         System.out.println(signature);
-        ECPublicKeyParameters pubKey =
-                BCECUtil.createECPublicKeyFromStrParameters(
-                        keyPair.getPublicKeyStr(), SM2Util.CURVE, SM2Util.DOMAIN_PARAMS);
-        boolean verify = SM2Util.verify(
-                pubKey, tosign.getBytes(), ByteUtils.fromHexString(signature));
+        ECPublicKeyParameters pubKey = BCECUtil.createECPublicKeyFromStrParameters(
+                keyPair.getPublicKeyStr(), SM2Util.CURVE, SM2Util.DOMAIN_PARAMS);
+        boolean verify =
+                SM2Util.verify(pubKey, tosign.getBytes(), ByteUtils.fromHexString(signature));
         System.out.println(verify);
 
 
     }
     // 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 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 =
+    // @Test
+    // public void verifyServerToServer() {
+    // String str =
     //
     // "d58ca7ade729ccaf36e8d2d22990a8e2e8d7242979e92c9d80d8abcf10924566,f3888664ed5e0fc850285b1c05f8c042497893a21939b64919dc861b382776a3";
-    //        SM2 sm2 = new SM2();
-    //        boolean ret =
-    //                sm2.verify("Hello", SM2.Signature.loadFromString(str), "",
+    // SM2 sm2 = new SM2();
+    // boolean ret =
+    // sm2.verify("Hello", SM2.Signature.loadFromString(str), "",
     // keyPair.getPublicKey());
-    //        System.out.println("[VerifyServer] " + ret);
-    //    }
+    // System.out.println("[VerifyServer] " + ret);
+    // }
     //
-    //    @Test
-    //    public void verifyClientToServer() {
-    //        String sig =
+    // @Test
+    // public void verifyClientToServer() {
+    // String sig =
     //
     // "11d9c57d8ff6db5a8662dd91540f60666c3fa50a5ef47c6529fef15e64485f155d8747455b97cff636282758aa00c5245f8de92fb4cbb280e7d9d23c1907892c";
-    //        SM2 sm2 = new SM2();
-    //        boolean ret =
-    //                sm2.verify("Hello", SM2.Signature.loadFromString(sig), "",
+    // SM2 sm2 = new SM2();
+    // boolean ret =
+    // sm2.verify("Hello", SM2.Signature.loadFromString(sig), "",
     // keyPair.getPublicKey());
-    //        System.out.println("[VerifyClientToServer] " + ret);
-    //    }
+    // System.out.println("[VerifyClientToServer] " + ret);
+    // }
 }
diff --git a/src/test/java/org/bdware/sc/db/MultiIndexTimeDBUtilTest.java b/src/test/java/org/bdware/sc/db/MultiIndexTimeDBUtilTest.java
index 0c19962..e9a2d76 100644
--- a/src/test/java/org/bdware/sc/db/MultiIndexTimeDBUtilTest.java
+++ b/src/test/java/org/bdware/sc/db/MultiIndexTimeDBUtilTest.java
@@ -20,12 +20,9 @@ public class MultiIndexTimeDBUtilTest {
         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)
+        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
index 11160cf..a9ff940 100644
--- a/src/test/java/org/bdware/sc/encrypt/test/HardwareInfoTest.java
+++ b/src/test/java/org/bdware/sc/encrypt/test/HardwareInfoTest.java
@@ -15,8 +15,8 @@ public class HardwareInfoTest {
         String key =
                 "OTIzNmUzMGNmOGI1ZjFkMDBjZjEyMWY4OThmM2ZmYTIwNjE2ODYxOWNiMDNhMTVlM2FiZTA0OThhNTlkZDg1MmRiMjA5Njc1NmM3ZDBhOWM3YTNkOTg2NWVlYzk2YzM1MmY0MDdkMGMyOTA4M2NkNDI4YmY1YjM5M2U5OTA1NWE0MzM0MTJhM2Y2ZDhkZWVmZDk4MmI4NmZiZTMyYjhlMGE3ZWFmZmE5ODM3M2E4ZTRmNTYyNDgxNTY0Yjk2ZjFkMTZiODk2MGRhZDAwMTNjZDYwOGZmOTcxNjdiOWI1MDU1MjJlMzk0ODhmODczNDJjNWUwOGRjZjFhZjFkYzBjODUxZjRlNDg2ZWIyOTM5NDI3MDc4MjA5NDg5ODliODVhZDNlOGJlNWJiYWEzZDUyMWU2MjdmZjE3NGY4Y2ZlZDk3NTY4OWNlNDEzOGYyMTgyOWIwMDVmMzE0YjM3MmNlZmFkZjBkNmUyOTY4ZGUzZmFlNGUxNTFkMWFmNWE4Mjc4ZjQ2MDI5ODBjY2JkMDM0ZDE0YWRjZDk1ZjI1MjY3NmRlODRjYzdkNzU5NGYyYTAxMTliYWJmYjgyMGRjMWNjZWZjNThjNWUwYWRjMDQyM2MzYzA1ODNhZTU1MWZlN2Y5YTYwYjkxZjg2YWViNDNlMzU0NzlhYWI5YmFjOTAwN2IsMTAwMDEsODg1Yjk1YWRlMDM4ZDY1NWZmZWJkNTkxYTExYjU0OTkwNmYyNzQ4NzkzNzQ0NDQ2YmJhM2MwNjc5Nzc0Yjg2Y2I1MWQxNDE0NTg2M2Q4YzQ4YjlmZWMwMzhjMDhkZWQ4NGVjM2U2OWFiMzlkOTIxNTBlMTczZjdkMDg2YWVlYjlmYTE4OTMxNWM0YmQwNjU0NGFkNjg1MjhmOTA5MTZhZmI1MGEwY2ZhNGFiNDRmOWI4ZjU4ZTNmZWM3OWJjNDBiMmRjODYxNzA0OTk5ZGJkZGRhMjMwYjJmN2VkYjhhZmQ3NjYxZDM1YzVmMzY2OTJhYzM1YmEyYTllNjc1NjlmNjNkMjIwZDdhMmI5MGRjYmU3ZTA4NWE0ODhjZDY0YzhhNTc0MjY1NDI5NzJjMGU0MGJjZmM3ZDc2N2U5ZDFiNDU1NDUwMTFjYzZjOWExNjExNGIzMGNkZjBmYmI1MzA5NzI5MzA3ZTM1NWI5NjBlMjRmMzg0NDUyM2JjOWYxZDk4YzE1Yzk0MGUwNmYyM2FiNDk4MzA0ZGIzODZjZDU2MmYwMThmN2Y5OGQ3MzQ0YWQyNjFkY2MzZWIzYjZmODQ0MThjZWZmNGE3ZTYyMDc2NjY5ZDdhMGUwNjgxYzlhZTRkMWZhOWViMmVjNjg3M2ZlMDY2Mzk4ZTAzOTlkMTk4ODE=";
         RSA rsa = RSA.generateFromBase64(key);
-        String data =
-                HardwareInfo.getCPUID() + "==" + (System.currentTimeMillis() + 365L * 50L * 24L * 3600L * 1000L);
+        String data = HardwareInfo.getCPUID() + "=="
+                + (System.currentTimeMillis() + 365L * 50L * 24L * 3600L * 1000L);
         byte[] bytes = data.getBytes();
         bytes = rsa.decode(bytes);
         // rsa = RSA.generateFromBase64(rsa.toBase64Pubkey());
diff --git a/src/test/java/org/bdware/sc/units/ByteArrayTest.java b/src/test/java/org/bdware/sc/units/ByteArrayTest.java
index 1759e52..48a50c6 100644
--- a/src/test/java/org/bdware/sc/units/ByteArrayTest.java
+++ b/src/test/java/org/bdware/sc/units/ByteArrayTest.java
@@ -1,6 +1,5 @@
 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;
@@ -22,7 +21,7 @@ public class ByteArrayTest {
 
     @Test
     public void hexStringToBase64() {
-        //http://59.110.125.211:21056/v0/ledgers/bdcontract/transaction?hash=pD587F%2F5R64efno9%2FbAiI%2FSv6BA%3D
+        // 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))));
     }
diff --git a/src/test/java/org/bdware/sc/util/UtilTest.java b/src/test/java/org/bdware/sc/util/UtilTest.java
index e1a8590..d920dbc 100644
--- a/src/test/java/org/bdware/sc/util/UtilTest.java
+++ b/src/test/java/org/bdware/sc/util/UtilTest.java
@@ -12,10 +12,11 @@ public class UtilTest {
         String dirPath = FileUtil.getDir(fullPath);
         Assert.assertEquals("123/", dirPath);
     }
+
     @Test
-    public void testJson(){
+    public void testJson() {
         JsonObject jo = new JsonObject();
-        jo.addProperty("dafa","123");
+        jo.addProperty("dafa", "123");
         System.out.println(jo.toString());
     }
 }
diff --git a/src/test/java/org/bdware/sc/util/versionUtiltest.java b/src/test/java/org/bdware/sc/util/versionUtiltest.java
index f85e75f..2b096f5 100644
--- a/src/test/java/org/bdware/sc/util/versionUtiltest.java
+++ b/src/test/java/org/bdware/sc/util/versionUtiltest.java
@@ -4,10 +4,10 @@ import org.junit.Test;
 
 public class versionUtiltest {
     @Test
-    public void test1(){
-        String v1="0.0.0";
-        String v2="0.0.1";
+    public void test1() {
+        String v1 = "0.0.0";
+        String v2 = "0.0.1";
 
-        System.out.println(VersionUtil.compareVersion(v1,v2));
+        System.out.println(VersionUtil.compareVersion(v1, v2));
     }
 }