From 1853e964e96c41e762ca0ab97259ee4e79d86ec7 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Mon, 3 Nov 2014 13:35:54 -0800 Subject: Use the new ASTs --- Makefile.in | 15 +- src/ast/fwd.hpp | 12 + src/ast/item.cpp | 27 +- src/ast/item.hpp | 24 +- src/ast/item_test.cpp | 16 +- src/ast/npc.cpp | 260 ++++++++----- src/ast/npc.hpp | 69 ++-- src/ast/npc_test.cpp | 214 ++++++----- src/ast/script.hpp | 4 + src/compat/result.hpp | 16 + src/io/read.cpp | 5 +- src/main-gdb-head.py | 18 +- src/map/atcommand.cpp | 20 +- src/map/fwd.hpp | 1 + src/map/itemdb.cpp | 132 +++---- src/map/magic-v2.cpp | 17 +- src/map/map.cpp | 4 +- src/map/npc-parse.cpp | 977 +++++++++++++++++++++++++---------------------- src/map/npc-parse.hpp | 2 +- src/map/script-parse.cpp | 6 +- src/map/script-parse.hpp | 2 +- src/strings/rstring.cpp | 2 +- src/strings/rstring.hpp | 2 +- 23 files changed, 1020 insertions(+), 825 deletions(-) diff --git a/Makefile.in b/Makefile.in index 9be1ad9..8254bc2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -474,8 +474,8 @@ lib/%.${SO_LONG}-gdb.py: lib/%.${SO_LONG}: lib/%.${SO_LONG}-gdb.py $(MKDIR_FIRST) $l ${CXX} -shared -Wl,-soname=$*.${SO_SHORT} ${LDFLAGS} $(filter-out lib/%-gdb.py,$^) ${LDLIBS} -o $@ - $c ln -sf $*.${SO_LONG} lib/$*.${SO_SHORT} - $c ln -sf $*.${SO_SHORT} lib/$*.so + $c ln -sfT $*.${SO_LONG} lib/$*.${SO_SHORT} + $c ln -sfT $*.${SO_SHORT} lib/$*.so lib/%.a: $(MKDIR_FIRST) rm -f $@ @@ -510,9 +510,14 @@ test-gtest: $(patsubst bin/tests/%,stamp/run-%.stamp,${GTEST_BINARIES}) test: test-dtest test-dtest: $(patsubst bin/tests/%,stamp/run-%.stamp,${DTEST_BINARIES}) +$(patsubst bin/tests/%,stamp/run-%.stamp,${TEST_BINARIES} ${GTEST_BINARIES} ${DTEST_BINARIES}): stamp/symlink-test-lib-dir.stamp +stamp/symlink-test-lib-dir.stamp: + @mkdir -p bin + ln -sfT ../lib bin/lib + touch $@ + stamp/run-%.stamp: bin/tests/% $(MKDIR_FIRST) - ln -sf ../lib bin/lib ${TESTER} $< ${TEST_ARGS} touch $@ @@ -566,8 +571,8 @@ ifeq (${ENABLE_SHARED},yes) ${install_data} -t ${DESTDIR}${LIBDIR} \ $(patsubst %.so,%.${SO_LONG},${LIBRARIES}) for lib in $(patsubst lib/%.so,%,${LIBRARIES}); do \ - ln -sf $$lib.${SO_LONG} ${DESTDIR}${LIBDIR}/$$lib.${SO_SHORT}; \ - ln -sf $$lib.${SO_SHORT} ${DESTDIR}${LIBDIR}/$$lib.so; \ + ln -sfT $$lib.${SO_LONG} ${DESTDIR}${LIBDIR}/$$lib.${SO_SHORT}; \ + ln -sfT $$lib.${SO_SHORT} ${DESTDIR}${LIBDIR}/$$lib.so; \ done else ${install_data} -t ${DESTDIR}${LIBDIR} \ diff --git a/src/ast/fwd.hpp b/src/ast/fwd.hpp index 4ab4490..24bf545 100644 --- a/src/ast/fwd.hpp +++ b/src/ast/fwd.hpp @@ -23,11 +23,23 @@ #include "../compat/fwd.hpp" // rank 2 #include "../io/fwd.hpp" // rank 4 #include "../net/fwd.hpp" // rank 5 +#include "../sexpr/fwd.hpp" // rank 5 #include "../mmo/fwd.hpp" // rank 6 #include "../high/fwd.hpp" // rank 9 // ast/fwd.hpp is rank 10 namespace tmwa { +namespace ast +{ +namespace npc +{ +class Warp; +} // namespace npc +namespace script +{ +class ScriptBody; +} // namespace script +} // namespace ast // meh, add more when I feel like it } // namespace tmwa diff --git a/src/ast/item.cpp b/src/ast/item.cpp index 99417d8..bd4f295 100644 --- a/src/ast/item.cpp +++ b/src/ast/item.cpp @@ -18,8 +18,6 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "../compat/memory.hpp" - #include "../io/extract.hpp" #include "../io/line.hpp" @@ -36,9 +34,6 @@ namespace item { using io::respan; - // separate file because virtual - ItemOrComment::~ItemOrComment() {} - static void skip_comma_space(io::LineCharReader& lr) { @@ -107,6 +102,7 @@ namespace item opt.implicit_start = true; opt.implicit_end = true; opt.one_line = true; + opt.no_event = true; auto rv = ast::script::parse_script_body(lr, opt); if (rv.get_success().is_some()) { @@ -115,20 +111,19 @@ namespace item return rv; } -#define SPAN_EXTRACT(bitexpr, var) ({ auto bit = bitexpr; if (!extract(bit.data, &var.data)) return Err(bit.span.error_str("failed to extract"_s #var)); var.span = bit.span; }) +#define SPAN_EXTRACT(bitexpr, var) ({ auto bit = bitexpr; if (!extract(bit.data, &var.data)) return Err(bit.span.error_str("failed to extract "_s #var)); var.span = bit.span; }) #define EOL_ERROR(lr) ({ io::LineChar c; lr.get(c) ? Err(c.error_str("unexpected EOL"_s)) : Err("unexpected EOF before unexpected EOL"_s); }) - Result> parse_item(io::LineCharReader& lr) + Option> parse_item(io::LineCharReader& lr) { - std::unique_ptr rv = nullptr; - Spanned first = TRY_UNWRAP(lex_nonscript(lr, true), return Ok(std::move(rv))); + Spanned first = TRY_UNWRAP(lex_nonscript(lr, true), return None); if (first.data.startswith("//"_s)) { Comment comment; - comment.span = first.span; comment.comment = first.data; - rv = make_unique(std::move(comment)); - return Ok(std::move(rv)); + ItemOrComment rv = std::move(comment); + rv.span = first.span; + return Some(Ok(std::move(rv))); } Item item; SPAN_EXTRACT(first, item.id); @@ -150,10 +145,10 @@ namespace item SPAN_EXTRACT(TRY_UNWRAP(lex_nonscript(lr, false), return EOL_ERROR(lr)), item.view); item.use_script = TRY(lex_script(lr)); item.equip_script = TRY(lex_script(lr)); - item.span.begin = item.id.span.begin; - item.span.end = item.equip_script.span.end; - rv = make_unique(std::move(item)); - return Ok(std::move(rv)); + ItemOrComment rv = std::move(item); + rv.span.begin = item.id.span.begin; + rv.span.end = item.equip_script.span.end; + return Some(Ok(std::move(rv))); } } // namespace item } // namespace ast diff --git a/src/ast/item.hpp b/src/ast/item.hpp index b54e55c..a8fe908 100644 --- a/src/ast/item.hpp +++ b/src/ast/item.hpp @@ -20,12 +20,12 @@ #include "fwd.hpp" -#include - #include "../compat/result.hpp" #include "../io/span.hpp" +#include "../sexpr/variant.hpp" + #include "../mmo/clif.t.hpp" #include "../mmo/ids.hpp" #include "../mmo/strs.hpp" @@ -41,17 +41,11 @@ namespace item { using io::Spanned; - struct ItemOrComment - { - io::LineSpan span; - - virtual ~ItemOrComment(); - }; - struct Comment : ItemOrComment + struct Comment { RString comment; }; - struct Item : ItemOrComment + struct Item { Spanned id; Spanned name; @@ -74,7 +68,15 @@ namespace item ast::script::ScriptBody equip_script; }; - Result> parse_item(io::LineCharReader& lr); + using ItemOrCommentBase = Variant; + struct ItemOrComment : ItemOrCommentBase + { + ItemOrComment(Comment o) : ItemOrCommentBase(std::move(o)) {} + ItemOrComment(Item o) : ItemOrCommentBase(std::move(o)) {} + io::LineSpan span; + }; + + Option> parse_item(io::LineCharReader& lr); } // namespace item } // namespace ast } // namespace tmwa diff --git a/src/ast/item_test.cpp b/src/ast/item_test.cpp index 3b5fd07..a77662e 100644 --- a/src/ast/item_test.cpp +++ b/src/ast/item_test.cpp @@ -24,7 +24,7 @@ #include "../tests/fdhack.hpp" -//#include "../poison.hpp" +#include "../poison.hpp" namespace tmwa @@ -54,7 +54,7 @@ namespace item { io::LineCharReader lr(io::from_string, ""_s, input); auto res = parse_item(lr); - EXPECT_EQ(res.get_success(), Some(std::unique_ptr(nullptr))); + EXPECT_TRUE(res.is_none()); } } TEST(itemast, comment) @@ -70,11 +70,11 @@ namespace item for (auto input : inputs) { io::LineCharReader lr(io::from_string, ""_s, input); - auto res = parse_item(lr); + auto res = TRY_UNWRAP(parse_item(lr), FAIL()); EXPECT_TRUE(res.get_success().is_some()); auto top = TRY_UNWRAP(std::move(res.get_success()), FAIL()); - EXPECT_SPAN(top->span, 1,1, 1,8); - auto p = dynamic_cast(top.get()); + EXPECT_SPAN(top.span, 1,1, 1,8); + auto p = top.get_if(); EXPECT_TRUE(p); if (p) { @@ -96,11 +96,11 @@ namespace item for (auto input : inputs) { io::LineCharReader lr(io::from_string, ""_s, input); - auto res = parse_item(lr); + auto res = TRY_UNWRAP(parse_item(lr), FAIL()); EXPECT_TRUE(res.get_success().is_some()); auto top = TRY_UNWRAP(std::move(res.get_success()), FAIL()); - EXPECT_SPAN(top->span, 1,1, 1,58); - auto p = dynamic_cast(top.get()); + EXPECT_SPAN(top.span, 1,1, 1,58); + auto p = top.get_if(); EXPECT_TRUE(p); if (p) { diff --git a/src/ast/npc.cpp b/src/ast/npc.cpp index ceb381d..6b75503 100644 --- a/src/ast/npc.cpp +++ b/src/ast/npc.cpp @@ -18,8 +18,6 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "../compat/memory.hpp" - #include "../io/cxxstdio.hpp" #include "../io/extract.hpp" #include "../io/line.hpp" @@ -39,10 +37,7 @@ namespace npc { using io::respan; - // separate file because virtual - TopLevel::~TopLevel() {} - -#define TRY_EXTRACT(bit, var) ({ if (!extract(bit.data, &var.data)) return Err(bit.span.error_str("failed to extract"_s #var)); var.span = bit.span; }) +#define TRY_EXTRACT(bit, var) ({ if (!extract(bit.data, &var.data)) return Err(bit.span.error_str("failed to extract "_s #var)); var.span = bit.span; }) static Result parse_warp(io::LineSpan span, std::vector>>>& bits) @@ -53,28 +48,33 @@ namespace npc } if (bits[0].data.size() != 3) { - return Err(bits[0].span.error_str("expect 3 ,component,s"_s)); + return Err(bits[0].span.error_str("in |component 1| expect 3 ,component,s"_s)); } assert(bits[1].data.size() == 1); assert(bits[1].data[0].data == "warp"_s); if (bits[2].data.size() != 1) { - return Err(bits[2].span.error_str("expect 1 ,component,s"_s)); + return Err(bits[2].span.error_str("in |component 3| expect 1 ,component,s"_s)); } if (bits[3].data.size() != 5) { - return Err(bits[3].span.error_str("expect 5 ,component,s"_s)); + return Err(bits[3].span.error_str("in |component 4| expect 5 ,component,s"_s)); } Warp warp; - warp.span = span; TRY_EXTRACT(bits[0].data[0], warp.m); TRY_EXTRACT(bits[0].data[1], warp.x); TRY_EXTRACT(bits[0].data[2], warp.y); warp.key_span = bits[1].data[0].span; TRY_EXTRACT(bits[2].data[0], warp.name); + if (bits[3].data[0].data == "-1"_s) + bits[3].data[0].data = "4294967295"_s; TRY_EXTRACT(bits[3].data[0], warp.xs); + warp.xs.data += 2; + if (bits[3].data[1].data == "-1"_s) + bits[3].data[1].data = "4294967295"_s; TRY_EXTRACT(bits[3].data[1], warp.ys); + warp.ys.data += 2; TRY_EXTRACT(bits[3].data[2], warp.to_m); TRY_EXTRACT(bits[3].data[3], warp.to_x); TRY_EXTRACT(bits[3].data[4], warp.to_y); @@ -89,21 +89,20 @@ namespace npc } if (bits[0].data.size() != 4) { - return Err(bits[0].span.error_str("expect 4 ,component,s"_s)); + return Err(bits[0].span.error_str("in |component 1| expect 4 ,component,s"_s)); } assert(bits[1].data.size() == 1); assert(bits[1].data[0].data == "shop"_s); if (bits[2].data.size() != 1) { - return Err(bits[2].span.error_str("expect 1 ,component,s"_s)); + return Err(bits[2].span.error_str("in |component 3| expect 1 ,component,s"_s)); } if (bits[3].data.size() < 2) { - return Err(bits[3].span.error_str("expect at least 2 ,component,s"_s)); + return Err(bits[3].span.error_str("in |component 4| expect at least 2 ,component,s"_s)); } Shop shop; - shop.span = span; TRY_EXTRACT(bits[0].data[0], shop.m); TRY_EXTRACT(bits[0].data[1], shop.x); TRY_EXTRACT(bits[0].data[2], shop.y); @@ -121,8 +120,8 @@ namespace npc assert(data.span.begin.line == data.span.end.line); item.span = data.span; - XString name; - if (!extract(data.data, record<':'>(&name, &item.data.value.data))) + XString name, value; + if (!extract(data.data, record<':'>(&name, &value))) return Err(data.span.error_str("Failed to split item:value"_s)); item.data.name.span = item.span; item.data.name.span.end.column = item.data.name.span.begin.column + name.size() - 1; @@ -138,7 +137,22 @@ namespace npc item.data.name.span.warning("Shop item is an id; should be a name"_s); } if (!extract(name, &item.data.name.data)) - return Err("item name problem (too long?)"_s); + { + return Err(item.data.name.span.error_str("item name problem (too long?)"_s)); + } + if (value.startswith('-')) + { + item.data.value.span.begin.warning("Shop value multiplier should use '*' instead of '-' now"_s); + value = value.xslice_t(1); + } + else if (value.startswith('*')) + { + value = value.xslice_t(1); + } + if (!extract(value, &item.data.value.data)) + { + return Err(item.data.value.span.error_str("invalid item value"_s)); + } } return Ok(std::move(shop)); } @@ -151,21 +165,20 @@ namespace npc } if (bits[0].data.size() != 3 && bits[0].data.size() != 5) { - return Err(bits[0].span.error_str("expect 3 or 5 ,component,s"_s)); + return Err(bits[0].span.error_str("in |component 1| expect 3 or 5 ,component,s"_s)); } assert(bits[1].data.size() == 1); assert(bits[1].data[0].data == "monster"_s); if (bits[2].data.size() != 1) { - return Err(bits[2].span.error_str("expect 1 ,component,s"_s)); + return Err(bits[2].span.error_str("in |component 3| expect 1 ,component,s"_s)); } if (bits[3].data.size() != 2 && bits[3].data.size() != 4 && bits[3].data.size() != 5) { - return Err(bits[3].span.error_str("expect 2, 4, or 5 ,component,s"_s)); + return Err(bits[3].span.error_str("in |component 4| expect 2, 4, or 5 ,component,s"_s)); } Monster mob; - mob.span = span; TRY_EXTRACT(bits[0].data[0], mob.m); TRY_EXTRACT(bits[0].data[1], mob.x); TRY_EXTRACT(bits[0].data[2], mob.y); @@ -231,42 +244,39 @@ namespace npc } if (bits[0].data.size() != 1) { - return Err(bits[0].span.error_str("expect 1 ,component,s"_s)); + return Err(bits[0].span.error_str("in |component 1| expect 1 ,component,s"_s)); } assert(bits[1].data.size() == 1); assert(bits[1].data[0].data == "mapflag"_s); if (bits[2].data.size() != 1) { - return Err(bits[2].span.error_str("expect 1 ,component,s"_s)); - } - if (bits.size() >= 4) - { - if (bits[3].data.size() != 1) - { - return Err(bits[3].span.error_str("expect 1 ,component,s"_s)); - } + return Err(bits[2].span.error_str("in |component 3| expect 1 ,component,s"_s)); } MapFlag mapflag; - mapflag.span = span; TRY_EXTRACT(bits[0].data[0], mapflag.m); mapflag.key_span = bits[1].data[0].span; TRY_EXTRACT(bits[2].data[0], mapflag.name); if (bits.size() >= 4) { - TRY_EXTRACT(bits[3].data[0], mapflag.opt_extra); + mapflag.vec_extra.span = bits[3].span; + for (auto& bit : bits[3].data) + { + mapflag.vec_extra.data.emplace_back(); + TRY_EXTRACT(bit, mapflag.vec_extra.data.back()); + } } else { - mapflag.opt_extra.data = ""_s; - mapflag.opt_extra.span = bits[2].span; - mapflag.opt_extra.span.end.column++; - mapflag.opt_extra.span.begin.column = mapflag.opt_extra.span.end.column; + mapflag.vec_extra.data = {}; + mapflag.vec_extra.span = bits[2].span; + mapflag.vec_extra.span.end.column++; + mapflag.vec_extra.span.begin.column = mapflag.vec_extra.span.end.column; } return Ok(std::move(mapflag)); } static - Result parse_script_function(io::LineSpan span, std::vector>>>& bits, io::LineCharReader& lr) + Result parse_script_function_head(io::LineSpan span, std::vector>>>& bits) { // ScriptFunction: function|script|Fun Name{code} if (bits.size() != 3) @@ -279,23 +289,17 @@ namespace npc assert(bits[1].data[0].data == "script"_s); if (bits[2].data.size() != 1) { - return Err(bits[2].span.error_str("expect 1 ,component,s"_s)); + return Err(bits[2].span.error_str("in |component 3| expect 1 ,component,s"_s)); } ScriptFunction script_function; - script_function.span = span; script_function.key1_span = bits[0].data[0].span; - script_function.key_span = bits[1].data[0].span; TRY_EXTRACT(bits[2].data[0], script_function.name); - // also expect '{' and parse real script - ast::script::ScriptOptions opt; - opt.implicit_start = true; - opt.default_label = "OnCall"_s; - script_function.body = TRY(ast::script::parse_script_body(lr, opt)); + // also expect '{' and parse real script (in caller) return Ok(std::move(script_function)); } static - Result parse_script_none(io::LineSpan span, std::vector>>>& bits, io::LineCharReader& lr) + Result parse_script_none_head(io::LineSpan span, std::vector>>>& bits) { // ScriptNone: -|script|script name|-1{code} if (bits.size() != 4) @@ -308,29 +312,23 @@ namespace npc assert(bits[1].data[0].data == "script"_s); if (bits[2].data.size() != 1) { - return Err(bits[2].span.error_str("expect 1 ,component,s"_s)); + return Err(bits[2].span.error_str("in |component 3| expect 1 ,component,s"_s)); } assert(bits[3].data[0].data == "-1"_s); if (bits[3].data.size() != 1) { - return Err(bits[2].span.error_str("last |component| should be just -1"_s)); + return Err(bits[3].span.error_str("in |component 4| should be just -1"_s)); } ScriptNone script_none; - script_none.span = span; script_none.key1_span = bits[0].data[0].span; - script_none.key_span = bits[1].data[0].span; TRY_EXTRACT(bits[2].data[0], script_none.name); script_none.key4_span = bits[3].data[0].span; - // also expect '{' and parse real script - ast::script::ScriptOptions opt; - opt.implicit_start = true; - opt.no_start = true; - script_none.body = TRY(ast::script::parse_script_body(lr, opt)); + // also expect '{' and parse real script (in caller) return Ok(std::move(script_none)); } static - Result parse_script_map_none(io::LineSpan span, std::vector>>>& bits, io::LineCharReader& lr) + Result parse_script_map_none_head(io::LineSpan span, std::vector>>>& bits) { // ScriptMapNone: m,x,y,d|script|script name|-1{code} if (bits.size() != 4) @@ -339,37 +337,31 @@ namespace npc } if (bits[0].data.size() != 4) { - return Err(bits[0].span.error_str("expect 3 ,component,s"_s)); + return Err(bits[0].span.error_str("in |component 1| expect 3 ,component,s"_s)); } assert(bits[1].data.size() == 1); assert(bits[1].data[0].data == "script"_s); if (bits[2].data.size() != 1) { - return Err(bits[2].span.error_str("expect 1 ,component,s"_s)); + return Err(bits[2].span.error_str("in |component 3| expect 1 ,component,s"_s)); } if (bits[3].data.size() != 1 || bits[3].data[0].data != "-1"_s) { - return Err(bits[2].span.error_str("last |component| should be just -1"_s)); + return Err(bits[3].span.error_str("in |component 4| should be just -1"_s)); } ScriptMapNone script_map_none; - script_map_none.span = span; TRY_EXTRACT(bits[0].data[0], script_map_none.m); TRY_EXTRACT(bits[0].data[1], script_map_none.x); TRY_EXTRACT(bits[0].data[2], script_map_none.y); TRY_EXTRACT(bits[0].data[3], script_map_none.d); - script_map_none.key_span = bits[1].data[0].span; TRY_EXTRACT(bits[2].data[0], script_map_none.name); script_map_none.key4_span = bits[3].data[0].span; - // also expect '{' and parse real script - ast::script::ScriptOptions opt; - opt.implicit_start = true; - opt.no_start = true; - script_map_none.body = TRY(ast::script::parse_script_body(lr, opt)); + // also expect '{' and parse real script (in caller) return Ok(std::move(script_map_none)); } static - Result parse_script_map(io::LineSpan span, std::vector>>>& bits, io::LineCharReader& lr) + Result parse_script_map_head(io::LineSpan span, std::vector>>>& bits) { // ScriptMap: m,x,y,d|script|script name|class,xs,ys{code} if (bits.size() != 4) @@ -378,41 +370,48 @@ namespace npc } if (bits[0].data.size() != 4) { - return Err(bits[0].span.error_str("expect 3 ,component,s"_s)); + return Err(bits[0].span.error_str("in |component 1| expect 3 ,component,s"_s)); } assert(bits[1].data.size() == 1); assert(bits[1].data[0].data == "script"_s); if (bits[2].data.size() != 1) { - return Err(bits[2].span.error_str("expect 1 ,component,s"_s)); + return Err(bits[2].span.error_str("in |component 3| expect 1 ,component,s"_s)); } - if (bits[3].data.size() != 3) + if (bits[3].data.size() != 1 && bits[3].data.size() != 3) { - return Err(bits[3].span.error_str("expect 3 ,component,s"_s)); + return Err(bits[3].span.error_str("in |component 4| expect 1 or 3 ,component,s"_s)); } ScriptMap script_map; - script_map.span = span; TRY_EXTRACT(bits[0].data[0], script_map.m); TRY_EXTRACT(bits[0].data[1], script_map.x); TRY_EXTRACT(bits[0].data[2], script_map.y); TRY_EXTRACT(bits[0].data[3], script_map.d); - script_map.key_span = bits[1].data[0].span; TRY_EXTRACT(bits[2].data[0], script_map.name); TRY_EXTRACT(bits[3].data[0], script_map.npc_class); - TRY_EXTRACT(bits[3].data[1], script_map.xs); - TRY_EXTRACT(bits[3].data[2], script_map.ys); - // also expect '{' and parse real script - ast::script::ScriptOptions opt; - opt.implicit_start = true; - opt.default_label = "OnClick"_s; - script_map.body = TRY(ast::script::parse_script_body(lr, opt)); + if (bits[3].data.size() >= 3) + { + TRY_EXTRACT(bits[3].data[1], script_map.xs); + script_map.xs.data = script_map.xs.data * 2 + 1; + TRY_EXTRACT(bits[3].data[2], script_map.ys); + script_map.ys.data = script_map.ys.data * 2 + 1; + } + else + { + script_map.xs.data = 0; + script_map.xs.span = script_map.npc_class.span; + script_map.xs.span.end.column++; + script_map.xs.span.begin = script_map.xs.span.end; + script_map.ys.data = 0; + script_map.ys.span = script_map.xs.span; + } + // also expect '{' and parse real script (in caller) return Ok(std::move(script_map)); } static - Result> parse_script_any(io::LineSpan span, std::vector>>>& bits, io::LineCharReader& lr) + Result