#10 fixed thread unsafe behavior of JBBPExpressionEvaluator, minor refactoring

Author: raydac

README.md

@@ -17,7 +17,10 @@ For instance I have been very actively using the framework in [the ZX-Poly emula
 
 Change log
 ===========
-- **1.2.0**
+- **1.2.1-SNAPSHOT (Under development)**
+  - __Fixed issue [#10 "assertArrayLength throws exception in multi-thread"](https://github.com/raydac/java-binary-block-parser/issues/10), many thanks to @sky4star for the bug report.__
+
+- **1.2.0 (10-JUN-2015)**
   - Refactoring
   - Improved tree of JBBP exceptions
   - Fixed NPE in JBBPTextWriter for String field mapped to byte array 
@@ -28,15 +31,17 @@ Change log
   - Improved inside script compiler and interpreter to support future extensions.
   - Fixed expression evaluator to support single char field names in expressions.
   - Added support of expressions in extra field numeric data part (example bit:(field*2))
-- **1.1.0**
+
+- **1.1.0 (03-FEB-2015)**
   - Added support for mapped classes output into JBBPOut
   - Added JBBPTextWriter to log binary data as text with commentaries,tabs and separators
   - Fixed read byte counter, now it counts only fully processed bytes, if only several bits have been read from byte then the byte will not be counted until whole read
   - Fixed static fields including in mapping processes if class has marked by default Bin annotation
   - Added flag JBBPParser#FLAG_SKIP_REMAINING_FIELDS_IF_EOF to ignore remaining fields during parsing if EOF without exception
   - Added flag JBBPMapper#FLAG_IGNORE_MISSING_VALUES to ignore mapping for values which are not found in parsed source
   - Added new auxiliary methods in JBBPUtils 
-- **1.0**
+
+- **1.0 (08-AUG-2014)**
   - The Initial version 
 
 Maven dependency

src/main/java/com/igormaznitsa/jbbp/compiler/tokenizer/JBBPTokenizer.java

@@ -52,21 +52,21 @@ public final class JBBPTokenizer implements Iterable<JBBPToken>, Iterator<JBBPTo
   /**
    * Inside table to keep disabled names for fields.
    */
-  private static final Set<String> globalReservedTypeNames;
+  private static final Set<String> GLOBAL_RESERVED_TYPE_NAMES;
 
   static {
-    globalReservedTypeNames = new HashSet<String>();
-    globalReservedTypeNames.add("bit");
-    globalReservedTypeNames.add("bool");
-    globalReservedTypeNames.add("byte");
-    globalReservedTypeNames.add("ubyte");
-    globalReservedTypeNames.add("short");
-    globalReservedTypeNames.add("ushort");
-    globalReservedTypeNames.add("int");
-    globalReservedTypeNames.add("long");
-    globalReservedTypeNames.add("align");
-    globalReservedTypeNames.add("skip");
-    globalReservedTypeNames.add("$");
+    GLOBAL_RESERVED_TYPE_NAMES = new HashSet<String>();
+    GLOBAL_RESERVED_TYPE_NAMES.add("bit");
+    GLOBAL_RESERVED_TYPE_NAMES.add("bool");
+    GLOBAL_RESERVED_TYPE_NAMES.add("byte");
+    GLOBAL_RESERVED_TYPE_NAMES.add("ubyte");
+    GLOBAL_RESERVED_TYPE_NAMES.add("short");
+    GLOBAL_RESERVED_TYPE_NAMES.add("ushort");
+    GLOBAL_RESERVED_TYPE_NAMES.add("int");
+    GLOBAL_RESERVED_TYPE_NAMES.add("long");
+    GLOBAL_RESERVED_TYPE_NAMES.add("align");
+    GLOBAL_RESERVED_TYPE_NAMES.add("skip");
+    GLOBAL_RESERVED_TYPE_NAMES.add("$");
   }
 
   private final Matcher matcher;
@@ -94,9 +94,9 @@ public JBBPTokenizer(final String str, final JBBPCustomFieldTypeProcessor custom
     JBBPUtils.assertNotNull(str, "String must not be null");
 
     if (customFieldTypeProcessor == null){
-      this.reservedTypeNames = globalReservedTypeNames;
+      this.reservedTypeNames = GLOBAL_RESERVED_TYPE_NAMES;
     }else{
-      this.reservedTypeNames = new HashSet<String>(globalReservedTypeNames);
+      this.reservedTypeNames = new HashSet<String>(GLOBAL_RESERVED_TYPE_NAMES);
       for(final String customType : customFieldTypeProcessor.getCustomFieldTypes()){
         JBBPUtils.assertNotNull(customType, "Type must not be null");
         this.reservedTypeNames.add(customType);
@@ -246,7 +246,7 @@ else if ("<".equals(groupTypeByteOrder)) {
    * @return true if the name is global reserved one, false otherwise.
    */
   public static boolean isGlobalReservedName(final String name) {
-    return globalReservedTypeNames.contains(name);
+    return GLOBAL_RESERVED_TYPE_NAMES.contains(name);
   }
 
   /**

src/main/java/com/igormaznitsa/jbbp/compiler/varlen/JBBPEvaluatorFactory.java

@@ -25,18 +25,18 @@
  * @since 1.0
  */
 public final class JBBPEvaluatorFactory {
-  private static final JBBPEvaluatorFactory instance = new JBBPEvaluatorFactory();
+  private static final JBBPEvaluatorFactory INSTANCE = new JBBPEvaluatorFactory();
 
   private JBBPEvaluatorFactory(){
 
   }
 
   /**
    * Get an Instance of the factory.
-   * @return the factory instance.
+   * @return the factory INSTANCE.
    */
   public static JBBPEvaluatorFactory getInstance(){
-    return instance;
+    return INSTANCE;
   }
 
   /**