Fix up build with mruby binding

This commit is contained in:
Varun Patil 2018-04-28 12:39:21 +05:30
parent b5e5a26d8b
commit 39ac6aecf0
6 changed files with 28 additions and 19 deletions

View File

@ -117,7 +117,7 @@ static void mrbBindingInit(mrb_state *mrb)
/* Load global constants */ /* Load global constants */
mrb_define_global_const(mrb, "MKXP", mrb_true_value()); mrb_define_global_const(mrb, "MKXP", mrb_true_value());
mrb_value debug = rb_bool_new(shState->config().editor.debug); mrb_value debug = mrb_bool_value(shState->config().editor.debug);
if (rgssVer == 1) if (rgssVer == 1)
mrb_define_global_const(mrb, "DEBUG", debug); mrb_define_global_const(mrb, "DEBUG", debug);
else if (rgssVer >= 2) else if (rgssVer >= 2)
@ -298,7 +298,7 @@ runRMXPScripts(mrb_state *mrb, mrbc_context *ctx)
return; return;
} }
int scriptCount = mrb_ary_len(scriptMrb, scriptArray); int scriptCount = RARRAY_LEN(scriptArray);
std::string decodeBuffer; std::string decodeBuffer;
decodeBuffer.resize(0x1000); decodeBuffer.resize(0x1000);

View File

@ -72,7 +72,7 @@ static const MrbExcData excData[] =
{ PHYSFS, "PHYSFSError" }, { PHYSFS, "PHYSFSError" },
{ SDL, "SDLError" }, { SDL, "SDLError" },
{ MKXP, "MKXPError" }, { MKXP, "MKXPError" },
{ IO, "IOError" } { IO, "IOError2" }
}; };
static elementsN(excData); static elementsN(excData);

View File

@ -49,7 +49,12 @@ MRB_METHOD(fontInitialize)
mrb_get_args(mrb, "|zi", &name, &size); mrb_get_args(mrb, "|zi", &name, &size);
Font *f = new Font(name, size); Font *f;
std::vector<std::string> names;
names.push_back(name);
f = new Font(&names, size);
setPrivateData(self, f, FontType); setPrivateData(self, f, FontType);
@ -86,9 +91,8 @@ MRB_METHOD(fontInitializeCopy)
MRB_METHOD(FontGetName) MRB_METHOD(FontGetName)
{ {
Font *f = getPrivateData<Font>(mrb, self); /* FIXME: getName method is missing from Font */
return mrb_str_new_cstr(mrb, "name");
return mrb_str_new_cstr(mrb, f->getName());
} }
MRB_METHOD(FontSetName) MRB_METHOD(FontSetName)
@ -98,7 +102,10 @@ MRB_METHOD(FontSetName)
mrb_value name; mrb_value name;
mrb_get_args(mrb, "S", &name); mrb_get_args(mrb, "S", &name);
f->setName(RSTRING_PTR(name)); std::vector<std::string> names;
names.push_back(RSTRING_PTR(name));
f->setName(names);
return name; return name;
} }
@ -137,7 +144,8 @@ DEF_KLASS_PROP(Font, mrb_bool, DefaultShadow, "b", bool)
MRB_FUNCTION(FontGetDefaultName) MRB_FUNCTION(FontGetDefaultName)
{ {
return mrb_str_new_cstr(mrb, Font::getDefaultName()); /* FIXME: getDefaultName method is missing from Font */
return mrb_str_new_cstr(mrb, "default_name");
} }
MRB_FUNCTION(FontSetDefaultName) MRB_FUNCTION(FontSetDefaultName)
@ -145,7 +153,10 @@ MRB_FUNCTION(FontSetDefaultName)
mrb_value nameObj; mrb_value nameObj;
mrb_get_args(mrb, "S", &nameObj); mrb_get_args(mrb, "S", &nameObj);
Font::setDefaultName(RSTRING_PTR(nameObj)); std::vector<std::string> names;
names.push_back(RSTRING_PTR(nameObj));
Font::setDefaultName(names, shState->fontState());
return nameObj; return nameObj;
} }

