Merge branch 'master' of https://github.com/kaitai-io/kaitai_struct_j…

…ava_runtime

src/main/java/io/kaitai/struct/KaitaiStream.java

@@ -575,4 +575,30 @@ public ValidationNotEqualError(Object expected, Object actual, KaitaiStream io,
         protected Object expected;
         protected Object actual;
     }
+
+    public static class ValidationLessThanError extends ValidationFailedError {
+        public ValidationLessThanError(long min, long actual, KaitaiStream io, String srcPath) {
+            super("not in range, min " + min + ", but got " + actual, io, srcPath);
+        }
+
+        protected long min;
+        protected long actual;
+    }
+
+    public static class ValidationGreaterThanError extends ValidationFailedError {
+        public ValidationGreaterThanError(long max, long actual, KaitaiStream io, String srcPath) {
+            super("not in range, max " + max + ", but got " + actual, io, srcPath);
+        }
+
+        protected long max;
+        protected long actual;
+    }
+
+    public static class ValidationNotAnyOfError extends ValidationFailedError {
+        public ValidationNotAnyOfError(Object actual, KaitaiStream io, String srcPath) {
+            super("not any of the list, got " + actual, io, srcPath);
+        }
+
+        protected Object actual;
+    }
 }

src/main/java/io/kaitai/struct/annotations/Generated.java

@@ -0,0 +1,102 @@
+/**
+ * Copyright 2015-2020 Kaitai Project: MIT license
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.kaitai.struct.annotations;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation, that applied to Kaitai-generated classes. Visualizers can use that
+ * annotation to find classes, that contains generated stuff, that should be showed
+ * in visualization.
+ *
+ * @since 0.9
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface Generated {
+    /**
+     * Original identifier ({@code id} key) from {@code ksy} file.
+     *
+     * @return Identifier, that can differ from class name, if it clash with
+     *         Java reserved words. Can not be empty
+     */
+    String id();
+    /**
+     * Version of compiler, that generated this class.
+     *
+     * @return Version string in <a href="https://semver.org/">semver</a> format
+     */
+    String version();
+    /**
+     * Class compiled with support of position tracking. That means, that every class
+     * has following public fields (in that version of generator):
+     * <table>
+     * <tr><th>Type</th><th>Field</th><th>Description</th></tr>
+     * <tr><td>{@code Map<String, Integer>}</td><td>{@code _attrStart}</td>
+     *     <td>Start offset in the root stream, where {@link SeqItem an attribute} or
+     *         {@link Instance an instance} with specified name begins.
+     *         Used only for attributes/instances, that is not repeated</td>
+     * </tr>
+     * <tr><td>{@code Map<String, Integer>}</td><td>{@code _attrEnd}</td>
+     *     <td>Start offset in the root stream, where {@link SeqItem an attribute} or
+     *         {@link Instance an instance} with specified name ends (exclusive).
+     *         Used only for attributes/instances, that is not repeated</td>
+     * </tr>
+     * <tr><td>{@code Map<String, ? extends List<Integer>>}</td><td>{@code _arrStart}</td>
+     *     <td>List with start offset in the root stream, where each array element of
+     *         repeated {@link SeqItem attribute} or {@link Instance instance} with
+     *         specified name begins. Used only for attributes/instances, that is repeated</td>
+     * </tr>
+     * <tr><td>{@code Map<String, ? extends List<Integer>>}</td><td>{@code _arrEnd}</td>
+     *     <td>List with end offset (exclusive) in the root stream, where each array
+     *         element of repeated {@link SeqItem attribute} or {@link Instance instance}
+     *         with specified name ends. Used only for attributes/instances, that is repeated</td>
+     * </tr>
+     * </table>
+     *
+     * @return {@code true}, if position tracking is enabled and {@code false} otherwise
+     */
+    boolean posInfo();
+    /**
+     * Determines, if instantiation of user classes (related to user-types, defined
+     * in {@code ksy} file) automatically read its content from the stream, or that must
+     * be performed manually by calling generated {@code _read()}, {@code _readBE()}
+     * or {@code _readLE()} method.
+     *
+     * @return {@code true}, if generated {@code _read()} method invoked automatically
+     *         by class constructors and {@code false}, if it must be called explicitly
+     */
+    boolean autoRead();
+    /**
+     * Documentation string attached to the type definition, specified in {@code doc}
+     * KSY element.
+     *
+     * @return Documentation string for a type. If documentation is missed, returns empty string
+     */
+    String doc();
+}

src/main/java/io/kaitai/struct/annotations/Instance.java

@@ -0,0 +1,56 @@
+/**
+ * Copyright 2015-2020 Kaitai Project: MIT license
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.kaitai.struct.annotations;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation, that applied to fields, getters or setters that represents instance
+ * field from {@code instances} KSY element.
+ *
+ * @since 0.9
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.METHOD})
+public @interface Instance {
+    /**
+     * Original identifier ({@code id} key) from {@code ksy} file.
+     *
+     * @return Identifier, that can differ from instance name, if it clash with
+     *         Java reserved words. Can not be empty
+     */
+    String id();
+    /**
+     * Documentation string attached to the instance definition, specified in {@code doc}
+     * KSY element.
+     *
+     * @return Documentation string for an instance. If documentation is missed,
+     *         returns empty string
+     */
+    String doc();
+}

src/main/java/io/kaitai/struct/annotations/Parameter.java

@@ -0,0 +1,62 @@
+/**
+ * Copyright 2015-2020 Kaitai Project: MIT license
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.kaitai.struct.annotations;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation, that applied to fields, getters or setters that represents parameter
+ * from {@code params} KSY element.
+ *
+ * @since 0.9
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.METHOD})
+public @interface Parameter {
+    /**
+     * Original identifier ({@code id} key) from {@code ksy} file.
+     *
+     * @return Identifier, that can differ from parameter name, if it clash with
+     *         Java reserved words. Can not be empty
+     */
+    String id();
+    /**
+     * Index of a parameter in sequence of parameters in the type.
+     *
+     * @return 0-based index of a parameter in {@code params} KSY element
+     */
+    int index();
+    /**
+     * Documentation string attached to the parameter, specified in {@code doc}
+     * KSY element.
+     *
+     * @return Documentation string for parameter. If documentation is missed,
+     *         returns empty string
+     */
+    String doc();
+}

src/main/java/io/kaitai/struct/annotations/SeqItem.java

@@ -0,0 +1,62 @@
+/**
+ * Copyright 2015-2020 Kaitai Project: MIT license
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.kaitai.struct.annotations;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation, that applied to fields, getters or setters that represents an attribute
+ * from {@code seq} KSY element.
+ *
+ * @since 0.9
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.METHOD})
+public @interface SeqItem {
+    /**
+     * Original identifier ({@code id} key) from {@code ksy} file.
+     *
+     * @return Identifier, that can differ from field name, if it clash with
+     *         Java reserved words. Empty string, if attribute was unnamed
+     */
+    String id();
+    /**
+     * Index of an attribute in sequence of attributes in the type.
+     *
+     * @return 0-based index of an attribute in {@code seq} KSY element
+     */
+    int index();
+    /**
+     * Documentation string attached to the attribute, specified in {@code doc}
+     * KSY element.
+     *
+     * @return Documentation string for and attribute. If documentation is missed,
+     *         returns empty string
+     */
+    String doc();
+}