From a2d0e6042e7a3c7c7dc8f1f61466d2d2c1607069 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Wed, 8 Oct 2014 09:58:40 +0100 Subject: [PATCH] elua: fix class c get function in lualian and make lua files rebuild on lualian changes --- src/Makefile_Elua_Helper.am | 2 +- src/bin/elua/modules/lualian.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makefile_Elua_Helper.am b/src/Makefile_Elua_Helper.am index 9805f78..aa14f92 100644 --- a/src/Makefile_Elua_Helper.am +++ b/src/Makefile_Elua_Helper.am @@ -13,7 +13,7 @@ am__v_ELUA_0 = @echo " ELUA " $@; SUFFIXES += .lua -%.eo.lua: %.eo ${_ELUA_GEN_DEP} +%.eo.lua: %.eo ${_ELUA_GEN_DEP} bin/elua/modules/lualian.lua $(AM_V_ELUA)$(ELUA_GEN) $(EOLIAN_FLAGS) -o $@ $< CLEANFILES += $(BUILT_SOURCES) diff --git a/src/bin/elua/modules/lualian.lua b/src/bin/elua/modules/lualian.lua index 8929999..acf05fb 100644 --- a/src/bin/elua/modules/lualian.lua +++ b/src/bin/elua/modules/lualian.lua @@ -542,9 +542,9 @@ local __class local __body local init = function() - __class = __lib.%s_class_get() + __class = __lib.%s() eo.class_register("%s", %s, __body, __class) -]]):format(self.fname, kn, ckls.prefix, knu, paru)) +]]):format(self.fname, kn, kls:c_get_function_name_get(), knu, paru)) if ckls.mixins then for i, v in ipairs(ckls.mixins) do s:write((" eo.class_mixin(\"%s\", \"%s\")\n"):format(knu, -- 2.7.4