From d2213ab26e99ec10ecb1bb50cdcc9f34f09770ee Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 6 Nov 2014 09:26:01 +0000 Subject: Revert "Revert "elua: add debug prints for mingw debug (non-merge branch)"" This reverts commit 2b7a27aec21f3ee556a987d9c627bc07937d045a. --- src/bin/elua/apps/lualian.lua | 18 +++++++++++++--- src/bin/elua/main.c | 44 +++++++++++++++++++++++++++------------- src/bin/elua/modules/lualian.lua | 6 ++++++ 3 files changed, 51 insertions(+), 17 deletions(-) diff --git a/src/bin/elua/apps/lualian.lua b/src/bin/elua/apps/lualian.lua index 4ffbf58ee1..5466373054 100644 --- a/src/bin/elua/apps/lualian.lua +++ b/src/bin/elua/apps/lualian.lua @@ -1,11 +1,14 @@ -- Lualian application -- for use with Elua +print("lualian 1") local lualian = require("lualian") +print("lualian 2") local getopt = require("getopt") +print("lualian 3") local gen_file = function(opts, i, fname) - local printv = opts["v"] and print or function() end + local printv = print printv("Generating for file: " .. fname) local ofile = opts["o"] and opts["o"][i] or nil local fstream = io.stdout @@ -18,9 +21,11 @@ local gen_file = function(opts, i, fname) else printv(" Output file: printing to stdout...") end + print("lualian generating") lualian.generate(fname, fstream) + print("lualian generated") end - +print("lualian 4") getopt.parse { usage = "Usage: %prog [OPTIONS] file1.eo file2.eo ... fileN.eo", args = arg, @@ -47,19 +52,26 @@ getopt.parse { getopt.help(parser, io.stderr) end, done_cb = function(parser, opts, args) + print("lualian done cb") if not opts["h"] then for i, v in ipairs(opts["I"] or {}) do + print("lualian include") lualian.include_dir(v) end + print("lualian included") if os.getenv("EFL_RUN_IN_TREE") then lualian.system_directory_scan() end + print("lualian load eot") lualian.load_eot_files() + print("lualian gen") for i, fname in ipairs(args) do + print("lualian gen step") gen_file(opts, i, fname) end + print("lualian gend") end end } - +print("lualian 5") return true diff --git a/src/bin/elua/main.c b/src/bin/elua/main.c index 82dceeacbb..39c58bb506 100644 --- a/src/bin/elua/main.c +++ b/src/bin/elua/main.c @@ -207,14 +207,19 @@ elua_dostr(lua_State *L, const char *chunk, const char *chname) static Eina_Bool elua_loadapp(lua_State *L, const char *appname) { + printf("4 elua main 1\n"); lua_rawgeti(L, LUA_REGISTRYINDEX, elua_appload_ref); lua_pushstring(L, appname); + printf("4 elua main 2\n"); lua_call(L, 1, 2); + printf("4 elua main 3\n"); if (lua_isnil(L, -2)) { + printf("4 elua main 3B\n"); lua_remove(L, -2); return EINA_FALSE; } + printf("4 elua main 4\n"); lua_pop(L, 1); return EINA_TRUE; } @@ -226,6 +231,7 @@ elua_doscript(lua_State *L, int argc, char **argv, int n, int *quit) const char *fname = argv[n]; int narg = elua_getargs(L, argc, argv, n); lua_setglobal(L, "arg"); + printf("3 elua main 1\n"); if (fname[0] == '-' && !fname[1]) { fname = NULL; @@ -250,15 +256,18 @@ elua_doscript(lua_State *L, int argc, char **argv, int n, int *quit) } else { + printf("3 elua main 2A\n"); status = elua_loadfile(L, fname); } lua_insert(L, -(narg + 1)); if (!status) { + printf("3 elua main 3\n"); status = elua_docall(L, narg, 1); } else { + printf("3 elua main 3A\n"); lua_pop(L, narg); } if (!status) @@ -266,6 +275,7 @@ elua_doscript(lua_State *L, int argc, char **argv, int n, int *quit) *quit = lua_toboolean(L, -1); lua_pop(L, 1); } + printf("3 elua main 4: %d\n", status); return elua_report(L, status); } @@ -412,7 +422,7 @@ elua_main(lua_State *L) char corefbuf[PATH_MAX]; int ch; - + printf("2 elua main 1\n"); struct Main_Data *m = (struct Main_Data*)lua_touserdata(L, 1); int argc = m->argc; @@ -425,7 +435,7 @@ elua_main(lua_State *L) #endif elua_progname = (argv[0] && argv[0][0]) ? argv[0] : "elua"; - + printf("2 elua main 2\n"); while ((ch = getopt_long(argc, argv, "+LhC:M:A:e:l:I:E", lopt, NULL)) != -1) { switch (ch) @@ -455,17 +465,17 @@ elua_main(lua_State *L) } } } - + printf("2 elua main 3\n"); INF("arguments parsed"); lua_gc(L, LUA_GCSTOP, 0); - + printf("2 elua main 4\n"); luaL_openlibs(L); elua_prefix = eina_prefix_new(elua_progname, elua_main, "ELUA", "elua", NULL, PACKAGE_BIN_DIR, "", PACKAGE_DATA_DIR, LOCALE_DIR); - + printf("2 elua main 5\n"); if (!elua_prefix) { ERR("could not find elua prefix"); @@ -491,6 +501,7 @@ elua_main(lua_State *L) } } snprintf(modfile, sizeof(modfile), "%s/module.lua", coref); + printf("2 elua main 6\n"); if (elua_report(L, elua_loadfile(L, modfile))) { m->status = 1; @@ -505,6 +516,7 @@ elua_main(lua_State *L) lua_createtable(L, 0, 0); luaL_register(L, NULL, cutillib); lua_call(L, 2, 0); + printf("2 elua main 7\n"); snprintf(modfile, sizeof(modfile), "%s/gettext.lua", coref); if (elua_report(L, elua_loadfile(L, modfile))) @@ -512,6 +524,7 @@ elua_main(lua_State *L) m->status = 1; return 0; } + printf("2 elua main 8\n"); lua_createtable(L, 0, 0); luaL_register(L, NULL, gettextlib); #ifdef ENABLE_NLS @@ -521,7 +534,7 @@ elua_main(lua_State *L) lua_setfield(L, -2, "dngettext"); #endif lua_call(L, 1, 0); - + printf("2 elua main 9\n"); elua_register_cache(L); lua_gc(L, LUA_GCRESTART, 0); @@ -551,13 +564,14 @@ elua_main(lua_State *L) break; } } - + printf("2 elua main 10\n"); /* cleanup */ EINA_LIST_FREE(largs, data) free(data); /* run script or execute sdin as file */ if (optind < argc) { + printf("2 elua main 11\n"); int quit = 0; if ((m->status = elua_doscript(L, argc, argv, optind, &quit))) return 0; if (quit) return 0; @@ -570,9 +584,9 @@ elua_main(lua_State *L) lua_pop(L, 1); if (quit) return 0; } - + printf("2 elua main 12\n"); ecore_main_loop_begin(); - + printf("2 elua main 13\n"); return 0; } @@ -582,22 +596,24 @@ main(int argc, char **argv) struct Main_Data m; lua_State *L = NULL; + printf("ELUA MAIN\n"); #ifdef ENABLE_NLS setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALE_DIR); bind_textdomain_codeset(PACKAGE, "UTF-8"); textdomain(PACKAGE); #endif + printf("elua main 2\n"); eina_init(); - + printf("elua main 3\n"); if (!(el_log_domain = eina_log_domain_register("elua", EINA_COLOR_ORANGE))) { printf("cannot set elua log domain\n"); ERR("could not set elua log domain."); el_log_domain = EINA_LOG_DOMAIN_GLOBAL; } - + printf("elua main 4\n"); INF("elua logging initialized: %d", el_log_domain); if (!(L = luaL_newstate())) @@ -607,14 +623,14 @@ main(int argc, char **argv) } elua_state = L; - + printf("elua main 5\n"); INF("elua lua state created"); m.argc = argc; m.argv = argv; m.status = 0; - + printf("elua main 6\n"); elua_shutdown(L, !!(lua_cpcall(L, elua_main, &m) || m.status)); - + printf("elua main 7\n"); return 0; /* never gets here */ } diff --git a/src/bin/elua/modules/lualian.lua b/src/bin/elua/modules/lualian.lua index c28f3496cd..660883b714 100644 --- a/src/bin/elua/modules/lualian.lua +++ b/src/bin/elua/modules/lualian.lua @@ -693,17 +693,21 @@ M.system_directory_scan = function() end M.generate = function(fname, fstream) + print("lualian eo file parse") if not eolian.eo_file_parse(fname) then error("Failed parsing file: " .. fname) end + print("lualian validate") if not eolian.database_validate() then error("Failed validating database.") end + print("lualian validated") local sfn = fname:match(".*[\\/](.+)$") or fname local klass = eolian.class_get_by_file(sfn) local tp = klass:type_get() local ct = eolian.class_type local cl + print("lualian gen class") if tp == ct.MIXIN or tp == ct.INTERFACE then cl = gen_mixin(klass) elseif tp == ct.REGULAR or tp == ct.ABSTRACT then @@ -711,7 +715,9 @@ M.generate = function(fname, fstream) else error(klass:full_name_get() .. ": unknown type") end + print("lualian gen file") File(fname, klass, { cl }):generate(fstream or io.stdout) + print("lualian gend file") end return M -- cgit v1.2.1