From 26d98ca94f2f049e8767b4a9a33d185a3d7ea0fd Mon Sep 17 00:00:00 2001 From: Josh Haberman Date: Thu, 24 Oct 2013 12:43:19 -0700 Subject: Merge from Google-internal development: - rewritten decoder; interpreted decoder is bytecode-based, JIT decoder no longer falls back to the interpreter. - C++ improvements: C++11-compatible iterators, upb::reffed_ptr for RAII refcounting, better upcast/downcast support. - removed the gross upb_value abstraction from public upb.h. --- tools/test_cinit.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tools/test_cinit.lua') diff --git a/tools/test_cinit.lua b/tools/test_cinit.lua index bb7977f..72d8826 100644 --- a/tools/test_cinit.lua +++ b/tools/test_cinit.lua @@ -48,11 +48,11 @@ if arg[1] == "generate" then f:write([[int luaopen_staticdefs(lua_State *L) { lua_newtable(L); for (int i = 0; i < ELEMENTS(test_msgs); i++) { - lupb_def_pushnewrapper(L, upb_upcast(&test_msgs[i]), NULL); + lupb_def_pushnewrapper(L, UPB_UPCAST(&test_msgs[i]), NULL); lua_rawseti(L, -2, i + 1); } for (int i = 0; i < ELEMENTS(test_enums); i++) { - lupb_def_pushnewrapper(L, upb_upcast(&test_enums[i]), NULL); + lupb_def_pushnewrapper(L, UPB_UPCAST(&test_enums[i]), NULL); lua_rawseti(L, -2, ELEMENTS(test_msgs) + i + 1); } return 1; @@ -71,7 +71,7 @@ elseif arg[1] == "test" then assert(enum:full_name() == "MyEnum") assert(enum:value("FOO") == 1) assert(f2:name() == "field2") - assert(f2:msgdef() == msg) + assert(f2:containing_type() == msg) assert(f2:subdef() == enum) else error("Unknown operation " .. arg[1]) -- cgit v1.2.3