admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:mruby/mruby

Browse Source
This commit is contained in:
YAMAMOTO Masaya
2017-11-04 01:23:12 +09:00
parent b70d69de09 e7fe6ee263
commit 625f9f6fa3
48 changed files with 1009 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mruby.h
+10 -7
View File
@@ -862,11 +862,14 @@ mrb_get_mid(mrb_state *mrb) /* get method symbol */
return mrb->c->ci->mid;
}
static inline mrb_int
mrb_get_argc(mrb_state *mrb) /* get argc */
{
return mrb->c->ci->argc;
}
/**
* Retrieve number of arguments from mrb_state.
*
* Correctly handles *splat arguments.
*/
MRB_API mrb_int mrb_get_argc(mrb_state *mrb);
MRB_API mrb_value* mrb_get_argv(mrb_state *mrb);
/* `strlen` for character string literals (use with caution or `strlen` instead)
Adjacent string literals are concatenated in C/C++ in translation phase 6.
@@ -1238,7 +1241,7 @@ MRB_API mrb_value mrb_format(mrb_state *mrb, const char *format, ...);
/* use naive memcpy and memset instead */
#undef memcpy
#undef memset
static inline void*
static void*
mrbmemcpy(void *dst, const void *src, size_t n)
{
char *d = (char*)dst;
@@ -1249,7 +1252,7 @@ mrbmemcpy(void *dst, const void *src, size_t n)
}
#define memcpy(a,b,c) mrbmemcpy(a,b,c)
static inline void*
static void*
mrbmemset(void *s, int c, size_t n)
{
char *t = (char*)s;