#776: Allow repeat-expr and repeat-until keys without a repeat key

Mingun · Mingun · commit 45a360424a04 · 2021-12-11T22:31:57.000+05:00
kaitai-io/kaitai_struct#776
diff --git a/formats/repeat_repeat-expr_only.ksy b/formats/repeat_repeat-expr_only.ksy
@@ -0,0 +1,6 @@
+meta:
+  id: repeat_expr_only
+seq:
+  - id: foo
+    type: u1
+    repeat-expr: 42
diff --git a/formats/repeat_repeat-until_only.ksy b/formats/repeat_repeat-until_only.ksy
@@ -0,0 +1,6 @@
+meta:
+  id: repeat_until_only
+seq:
+  - id: foo
+    type: u1
+    repeat-until: _ != 0
diff --git a/formats_err/repeat_bad_repeat-expr-and-until.ksy b/formats_err/repeat_bad_repeat-expr-and-until.ksy
@@ -0,0 +1,9 @@
+# repeat_bad_repeat-expr-and-until.ksy: /seq/0/repeat: error: expected eos / expr / until, got 'bad'
+meta:
+  id: repeat_bad_repeat_expr_and_until
+seq:
+  - id: foo
+    type: u1
+    repeat: bad
+    repeat-expr: 42
+    repeat-until: 'true'
diff --git a/formats_err/repeat_bad_repeat-expr.ksy b/formats_err/repeat_bad_repeat-expr.ksy
@@ -0,0 +1,8 @@
+# repeat_bad_repeat-expr.ksy: /seq/0/repeat: error: expected eos / expr / until, got 'bad'
+meta:
+  id: repeat_bad_repeat_expr
+seq:
+  - id: foo
+    type: u1
+    repeat: bad
+    repeat-expr: 42
diff --git a/formats_err/repeat_bad_repeat-until.ksy b/formats_err/repeat_bad_repeat-until.ksy
@@ -0,0 +1,8 @@
+# repeat_bad_repeat-until.ksy: /seq/0/repeat: error: expected eos / expr / until, got 'bad'
+meta:
+  id: repeat_bad_repeat_until
+seq:
+  - id: foo
+    type: u1
+    repeat: bad
+    repeat-until: 'true'
diff --git a/formats_err/repeat_eos_repeat-expr-and-until.ksy b/formats_err/repeat_eos_repeat-expr-and-until.ksy
@@ -0,0 +1,9 @@
+# repeat_eos_repeat-expr-and-until.ksy: /seq/0/repeat: error: either `repeat: eos`, or `repeat-expr`, or `repeat-until` must be specified
+meta:
+  id: repeat_eos_repeat_expr_and_until
+seq:
+  - id: foo
+    type: u1
+    repeat: eos
+    repeat-expr: 42
+    repeat-until: 'true'
diff --git a/formats_err/repeat_eos_repeat-expr.ksy b/formats_err/repeat_eos_repeat-expr.ksy
@@ -0,0 +1,8 @@
+# repeat_eos_repeat-expr.ksy: /seq/0/repeat: error: `repeat-expr` requires either a `repeat: expr` or absence of a `repeat` key
+meta:
+  id: repeat_eos_repeat_expr
+seq:
+  - id: foo
+    type: u1
+    repeat: eos
+    repeat-expr: 42
diff --git a/formats_err/repeat_eos_repeat-until.ksy b/formats_err/repeat_eos_repeat-until.ksy
@@ -0,0 +1,8 @@
+# repeat_eos_repeat-until.ksy: /seq/0/repeat: error: `repeat-until` requires either a `repeat: until` or absence of a `repeat` key
+meta:
+  id: repeat_eos_repeat_until
+seq:
+  - id: foo
+    type: u1
+    repeat: eos
+    repeat-until: 'true'
diff --git a/formats_err/repeat_expr.ksy b/formats_err/repeat_expr.ksy
@@ -0,0 +1,7 @@
+# repeat_expr.ksy: /seq/0/repeat: error: `repeat: expr` requires a `repeat-expr` key
+meta:
+  id: repeat_expr
+seq:
+  - id: foo
+    type: u1
+    repeat: expr
diff --git a/formats_err/repeat_expr_repeat-expr-and-until.ksy b/formats_err/repeat_expr_repeat-expr-and-until.ksy
@@ -0,0 +1,9 @@
+# repeat_expr_repeat-expr-and-until.ksy: /seq/0/repeat: error: either `repeat: eos`, or `repeat-expr`, or `repeat-until` must be specified
+meta:
+  id: repeat_expr_repeat_expr_and_until
+seq:
+  - id: foo
+    type: u1
+    repeat: expr
+    repeat-expr: 42
+    repeat-until: 'true'
diff --git a/formats_err/repeat_expr_repeat-until.ksy b/formats_err/repeat_expr_repeat-until.ksy
@@ -0,0 +1,8 @@
+# repeat_expr_repeat-until.ksy: /seq/0/repeat: error: `repeat-until` requires either a `repeat: until` or absence of a `repeat` key
+meta:
+  id: repeat_expr_repeat_until
+seq:
+  - id: foo
+    type: u1
+    repeat: expr
+    repeat-until: 'true'
diff --git a/formats_err/repeat_incompatible1.ksy b/formats_err/repeat_incompatible1.ksy
diff --git a/formats_err/repeat_incompatible2.ksy b/formats_err/repeat_incompatible2.ksy
diff --git a/formats_err/repeat_incompatible3.ksy b/formats_err/repeat_incompatible3.ksy
diff --git a/formats_err/repeat_until.ksy b/formats_err/repeat_until.ksy
@@ -0,0 +1,7 @@
+# repeat_until.ksy: /seq/0/repeat: error: `repeat: until` requires a `repeat-until` key
+meta:
+  id: repeat_until
+seq:
+  - id: foo
+    type: u1
+    repeat: until
diff --git a/formats_err/repeat_until_repeat-expr-and-until.ksy b/formats_err/repeat_until_repeat-expr-and-until.ksy
@@ -0,0 +1,9 @@
+# repeat_until_repeat-expr-and-until.ksy: /seq/0/repeat: error: either `repeat: eos`, or `repeat-expr`, or `repeat-until` must be specified
+meta:
+  id: repeat_until_repeat_expr_and_until
+seq:
+  - id: foo
+    type: u1
+    repeat: until
+    repeat-expr: 42
+    repeat-until: 'true'
diff --git a/formats_err/repeat_until_repeat-expr.ksy b/formats_err/repeat_until_repeat-expr.ksy
@@ -0,0 +1,8 @@
+# repeat_until_repeat-expr.ksy: /seq/0/repeat: error: `repeat-expr` requires either a `repeat: expr` or absence of a `repeat` key
+meta:
+  id: repeat_until_repeat_expr
+seq:
+  - id: foo
+    type: u1
+    repeat: until
+    repeat-expr: 42
diff --git a/formats_err/repeat_wo_expr.ksy b/formats_err/repeat_wo_expr.ksy
diff --git a/formats_err/repeat_wo_repeat.ksy b/formats_err/repeat_wo_repeat.ksy
diff --git a/formats_err/repeat_wo_until.ksy b/formats_err/repeat_wo_until.ksy
