From ac2689cec721eb94b49dfbfed310e2e0e3bdfa2b Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Thu, 21 Apr 2016 16:26:52 -0700 Subject: Put oneofs in the same table as fields. (#60) * Put oneofs in the same table as fields. Oneofs and fields are not allowed to have names that conflict, so we might as well put them all in the same table. This also allows an efficient operation that looks for both fields and oneofs in a single lookup. Added support for OneofDef to Lua to allow testing of this. * Addressed PR comments. --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 966168b..142a5cc 100644 --- a/Makefile +++ b/Makefile @@ -109,6 +109,7 @@ dep: clean_leave_profile: @rm -rf obj lib @rm -f tests/google_message?.h + @rm -f tests/json/test.upbdefs.o @rm -f $(TESTS) tests/testmain.o tests/t.* @rm -rf tools/upbc deps @rm -rf upb/bindings/python/build @@ -455,8 +456,8 @@ LUATESTS = \ .PHONY: clean_lua testlua lua testlua: lua - @set -e # Abort on error. - @for test in $(LUATESTS) ; do \ + @set -e; \ + for test in $(LUATESTS) ; do \ echo LUA $$test; \ LUA_PATH="third_party/lunit/?.lua;upb/bindings/lua/?.lua" \ LUA_CPATH=upb/bindings/lua/?.so \ -- cgit v1.2.3