mirror of
https://github.com/mruby/mruby
synced 2026-06-08 16:11:16 +00:00
Merge branch 'master' of github.com:mruby/mruby
This commit is contained in:
+7
-4
@@ -147,7 +147,7 @@ mrb_obj_value(void *p)
|
||||
}
|
||||
|
||||
static inline mrb_value
|
||||
mrb_false_value()
|
||||
mrb_false_value(void)
|
||||
{
|
||||
mrb_value v;
|
||||
|
||||
@@ -157,7 +157,7 @@ mrb_false_value()
|
||||
}
|
||||
|
||||
static inline mrb_value
|
||||
mrb_nil_value()
|
||||
mrb_nil_value(void)
|
||||
{
|
||||
mrb_value v;
|
||||
|
||||
@@ -167,7 +167,7 @@ mrb_nil_value()
|
||||
}
|
||||
|
||||
static inline mrb_value
|
||||
mrb_true_value()
|
||||
mrb_true_value(void)
|
||||
{
|
||||
mrb_value v;
|
||||
|
||||
@@ -177,7 +177,7 @@ mrb_true_value()
|
||||
}
|
||||
|
||||
static inline mrb_value
|
||||
mrb_undef_value()
|
||||
mrb_undef_value(void)
|
||||
{
|
||||
mrb_value v;
|
||||
|
||||
@@ -416,6 +416,9 @@ mrb_value mrb_check_funcall(mrb_state *mrb, mrb_value recv, mrb_sym mid, int arg
|
||||
#define ISXDIGIT(c) (ISASCII(c) && isxdigit((int)(unsigned char)(c)))
|
||||
#endif
|
||||
|
||||
mrb_value mrb_exc_new(mrb_state *mrb, struct RClass *c, const char *ptr, long len);
|
||||
void mrb_exc_raise(mrb_state *mrb, mrb_value exc);
|
||||
|
||||
int mrb_block_given_p(void);
|
||||
void mrb_raise(mrb_state *mrb, struct RClass *c, const char *fmt, ...);
|
||||
void rb_raise(struct RClass *c, const char *fmt, ...);
|
||||
|
||||
@@ -14,8 +14,8 @@ extern "C" {
|
||||
typedef struct global_variable {
|
||||
int counter;
|
||||
mrb_value *data;
|
||||
mrb_value (*getter)();
|
||||
void (*setter)();
|
||||
mrb_value (*getter)(void);
|
||||
void (*setter)(void);
|
||||
//void (*marker)();
|
||||
//int block_trace;
|
||||
//struct trace_var *trace;
|
||||
|
||||
+1
-2
@@ -188,8 +188,7 @@ sym_to_sym(mrb_state *mrb, mrb_value sym)
|
||||
#define is_identchar(c) (SIGN_EXTEND_CHAR(c)!=-1&&(ISALNUM(c) || (c) == '_'))
|
||||
|
||||
static int
|
||||
is_special_global_name(m)
|
||||
const char *m;
|
||||
is_special_global_name(const char* m)
|
||||
{
|
||||
switch (*m) {
|
||||
case '~': case '*': case '$': case '?': case '!': case '@':
|
||||
|
||||
Reference in New Issue
Block a user