move NULL check to import side
This commit is contained in:
parent
b42f48782b
commit
aff1261b08
|
@ -38,6 +38,11 @@ ptrize() {
|
||||||
grep '^LUA' | grep -v "$IGNORE_SYM" | sed -e "s/$sym_regex/static\t\2(*\3)\t(\4);/"
|
grep '^LUA' | grep -v "$IGNORE_SYM" | sed -e "s/$sym_regex/static\t\2(*\3)\t(\4);/"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# create a stub function that warns user when calling it
|
||||||
|
makestub() {
|
||||||
|
grep '^LUA' | grep -v "$IGNORE_SYM" | sed -e "s/$sym_regex/static\t\2\t__lite_xl_fallback_\3\t(\4) { fputs(\"warning: \3 is a stub\", stderr); }/"
|
||||||
|
}
|
||||||
|
|
||||||
import_sym() {
|
import_sym() {
|
||||||
grep '^LUA' | grep -v "$IGNORE_SYM" | sed -e "s/$sym_regex/\tIMPORT_SYMBOL(\3, \2, \4);/"
|
grep '^LUA' | grep -v "$IGNORE_SYM" | sed -e "s/$sym_regex/\tIMPORT_SYMBOL(\3, \2, \4);/"
|
||||||
}
|
}
|
||||||
|
@ -55,6 +60,8 @@ decl() {
|
||||||
ptrize <<< "$header1"
|
ptrize <<< "$header1"
|
||||||
# defines
|
# defines
|
||||||
(grep '^#' | grep -v "$IGNORE_SYM") <<< "$header"
|
(grep '^#' | grep -v "$IGNORE_SYM") <<< "$header"
|
||||||
|
# stubs
|
||||||
|
makestub <<< "$header1"
|
||||||
}
|
}
|
||||||
|
|
||||||
decl_import() {
|
decl_import() {
|
||||||
|
@ -93,7 +100,7 @@ generate_header() {
|
||||||
decl "$LUA_PATH/lauxlib.h"
|
decl "$LUA_PATH/lauxlib.h"
|
||||||
echo
|
echo
|
||||||
|
|
||||||
echo "#define IMPORT_SYMBOL(name, ret, ...) name = (ret (*) (__VA_ARGS__)) symbol(#name)"
|
echo "#define IMPORT_SYMBOL(name, ret, ...) name = (name = (ret (*) (__VA_ARGS__)) symbol(#name), name == NULL ? &__lite_xl_fallback_##name : name)"
|
||||||
echo "static void lite_xl_plugin_init(void *XL) {"
|
echo "static void lite_xl_plugin_init(void *XL) {"
|
||||||
echo -e "\tvoid* (*symbol)(const char *) = (void* (*) (const char *)) XL;"
|
echo -e "\tvoid* (*symbol)(const char *) = (void* (*) (const char *)) XL;"
|
||||||
|
|
||||||
|
@ -134,3 +141,4 @@ main() {
|
||||||
}
|
}
|
||||||
|
|
||||||
main "$@"
|
main "$@"
|
||||||
|
# create a stub function that warns user when calling it
|
||||||
|
|
|
@ -699,7 +699,6 @@ static void* api_require(const char* symbol) {
|
||||||
if (strcmp(nodes[i].symbol, symbol) == 0)
|
if (strcmp(nodes[i].symbol, symbol) == 0)
|
||||||
return nodes[i].address;
|
return nodes[i].address;
|
||||||
}
|
}
|
||||||
fprintf(stderr, "WARNING: %s is not available\n", symbol);
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue