From 904e0c52359e0051112b77b6da4232abc8b53ed4 Mon Sep 17 00:00:00 2001
From: Jari Vetoniemi <mailroxas@gmail.com>
Date: Wed, 26 Sep 2018 18:49:22 +0300
Subject: fixup spec files

---
 spec/ability.fspec | 7 ++-----
 spec/emz.fspec     | 2 +-
 spec/ftable.fspec  | 2 +-
 spec/name.fspec    | 2 +-
 spec/spell.fspec   | 2 +-
 spec/vtable.fspec  | 2 +-
 6 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'spec')

diff --git a/spec/ability.fspec b/spec/ability.fspec
index 67a9965..80a07fd 100644
--- a/spec/ability.fspec
+++ b/spec/ability.fspec
@@ -4,11 +4,8 @@ struct ability {
    u16 mp_cost;
    u16 unknown;
    u16 targets;
-   u8 name[32] | necoding('sjis') str; // The encoding actually depends on ROM region
+   u8 name[32] | encoding('sjis') str; // The encoding actually depends on ROM region
    u8 description[256] | encoding('sjis') str; // ^ Ditto, we can't express this (we need parser options)
    u8 padding[726] nul;
-};
-
-struct dat {
-   struct ability ability[$];
+   struct ability ability[until (false)];
 };
diff --git a/spec/emz.fspec b/spec/emz.fspec
index 9eb90a4..d96239e 100644
--- a/spec/emz.fspec
+++ b/spec/emz.fspec
@@ -3,5 +3,5 @@ struct emz {
    u32 unknown hex; // most likely redunancy check (crc32?)
    u32 size;
    u32 offset; // always 16?
-   u8 data[$] | compression('deflate', size) hex;
+   u8 data[until (false)] | compression('deflate', size) hex;
 };
diff --git a/spec/ftable.fspec b/spec/ftable.fspec
index c051a6a..10247a2 100644
--- a/spec/ftable.fspec
+++ b/spec/ftable.fspec
@@ -1,3 +1,3 @@
 struct ftable {
-   u16 id[$] hex;
+   u16 id[until (false)] hex;
 };
diff --git a/spec/name.fspec b/spec/name.fspec
index 491c8da..a725f09 100644
--- a/spec/name.fspec
+++ b/spec/name.fspec
@@ -4,5 +4,5 @@ struct name {
 };
 
 struct dat {
-   struct name name[$];
+   struct name name[until (false)];
 };
diff --git a/spec/spell.fspec b/spec/spell.fspec
index 8c9c894..e1c012a 100644
--- a/spec/spell.fspec
+++ b/spec/spell.fspec
@@ -18,5 +18,5 @@ struct spell {
 };
 
 struct dat {
-   struct spell spell[$];
+   struct spell spell[until (false)];
 };
diff --git a/spec/vtable.fspec b/spec/vtable.fspec
index a6be4eb..484a551 100644
--- a/spec/vtable.fspec
+++ b/spec/vtable.fspec
@@ -1,3 +1,3 @@
 struct vtable {
-   u8 exist[$] hex;
+   u8 exist[until (false)] hex;
 };
-- 
cgit v1.2.3