alex/sots-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

game/data: adapt to engine-parity parse API (items->key_quoted pairs; lenient unterminated quote)

Browse source
This commit is contained in:
alex 2026-09-07 22:01:25 -04:00
parent 4d5b573668
commit 4f0a9dbd82
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game/data/block.cpp
View file

@ -93,9 +93,7 @@ Block snapshot(const mars::parse::Node& node) {
b.attrs.push_back(std::move(a));
break;
}
case Entry::Kind::Item:
b.items.push_back(e.value);
break;
// (bare quoted items are now Pair entries with key_quoted; engine-parity change)
case Entry::Kind::Block: {
Block sub = snapshot(*e.block);
sub.name = e.key;

8
tests/game_data/test_weapon.cpp
View file

@ -155,9 +155,13 @@ TEST(weapon_no_block_is_fatal) {
}
TEST(weapon_syntax_error_is_fatal_and_recovery_is_reported) {
// Engine parity: an unterminated quote is NOT fatal -- the string runs to EOF (swallowing the
// '}') and EOF closes the block; the recovery is reported as a Syntax-kind problem.
auto bad = parse_weapon("weapon { name \"unterminated }");
CHECK(!bad.ok());
CHECK(bad.problems[0].kind == Problem::Kind::Syntax);
CHECK(bad.ok());
bool reported = false;
for (const auto& p : bad.problems) if (p.kind == Problem::Kind::Syntax) reported = true;
CHECK(reported);
auto rec = parse_weapon("weapon { name @W weaponclass bullet turretsize small turretclass standard\n"); // EOF closes
CHECK(rec.ok());
CHECK_EQ(rec.problems.size(), std::size_t{1});