Aren
/
toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kuroko: DYNAMIC_PROPERTY is no longer a thing

This commit is contained in:
K. Lange 2022-08-03 21:06:52 +09:00
parent d41e31c6dc
commit 2ee1035cfc
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/bim.c
View File

@ -5955,7 +5955,7 @@ int compare_candidate(const void * a, const void * b) {
/**
* List of file extensions to ignore when tab completing.
*/
const char * tab_complete_ignore[] = {".o",NULL};
const char * tab_complete_ignore[] = {".o",".lo",NULL};
/**
* Wrapper around krk_valueGetAttribute...
@ -6313,8 +6313,7 @@ _try_kuroko:
KrkToken asToken = {.start = s->chars, .literalWidth = s->length};
KrkValue thisValue = findFromProperty(root, asToken);
krk_push(thisValue);
if (IS_CLOSURE(thisValue) || IS_BOUND_METHOD(thisValue) ||
(IS_NATIVE(thisValue) && !(AS_OBJECT(thisValue)->flags & KRK_OBJ_FLAGS_FUNCTION_IS_DYNAMIC_PROPERTY))) {
if (IS_CLOSURE(thisValue) || IS_BOUND_METHOD(thisValue) || IS_NATIVE(thisValue)) {
size_t allocSize = s->length + 2;
char * tmp = malloc(allocSize);
size_t len = snprintf(tmp, allocSize, "%s(", s->chars);
@ -11148,9 +11147,9 @@ void initialize(void) {
*/
makeClass(bimModule, &syntaxStateClass, "SyntaxState", vm.baseClasses->objectClass);
syntaxStateClass->allocSize = sizeof(struct SyntaxState);
krk_defineNative(&syntaxStateClass->methods, "state", bim_krk_state_getstate)->obj.flags |= KRK_OBJ_FLAGS_FUNCTION_IS_DYNAMIC_PROPERTY;
krk_defineNative(&syntaxStateClass->methods, "i", bim_krk_state_index)->obj.flags |= KRK_OBJ_FLAGS_FUNCTION_IS_DYNAMIC_PROPERTY;
krk_defineNative(&syntaxStateClass->methods, "lineno", bim_krk_state_lineno)->obj.flags |= KRK_OBJ_FLAGS_FUNCTION_IS_DYNAMIC_PROPERTY;
krk_defineNativeProperty(&syntaxStateClass->methods, "state", bim_krk_state_getstate);
krk_defineNativeProperty(&syntaxStateClass->methods, "i", bim_krk_state_index);
krk_defineNativeProperty(&syntaxStateClass->methods, "lineno", bim_krk_state_lineno);
krk_defineNative(&syntaxStateClass->methods, "__init__", bim_krk_state_init);
krk_defineNative(&syntaxStateClass->methods, "findKeywords", bim_krk_state_findKeywords);
krk_defineNative(&syntaxStateClass->methods, "cKeywordQualifier", bim_krk_state_cKeywordQualifier)->obj.flags |= KRK_OBJ_FLAGS_FUNCTION_IS_STATIC_METHOD;

18
lib/kuroko/_yutani.c
View File

@ -1237,8 +1237,8 @@ KrkValue krk_module_onload__yutani(void) {
Yutani = krk_createClass(module, "Yutani", NULL);
Yutani->allocSize = sizeof(struct YutaniClass);
Yutani->docstring = S("Yutani()\n Establish a connection to the compositor display server.");
krk_defineNative(&Yutani->methods, "display_width", _yutani_display_width)->obj.flags |= KRK_OBJ_FLAGS_FUNCTION_IS_DYNAMIC_PROPERTY;
krk_defineNative(&Yutani->methods, "display_height", _yutani_display_height)->obj.flags |= KRK_OBJ_FLAGS_FUNCTION_IS_DYNAMIC_PROPERTY;
krk_defineNativeProperty(&Yutani->methods, "display_width", _yutani_display_width);
krk_defineNativeProperty(&Yutani->methods, "display_height", _yutani_display_height);
krk_defineNative(&Yutani->methods, "__repr__", _yutani_repr);
krk_defineNative(&Yutani->methods, "__init__", _yutani_init);
krk_defineNative(&Yutani->methods, "poll", _yutani_poll);
@ -1262,8 +1262,8 @@ KrkValue krk_module_onload__yutani(void) {
*/
GraphicsContext = krk_createClass(module, "GraphicsContext", NULL);
GraphicsContext->allocSize = sizeof(struct GraphicsContext);
krk_defineNative(&GraphicsContext->methods, "width", _gfx_width)->obj.flags |= KRK_OBJ_FLAGS_FUNCTION_IS_DYNAMIC_PROPERTY;
krk_defineNative(&GraphicsContext->methods, "height", _gfx_height)->obj.flags |= KRK_OBJ_FLAGS_FUNCTION_IS_DYNAMIC_PROPERTY;
krk_defineNativeProperty(&GraphicsContext->methods, "width", _gfx_width);
krk_defineNativeProperty(&GraphicsContext->methods, "height", _gfx_height);
krk_defineNative(&GraphicsContext->methods, "fill", _gfx_fill)->doc =
"GraphicsContext.fill(color)\n"
" Fill the entire context with the given color.";
@ -1324,10 +1324,10 @@ KrkValue krk_module_onload__yutani(void) {
krk_defineNative(&YutaniWindow->methods, "advertise", _window_advertise);
krk_defineNative(&YutaniWindow->methods, "reinit", _window_reinit);
krk_defineNative(&YutaniWindow->methods, "wid", _window_wid)->obj.flags |= KRK_OBJ_FLAGS_FUNCTION_IS_DYNAMIC_PROPERTY;
krk_defineNative(&YutaniWindow->methods, "x", _window_x)->obj.flags |= KRK_OBJ_FLAGS_FUNCTION_IS_DYNAMIC_PROPERTY;
krk_defineNative(&YutaniWindow->methods, "y", _window_y)->obj.flags |= KRK_OBJ_FLAGS_FUNCTION_IS_DYNAMIC_PROPERTY;
krk_defineNative(&YutaniWindow->methods, "focused", _window_focused)->obj.flags |= KRK_OBJ_FLAGS_FUNCTION_IS_DYNAMIC_PROPERTY;
krk_defineNativeProperty(&YutaniWindow->methods, "wid", _window_wid);
krk_defineNativeProperty(&YutaniWindow->methods, "x", _window_x);
krk_defineNativeProperty(&YutaniWindow->methods, "y", _window_y);
krk_defineNativeProperty(&YutaniWindow->methods, "focused", _window_focused);
krk_finalizeClass(YutaniWindow);
/**
@ -1358,7 +1358,7 @@ KrkValue krk_module_onload__yutani(void) {
krk_defineNative(&YutaniFont->methods, "width", _font_width)->doc =
"Font.width(string)\n"
" Calculate the rendered width of the given string when drawn with this font.";
krk_defineNative(&YutaniFont->methods, "size", _font_size)->obj.flags |= KRK_OBJ_FLAGS_FUNCTION_IS_DYNAMIC_PROPERTY;
krk_defineNativeProperty(&YutaniFont->methods, "size", _font_size);
krk_defineNative(&YutaniFont->methods, "set_size", _font_set_size);
krk_finalizeClass(YutaniFont);