added int8[] and int8[]s into BINFILE function

Author: raydac

README.md

@@ -14,7 +14,7 @@
   - MAVEN: added `ignoreMissingSources` boolean parameter, allows to skip preprocessing if source folders not found or not provided [#12](https://github.com/raydac/java-comment-preprocessor/issues/12)
   - MAVEN: added `skip` boolean parameter, it allows to skip execution, also it is possible to use `-Djcp.preprocess.skip=true` [#13](https://github.com/raydac/java-comment-preprocessor/issues/13)
   -  CORE: added function `BOOL is(STR,ANY)` to check existence of variable for its name and compare its value with etalon (through string conversion, it will ensure true for `true` and `"true"` case) [#10](https://github.com/raydac/java-comment-preprocessor/issues/10)
-  -  CORE: improved the BINFILE function to support byte arrays in Golang, added types `uint8[]` and  `uint8[]s`
+  -  CORE: improved the BINFILE function to support byte arrays in Golang, added types `uint8[]`, `uint8[]s`, `int8[]` and `int8[]s` (`s` means splitting to lines to avoid too long text line)
 
 - **6.1.0**
   - added `--es` option to enable spaces between comment chars and directives [#9](https://github.com/raydac/java-comment-preprocessor/issues/9), in ANT and MAVEN plugins it is boolean parameter named `allowWhitespace`, __NB! by default it is turned off for back compatibility!__

changelog.txt

@@ -4,7 +4,7 @@
  - MAVEN: added 'ignoreMissingSources' boolean parameter, allows to skip preprocessing if source folders not found or not provided #12
  - MAVEN: added 'skip'boolean parameter, it allows to skip execution, also it is possible to use `-Djcp.preprocess.skip=true` #13
  -  CORE: added function `BOOL is(STR,ANY)` to check existence of variable for its name and compare its value with etalon (through string conversion, it will ensure true for `true` and `"true"` case), #10
- -  CORE: improved the BINFILE function to support byte arrays in Golang, added types "uint8[]" and  "uint8[]s"
+ -  CORE: improved the BINFILE function to support byte arrays in Golang, added types `uint8[]`, `uint8[]s`, `int8[]` and `int8[]s` (`s` means splitting to lines to avoid too long text line)
 
 6.1.0 (03 jul 2016)
 - implemented request #9, added support of whitespace between directive and comment, in command line it is `--es` option and in MAVEN and ANT it is boolean parameter `allowWhitespace`, by default it is turned off

src/main/java/com/igormaznitsa/jcp/expression/functions/FunctionBINFILE.java

@@ -46,7 +46,9 @@ private enum Type {
     BYTEARRAY("byte[]"),
     BYTEARRAY_SPLITTED("byte[]s"),
     UINT8("uint8[]"),
-    UINT8_SPLITTED("uint8[]s");
+    UINT8_SPLITTED("uint8[]s"),
+    INT8("int8[]"),
+    INT8_SPLITTED("int8[]s");
 
     private final String name;
 
@@ -159,6 +161,14 @@ public Value executeStrStr(@Nonnull final PreprocessorContext context, @Nonnull
           result = convertToUINT8(theFile, 80, endOfLine);
         }
         break;
+        case INT8: {
+          result = convertToINT8(theFile, -1, endOfLine);
+        }
+        break;
+        case INT8_SPLITTED: {
+          result = convertToINT8(theFile, 80, endOfLine);
+        }
+        break;
         default:
           throw new Error("Unexpected type : " + type);
       }
@@ -195,6 +205,33 @@ private String convertToUINT8(@Nonnull final File file, final int lineLength, @N
     return result.toString();
   }
 
+  @Nonnull
+  private String convertToINT8(@Nonnull final File file, final int lineLength, @Nonnull final String endOfLine) throws IOException {
+    final StringBuilder result = new StringBuilder(512);
+    final byte[] array = FileUtils.readFileToByteArray(file);
+
+    int endLinePos = lineLength;
+
+    boolean addNextLine = false;
+
+    for (final byte b : array) {
+      if (addNextLine) {
+        addNextLine = false;
+        result.append(endOfLine);
+      }
+      if (result.length() > 0) {
+        result.append(',');
+      }
+      result.append(Integer.toString(b));
+      if (lineLength > 0 && result.length() >= endLinePos) {
+        addNextLine = true;
+        endLinePos = result.length() + lineLength;
+      }
+    }
+
+    return result.toString();
+  }
+
   @Nonnull
   private String convertToJBytes(@Nonnull final File file, final int lineLength, @Nonnull final String endOfLine) throws IOException {
     final StringBuilder result = new StringBuilder(512);

src/test/java/com/igormaznitsa/jcp/expression/functions/FunctionBINFILETest.java

@@ -66,7 +66,16 @@ public void testExecution_UINT8ArrayEncoding() throws Exception {
     final PreprocessorContext context = preparePreprocessorContext(getCurrentTestFolder());
     context.setLocalVariable("hello_world", Value.valueOf("Hello World!"));
     final Value result = Expression.evalExpression("binfile(\"./eval/TestBinLong.txt\",\"uint8[]\")", context);
-    assertEquals("72,101,108,108,111,32,80,114,101,112,114,111,99,101,115,115,111,114,33,32,105,116,32,105,115,32,118,101,114,121,32,118,101,114,121,32,118,101,114,121,32,108,111,110,103,32,108,105,110,101,32,116,111,32,102,105,108,108,32,116,104,101,32,102,105,108,101,33,32,115,111,109,101,116,105,109,101,32,105,116,32,105,115,32,117,115,101,102,117,108,32,102,111,114,32,116,101,115,116,115,33,10,97,108,115,32,73,32,100,101,99,105,100,101,100,32,116,111,32,97,100,100,32,111,110,101,32,109,111,114,101,32,108,105,110,101,46", result.asString().trim());
+    assertEquals("208,186,208,176,208,186,208,184,208,181,32,209,130,208,190,32,209,128,209,131,209,129,209,129,208,186,208,184,208,181,32,208,177,209,131,208,186,208,178,209,139,10,72,101,108,108,111,32,80,114,101,112,114,111,99,101,115,115,111,114,33,32,105,116,32,105,115,32,118,101,114,121,32,118,101,114,121,32,118,101,114,121,32,108,111,110,103,32,108,105,110,101,32,116,111,32,102,105,108,108,32,116,104,101,32,102,105,108,101,33,32,115,111,109,101,116,105,109,101,32,105,116,32,105,115,32,117,115,101,102,117,108,32,102,111,114,32,116,101,115,116,115,33,10,97,108,115,32,73,32,100,101,99,105,100,101,100,32,116,111,32,97,100,100,32,111,110,101,32,109,111,114,101,32,108,105,110,101,46", result.asString().trim());
+    assertDestinationFolderEmpty();
+  }
+
+  @Test
+  public void testExecution_INT8ArrayEncoding() throws Exception {
+    final PreprocessorContext context = preparePreprocessorContext(getCurrentTestFolder());
+    context.setLocalVariable("hello_world", Value.valueOf("Hello World!"));
+    final Value result = Expression.evalExpression("binfile(\"./eval/TestBinLong.txt\",\"int8[]\")", context);
+    assertEquals("-48,-70,-48,-80,-48,-70,-48,-72,-48,-75,32,-47,-126,-48,-66,32,-47,-128,-47,-125,-47,-127,-47,-127,-48,-70,-48,-72,-48,-75,32,-48,-79,-47,-125,-48,-70,-48,-78,-47,-117,10,72,101,108,108,111,32,80,114,101,112,114,111,99,101,115,115,111,114,33,32,105,116,32,105,115,32,118,101,114,121,32,118,101,114,121,32,118,101,114,121,32,108,111,110,103,32,108,105,110,101,32,116,111,32,102,105,108,108,32,116,104,101,32,102,105,108,101,33,32,115,111,109,101,116,105,109,101,32,105,116,32,105,115,32,117,115,101,102,117,108,32,102,111,114,32,116,101,115,116,115,33,10,97,108,115,32,73,32,100,101,99,105,100,101,100,32,116,111,32,97,100,100,32,111,110,101,32,109,111,114,101,32,108,105,110,101,46", result.asString().trim());
     assertDestinationFolderEmpty();
   }
 
@@ -76,13 +85,33 @@ public void testExecution_UINT8ArrayEncodingSplitted() throws Exception {
     context.setLocalVariable("hello_world", Value.valueOf("Hello World!"));
     final Value result = Expression.evalExpression("binfile(\"./eval/TestBinLong.txt\",\"uint8[]s\")", context);
     final String eof = System.getProperty("line.separator");
-    assertEquals("72,101,108,108,111,32,80,114,101,112,114,111,99,101,115,115,111,114,33,32,105,116" + eof
-        + ",32,105,115,32,118,101,114,121,32,118,101,114,121,32,118,101,114,121,32,108,111" + eof
-        + ",110,103,32,108,105,110,101,32,116,111,32,102,105,108,108,32,116,104,101,32,102" + eof
-        + ",105,108,101,33,32,115,111,109,101,116,105,109,101,32,105,116,32,105,115,32,117" + eof
-        + ",115,101,102,117,108,32,102,111,114,32,116,101,115,116,115,33,10,97,108,115,32,73" + eof
-        + ",32,100,101,99,105,100,101,100,32,116,111,32,97,100,100,32,111,110,101,32,109,111" + eof
-        + ",114,101,32,108,105,110,101,46", result.asString().trim());
+    assertEquals("208,186,208,176,208,186,208,184,208,181,32,209,130,208,190,32,209,128,209,131,209" + eof
+        + ",129,209,129,208,186,208,184,208,181,32,208,177,209,131,208,186,208,178,209,139" + eof
+        + ",10,72,101,108,108,111,32,80,114,101,112,114,111,99,101,115,115,111,114,33,32,105" + eof
+        + ",116,32,105,115,32,118,101,114,121,32,118,101,114,121,32,118,101,114,121,32,108" + eof
+        + ",111,110,103,32,108,105,110,101,32,116,111,32,102,105,108,108,32,116,104,101,32" + eof
+        + ",102,105,108,101,33,32,115,111,109,101,116,105,109,101,32,105,116,32,105,115,32" + eof
+        + ",117,115,101,102,117,108,32,102,111,114,32,116,101,115,116,115,33,10,97,108,115" + eof
+        + ",32,73,32,100,101,99,105,100,101,100,32,116,111,32,97,100,100,32,111,110,101,32" + eof
+        + ",109,111,114,101,32,108,105,110,101,46", result.asString().trim());
+    assertDestinationFolderEmpty();
+  }
+
+  @Test
+  public void testExecution_INT8ArrayEncodingSplitted() throws Exception {
+    final PreprocessorContext context = preparePreprocessorContext(getCurrentTestFolder());
+    context.setLocalVariable("hello_world", Value.valueOf("Hello World!"));
+    final Value result = Expression.evalExpression("binfile(\"./eval/TestBinLong.txt\",\"int8[]s\")", context);
+    final String eof = System.getProperty("line.separator");
+    assertEquals("-48,-70,-48,-80,-48,-70,-48,-72,-48,-75,32,-47,-126,-48,-66,32,-47,-128,-47,-125" + eof
+        + ",-47,-127,-47,-127,-48,-70,-48,-72,-48,-75,32,-48,-79,-47,-125,-48,-70,-48,-78,-47" + eof
+        + ",-117,10,72,101,108,108,111,32,80,114,101,112,114,111,99,101,115,115,111,114,33" + eof
+        + ",32,105,116,32,105,115,32,118,101,114,121,32,118,101,114,121,32,118,101,114,121" + eof
+        + ",32,108,111,110,103,32,108,105,110,101,32,116,111,32,102,105,108,108,32,116,104" + eof
+        + ",101,32,102,105,108,101,33,32,115,111,109,101,116,105,109,101,32,105,116,32,105" + eof
+        + ",115,32,117,115,101,102,117,108,32,102,111,114,32,116,101,115,116,115,33,10,97,108" + eof
+        + ",115,32,73,32,100,101,99,105,100,101,100,32,116,111,32,97,100,100,32,111,110,101" + eof
+        + ",32,109,111,114,101,32,108,105,110,101,46", result.asString().trim());
     assertDestinationFolderEmpty();
   }
 

src/test/resources/com/igormaznitsa/jcp/expression/functions/eval/TestBinLong.txt

@@ -1,2 +1,3 @@
+какие то русские буквы
 Hello Preprocessor! it is very very very long line to fill the file! sometime it is useful for tests!
 als I decided to add one more line.