mirror of
https://github.com/mruby/mruby
synced 2026-06-08 16:11:16 +00:00
Merge pull request #8 from unak/c-spec
Please respect the specification of C
This commit is contained in:
@@ -441,11 +441,14 @@ void mrb_bug(const char *fmt, ...);
|
||||
#ifdef __GNUC__
|
||||
# define NUM2CHR(x) __extension__ ({mrb_value num2chr_x = (x); NUM2CHR_internal(num2chr_x);})
|
||||
#else
|
||||
/* TODO: there is no definitions of RSTRING_* here, so cannot compile.
|
||||
static inline char
|
||||
NUM2CHR(mrb_value x)
|
||||
{
|
||||
return NUM2CHR_internal(x);
|
||||
}
|
||||
*/
|
||||
#define NUM2CHR(x) NUM2CHR_internal(x)
|
||||
#endif
|
||||
mrb_value mrb_io_gets(mrb_state *mrb, mrb_value);
|
||||
mrb_value mrb_io_getbyte(mrb_state *mrb, mrb_value);
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
int color:3;\
|
||||
unsigned int flags:21;\
|
||||
struct RClass *c;\
|
||||
struct RBasic *gcnext;
|
||||
struct RBasic *gcnext
|
||||
|
||||
|
||||
/* white: 011, black: 100, gray: 000 */
|
||||
|
||||
+1
-1
@@ -68,7 +68,7 @@ mrb_pool_alloc(mrb_pool *pool, size_t len)
|
||||
if (page->offset + len <= page->len) {
|
||||
n = page->offset;
|
||||
page->offset += len;
|
||||
page->last = (void*)page->page+n;
|
||||
page->last = (char*)page->page+n;
|
||||
return page->last;
|
||||
}
|
||||
page = page->next;
|
||||
|
||||
+2
-2
@@ -632,14 +632,14 @@ transcode_restartable0(mrb_state *mrb,
|
||||
}
|
||||
continue;
|
||||
case FUNii:
|
||||
next_info = (mrb_value)(*tr->func_ii)(TRANSCODING_STATE(tc), next_info);
|
||||
next_info = (*tr->func_ii)(TRANSCODING_STATE(tc), next_info);
|
||||
goto follow_info;
|
||||
case FUNsi:
|
||||
{
|
||||
const unsigned char *char_start;
|
||||
size_t char_len;
|
||||
char_start = transcode_char_start(tc, *in_pos, inchar_start, in_p, &char_len);
|
||||
next_info = (mrb_value)(*tr->func_si)(TRANSCODING_STATE(tc), char_start, (size_t)char_len);
|
||||
next_info = (*tr->func_si)(TRANSCODING_STATE(tc), char_start, (size_t)char_len);
|
||||
goto follow_info;
|
||||
}
|
||||
case FUNio:
|
||||
|
||||
Reference in New Issue
Block a user