From 1b52f47cf285d5f3835bce7ad73f360bd327d4e8 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Fri, 6 Jul 2007 21:52:38 +0000 Subject: 23665: autoloading of module features and related tweaks --- Src/Zle/compctl.c | 8 ++++---- Src/Zle/complete.c | 14 +++++++------- Src/Zle/complist.c | 9 +++++---- Src/Zle/computil.c | 14 +++++++------- Src/Zle/deltochar.c | 8 ++++---- Src/Zle/zle_main.c | 13 +++++++------ Src/Zle/zleparameter.c | 14 +++++++------- 7 files changed, 41 insertions(+), 39 deletions(-) (limited to 'Src/Zle') diff --git a/Src/Zle/compctl.c b/Src/Zle/compctl.c index bafbb2f68..143c93682 100644 --- a/Src/Zle/compctl.c +++ b/Src/Zle/compctl.c @@ -3938,8 +3938,8 @@ makecomplistflags(Compctl cc, char *s, int incmd, int compadd) static struct builtin bintab[] = { - BUILTIN("compctl", 0, bin_compctl, 0, -1, 0, NULL, NULL), BUILTIN("compcall", 0, bin_compcall, 0, 0, 0, "TD", NULL), + BUILTIN("compctl", 0, bin_compctl, 0, -1, 0, NULL, NULL), }; static struct features module_features = { @@ -3974,7 +3974,7 @@ setup_(UNUSED(Module m)) int features_(Module m, char ***features) { - *features = featuresarray(m->nam, &module_features); + *features = featuresarray(m, &module_features); return 0; } @@ -3982,7 +3982,7 @@ features_(Module m, char ***features) int enables_(Module m, int **enables) { - return handlefeatures(m->nam, &module_features, enables); + return handlefeatures(m, &module_features, enables); } /**/ @@ -4000,7 +4000,7 @@ cleanup_(Module m) { deletehookfunc("compctl_make", (Hookfn) ccmakehookfn); deletehookfunc("compctl_cleanup", (Hookfn) cccleanuphookfn); - return setfeatureenables(m->nam, &module_features, NULL); + return setfeatureenables(m, &module_features, NULL); } /**/ diff --git a/Src/Zle/complete.c b/Src/Zle/complete.c index a2af30c65..36c4c8a3d 100644 --- a/Src/Zle/complete.c +++ b/Src/Zle/complete.c @@ -1445,10 +1445,10 @@ static struct builtin bintab[] = { }; static struct conddef cotab[] = { + CONDDEF("after", 0, cond_range, 1, 1, 0), + CONDDEF("between", 0, cond_range, 2, 2, 1), CONDDEF("prefix", 0, cond_psfix, 1, 2, CVT_PREPAT), CONDDEF("suffix", 0, cond_psfix, 1, 2, CVT_SUFPAT), - CONDDEF("between", 0, cond_range, 2, 2, 1), - CONDDEF("after", 0, cond_range, 1, 1, 0), }; static struct funcwrap wrapper[] = { @@ -1502,7 +1502,7 @@ setup_(UNUSED(Module m)) int features_(Module m, char ***features) { - *features = featuresarray(m->nam, &module_features); + *features = featuresarray(m, &module_features); return 0; } @@ -1510,7 +1510,7 @@ features_(Module m, char ***features) int enables_(Module m, int **enables) { - return handlefeatures(m->nam, &module_features, enables); + return handlefeatures(m, &module_features, enables); } /**/ @@ -1524,7 +1524,7 @@ boot_(Module m) addhookfunc("reverse_menu", (Hookfn) reverse_menu); addhookfunc("list_matches", (Hookfn) list_matches); addhookfunc("invalidate_list", (Hookfn) invalidate_list); - (void)addhookdefs(m->nam, comphooks, sizeof(comphooks)/sizeof(*comphooks)); + (void)addhookdefs(m, comphooks, sizeof(comphooks)/sizeof(*comphooks)); return addwrapper(m, wrapper); } @@ -1539,10 +1539,10 @@ cleanup_(Module m) deletehookfunc("reverse_menu", (Hookfn) reverse_menu); deletehookfunc("list_matches", (Hookfn) list_matches); deletehookfunc("invalidate_list", (Hookfn) invalidate_list); - (void)deletehookdefs(m->nam, comphooks, + (void)deletehookdefs(m, comphooks, sizeof(comphooks)/sizeof(*comphooks)); deletewrapper(m, wrapper); - return setfeatureenables(m->nam, &module_features, NULL); + return setfeatureenables(m, &module_features, NULL); } /**/ diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c index 787b7b25c..64d7e50ce 100644 --- a/Src/Zle/complist.c +++ b/Src/Zle/complist.c @@ -3238,7 +3238,7 @@ setup_(UNUSED(Module m)) int features_(Module m, char ***features) { - *features = featuresarray(m->nam, &module_features); + *features = featuresarray(m, &module_features); return 0; } @@ -3246,7 +3246,7 @@ features_(Module m, char ***features) int enables_(Module m, int **enables) { - return handlefeatures(m->nam, &module_features, enables); + return handlefeatures(m, &module_features, enables); } /**/ @@ -3261,7 +3261,8 @@ boot_(Module m) w_menuselect = addzlefunction("menu-select", menuselect, ZLE_MENUCMP|ZLE_KEEPSUFFIX|ZLE_ISCOMP); if (!w_menuselect) { - zwarnnam(m->nam, "name clash when adding ZLE function `menu-select'"); + zwarnnam(m->node.nam, + "name clash when adding ZLE function `menu-select'"); return -1; } addhookfunc("comp_list_matches", (Hookfn) complistmatches); @@ -3302,7 +3303,7 @@ cleanup_(Module m) deletehookfunc("menu_start", (Hookfn) domenuselect); unlinkkeymap("menuselect", 1); unlinkkeymap("listscroll", 1); - return setfeatureenables(m->nam, &module_features, NULL); + return setfeatureenables(m, &module_features, NULL); } /**/ diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c index b9df1e418..9ba38101a 100644 --- a/Src/Zle/computil.c +++ b/Src/Zle/computil.c @@ -4544,14 +4544,14 @@ bin_compgroups(char *nam, char **args, UNUSED(Options ops), UNUSED(int func)) } static struct builtin bintab[] = { - BUILTIN("compdescribe", 0, bin_compdescribe, 3, -1, 0, NULL, NULL), BUILTIN("comparguments", 0, bin_comparguments, 1, -1, 0, NULL, NULL), - BUILTIN("compvalues", 0, bin_compvalues, 1, -1, 0, NULL, NULL), + BUILTIN("compdescribe", 0, bin_compdescribe, 3, -1, 0, NULL, NULL), + BUILTIN("compfiles", 0, bin_compfiles, 1, -1, 0, NULL, NULL), + BUILTIN("compgroups", 0, bin_compgroups, 1, -1, 0, NULL, NULL), BUILTIN("compquote", 0, bin_compquote, 1, -1, 0, "p", NULL), BUILTIN("comptags", 0, bin_comptags, 1, -1, 0, NULL, NULL), BUILTIN("comptry", 0, bin_comptry, 0, -1, 0, NULL, NULL), - BUILTIN("compfiles", 0, bin_compfiles, 1, -1, 0, NULL, NULL), - BUILTIN("compgroups", 0, bin_compgroups, 1, -1, 0, NULL, NULL), + BUILTIN("compvalues", 0, bin_compvalues, 1, -1, 0, NULL, NULL) }; static struct features module_features = { @@ -4581,7 +4581,7 @@ setup_(UNUSED(Module m)) int features_(Module m, char ***features) { - *features = featuresarray(m->nam, &module_features); + *features = featuresarray(m, &module_features); return 0; } @@ -4589,7 +4589,7 @@ features_(Module m, char ***features) int enables_(Module m, int **enables) { - return handlefeatures(m->nam, &module_features, enables); + return handlefeatures(m, &module_features, enables); } /**/ @@ -4603,7 +4603,7 @@ boot_(Module m) int cleanup_(Module m) { - return setfeatureenables(m->nam, &module_features, NULL); + return setfeatureenables(m, &module_features, NULL); } /**/ diff --git a/Src/Zle/deltochar.c b/Src/Zle/deltochar.c index 0c64cf18d..d56798687 100644 --- a/Src/Zle/deltochar.c +++ b/Src/Zle/deltochar.c @@ -95,7 +95,7 @@ setup_(UNUSED(Module m)) int features_(Module m, char ***features) { - *features = featuresarray(m->nam, &module_features); + *features = featuresarray(m, &module_features); return 0; } @@ -103,7 +103,7 @@ features_(Module m, char ***features) int enables_(Module m, int **enables) { - return handlefeatures(m->nam, &module_features, enables); + return handlefeatures(m, &module_features, enables); } /**/ @@ -119,7 +119,7 @@ boot_(Module m) return 0; deletezlefunction(w_deletetochar); } - zwarnnam(m->nam, "deltochar: name clash when adding ZLE functions"); + zwarnnam(m->node.nam, "deltochar: name clash when adding ZLE functions"); return -1; } @@ -129,7 +129,7 @@ cleanup_(Module m) { deletezlefunction(w_deletetochar); deletezlefunction(w_zaptochar); - return setfeatureenables(m->nam, &module_features, NULL); + return setfeatureenables(m, &module_features, NULL); } /**/ diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c index d2a665188..463ff157f 100644 --- a/Src/Zle/zle_main.c +++ b/Src/Zle/zle_main.c @@ -1827,7 +1827,7 @@ setup_(UNUSED(Module m)) int features_(Module m, char ***features) { - *features = featuresarray(m->nam, &module_features); + *features = featuresarray(m, &module_features); return 0; } @@ -1835,7 +1835,7 @@ features_(Module m, char ***features) int enables_(Module m, int **enables) { - return handlefeatures(m->nam, &module_features, enables); + return handlefeatures(m, &module_features, enables); } /**/ @@ -1844,7 +1844,7 @@ boot_(Module m) { addhookfunc("before_trap", (Hookfn) zlebeforetrap); addhookfunc("after_trap", (Hookfn) zleaftertrap); - (void)addhookdefs(m->nam, zlehooks, sizeof(zlehooks)/sizeof(*zlehooks)); + (void)addhookdefs(m, zlehooks, sizeof(zlehooks)/sizeof(*zlehooks)); return 0; } @@ -1853,13 +1853,14 @@ int cleanup_(Module m) { if(zleactive) { - zerrnam(m->nam, "can't unload the zle module while zle is active"); + zerrnam(m->node.nam, + "can't unload the zle module while zle is active"); return 1; } deletehookfunc("before_trap", (Hookfn) zlebeforetrap); deletehookfunc("after_trap", (Hookfn) zleaftertrap); - (void)deletehookdefs(m->nam, zlehooks, sizeof(zlehooks)/sizeof(*zlehooks)); - return setfeatureenables(m->nam, &module_features, NULL); + (void)deletehookdefs(m, zlehooks, sizeof(zlehooks)/sizeof(*zlehooks)); + return setfeatureenables(m, &module_features, NULL); } /**/ diff --git a/Src/Zle/zleparameter.c b/Src/Zle/zleparameter.c index 1b84fdff7..ab988d6df 100644 --- a/Src/Zle/zleparameter.c +++ b/Src/Zle/zleparameter.c @@ -56,7 +56,7 @@ widgetstr(Widget w) /**/ static HashNode -getpmwidgets(UNUSED(HashTable ht), char *name) +getpmwidgets(UNUSED(HashTable ht), const char *name) { Param pm = NULL; Thingy th; @@ -129,16 +129,16 @@ static const struct gsu_array keymaps_gsu = { keymapsgetfn, arrsetfn, stdunsetfn }; static struct paramdef partab[] = { - SPECIALPMDEF("widgets", PM_READONLY, - &zlestdhash_gsu, getpmwidgets, scanpmwidgets), SPECIALPMDEF("keymaps", PM_ARRAY|PM_READONLY, &keymaps_gsu, NULL, NULL), + SPECIALPMDEF("widgets", PM_READONLY, + &zlestdhash_gsu, getpmwidgets, scanpmwidgets) }; static struct features module_features = { NULL, 0, NULL, 0, - partab, sizeof(partab)/sizeof(*partab), NULL, 0, + partab, sizeof(partab)/sizeof(*partab), 0 }; @@ -153,7 +153,7 @@ setup_(UNUSED(Module m)) int features_(Module m, char ***features) { - *features = featuresarray(m->nam, &module_features); + *features = featuresarray(m, &module_features); return 0; } @@ -161,7 +161,7 @@ features_(Module m, char ***features) int enables_(Module m, int **enables) { - return handlefeatures(m->nam, &module_features, enables); + return handlefeatures(m, &module_features, enables); } /**/ @@ -175,7 +175,7 @@ boot_(UNUSED(Module m)) int cleanup_(Module m) { - return setfeatureenables(m->nam, &module_features, NULL); + return setfeatureenables(m, &module_features, NULL); } /**/ -- cgit 1.4.1