diff --git a/src/result.hpp b/src/result.hpp index 4e4f120..f96364e 100644 --- a/src/result.hpp +++ b/src/result.hpp @@ -55,7 +55,7 @@ class Result { std::move(___res); \ }).release_value()) -#define DIEIF(m) \ +#define DIEX(m) \ (({ \ auto ___res = (m); \ if (!___res.has_value()) { \ diff --git a/src/vli.cpp b/src/vli.cpp index cf600ab..e18f190 100644 --- a/src/vli.cpp +++ b/src/vli.cpp @@ -8,49 +8,17 @@ StaticArena<64 * 1024 * 1024> arena; int main() { - /* - Value val; - std::cout << sizeof(val) << "\n"; - std::cout << int(val->tag()) << "\n"; - - val = Int64(123); - - std::cout << sizeof(val) << "\n"; - std::cout << int(val->tag()) << "\n"; - std::cout << int(((Int64&)*val).value()) << "\n"; - */ - - /* - { - auto s = DIEIF(String::create(arena, "foo")); - - std::cout << "root count: " << arena.root_count() << "\n"; - std::cout << "char: " << (char)DIEIF(s[2]) << "\n"; - } - std::cout << "root count: " << arena.root_count() << "\n"; - */ - - auto s = DIEIF(String::create(arena, "(1 2 3 \"foo\" (xyz))")); + auto s = DIEX(String::create(arena, "(1 2 3 \"foo\" (xyz))")); auto reader = Reader(arena, s); - auto r = DIEIF(reader.read_one()); + auto r = DIEX(reader.read_one()); auto writer = Writer(arena); - auto s2 = DIEIF(writer.write_one(r)); + auto s2 = DIEX(writer.write_one(r)); - DIEIF(arena.gc()); + DIEX(arena.gc()); - DIEIF(debug_print(arena, s2)); - - /* - auto one = Value(DIEIF(Int64::create(arena, 1))); - auto nil = Value(DIEIF(Nil::create(arena))); - auto pair = Value(DIEIF(Pair::create(arena, one, nil))); - - auto writer = Writer(arena); - auto s2 = DIEIF(writer.write_one(pair)); - DIEIF(debug_print(arena, s2)); - */ + DIEX(debug_print(arena, s2)); return 0; }