View File

@ -596,7 +596,7 @@ fileBindingInit(mrb_state *mrb)
mrb_define_method(mrb, klass, "path", fileGetPath, MRB_ARGS_NONE()); mrb_define_method(mrb, klass, "path", fileGetPath, MRB_ARGS_NONE());
/* FileTest */ /* FileTest */
RClass *module = mrb_define_module(mrb, "FileTest"); RClass *module = mrb_define_module(mrb, "MKXPFileTest");
mrb_define_module_function(mrb, module, "exist?", fileTestDoesExist, MRB_ARGS_REQ(1)); mrb_define_module_function(mrb, module, "exist?", fileTestDoesExist, MRB_ARGS_REQ(1));
mrb_define_module_function(mrb, module, "directory?", fileTestIsDirectory, MRB_ARGS_REQ(1)); mrb_define_module_function(mrb, module, "directory?", fileTestIsDirectory, MRB_ARGS_REQ(1));
mrb_define_module_function(mrb, module, "file?", fileTestIsFile, MRB_ARGS_REQ(1)); mrb_define_module_function(mrb, module, "file?", fileTestIsFile, MRB_ARGS_REQ(1));

View File

@ -172,7 +172,7 @@ MRB_FUNCTION(kernelLoadData)
mrb_get_args(mrb, "z", &filename); mrb_get_args(mrb, "z", &filename);
SDL_RWops ops; SDL_RWops ops;
GUARD_EXC( shState->fileSystem().openRead(ops, filename); ) GUARD_EXC( shState->fileSystem().openReadRaw(ops, filename); )
mrb_value obj; mrb_value obj;
try { obj = marshalLoadInt(mrb, &ops); } try { obj = marshalLoadInt(mrb, &ops); }

View File

@ -473,8 +473,8 @@ read_value(MarshalContext *ctx)
mrb_state *mrb = ctx->mrb; mrb_state *mrb = ctx->mrb;
int8_t type = ctx->readByte(); int8_t type = ctx->readByte();
mrb_value value; mrb_value value;
if (mrb->arena_idx > maxArena) if (mrb->gc.arena_idx > maxArena)
maxArena = mrb->arena_idx; maxArena = mrb->gc.arena_idx;
int arena = mrb_gc_arena_save(mrb); int arena = mrb_gc_arena_save(mrb);
@ -676,7 +676,7 @@ static void
write_array(MarshalContext *ctx, mrb_value array) write_array(MarshalContext *ctx, mrb_value array)
{ {
mrb_state *mrb = ctx->mrb; mrb_state *mrb = ctx->mrb;
int len = mrb_ary_len(mrb, array); int len = RARRAY_LEN(array);
write_fixnum(ctx, len); write_fixnum(ctx, len);
int i; int i;
@ -687,8 +687,6 @@ write_array(MarshalContext *ctx, mrb_value array)
} }
} }
KHASH_DECLARE(ht, mrb_value, mrb_value, 1)
static void static void
write_hash(MarshalContext *ctx, mrb_value hash) write_hash(MarshalContext *ctx, mrb_value hash)
{ {
@ -707,7 +705,7 @@ write_hash(MarshalContext *ctx, mrb_value hash)
continue; continue;
write_value(ctx, kh_key(h, k)); write_value(ctx, kh_key(h, k));
write_value(ctx, kh_val(h, k)); write_value(ctx, kh_val(h, k).v);
} }
} }
@ -732,7 +730,7 @@ write_object(MarshalContext *ctx, mrb_value object)
write_value(ctx, mrb_str_intern(mrb, path)); write_value(ctx, mrb_str_intern(mrb, path));
mrb_value iv_ary = mrb_obj_instance_variables(mrb, object); mrb_value iv_ary = mrb_obj_instance_variables(mrb, object);
int iv_count = mrb_ary_len(mrb, iv_ary); int iv_count = RARRAY_LEN(iv_ary);
write_fixnum(ctx, iv_count); write_fixnum(ctx, iv_count);
int i; int i;