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 remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	src/time.c
This commit is contained in:
Mitchell Blank Jr
2012-05-22 01:02:49 -07:00
parent dd5dd821aa abacbf6672
commit 8c084b9645
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mruby.h
+1 -1
View File
@@ -162,7 +162,7 @@ mrb_nil_value()
mrb_value v;
v.tt = MRB_TT_FALSE;
v.value.p = 0;
v.value.i = 0;
return v;
}
src/parse.y
+6
View File
@@ -10,6 +10,12 @@
#define YYDEBUG 1
#define YYERROR_VERBOSE 1
/*
* Force yacc to use our memory management. This is a little evil because
* the macros assume that "parser_state *p" is in scope
*/
#define YYMALLOC(n) mrb_malloc(p->mrb, (n))
#define YYFREE(o) mrb_free(p->mrb, (o))
#define YYSTACK_USE_ALLOCA 0
#include "mruby.h"
src/time.c
+2 -4
View File
@@ -266,8 +266,7 @@ time_mktime(mrb_state *mrb, mrb_int ayear, mrb_int amonth, mrb_int aday,
static mrb_value
mrb_time_gm(mrb_state *mrb, mrb_value self)
{
mrb_int ayear = 0, amonth = 1, aday = 1, ahour = 0,
amin = 0, asec = 0, ausec = 0;
mrb_int ayear = 0, amonth = 1, aday = 1, ahour = 0, amin = 0, asec = 0, ausec = 0;
mrb_get_args(mrb, "iiiiiii",
&ayear, &amonth, &aday, &ahour, &amin, &asec, &ausec);
@@ -281,8 +280,7 @@ mrb_time_gm(mrb_state *mrb, mrb_value self)
static mrb_value
mrb_time_local(mrb_state *mrb, mrb_value self)
{
mrb_int ayear = 0, amonth = 1, aday = 1, ahour = 0,
amin = 0, asec = 0, ausec = 0;
mrb_int ayear = 0, amonth = 1, aday = 1, ahour = 0, amin = 0, asec = 0, ausec = 0;
mrb_get_args(mrb, "iiiiiii",
&ayear, &amonth, &aday, &ahour, &amin, &asec, &ausec);