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

This commit is contained in:
Yukihiro "Matz" Matsumoto
2014-03-03 13:25:25 +09:00
5 changed files with 14 additions and 6 deletions
+1 -1
View File
@@ -5,7 +5,7 @@
*/
#ifndef MRUBY_COMPILE_H
#define MRUBY_COMPILE_H 1
#define MRUBY_COMPILE_H
#if defined(__cplusplus)
extern "C" {
+1 -1
View File
@@ -5,7 +5,7 @@
*/
#ifndef MRUBY_DATA_H
#define MRUBY_DATA_H 1
#define MRUBY_DATA_H
#if defined(__cplusplus)
extern "C" {
+3 -3
View File
@@ -115,15 +115,15 @@ mrb_random_init(mrb_state *mrb, mrb_value self)
mrb_value seed;
mt_state *t;
DATA_TYPE(self) = &mt_state_type;
DATA_PTR(self) = NULL;
/* avoid memory leaks */
t = (mt_state*)DATA_PTR(self);
if (t) {
mrb_free(mrb, t);
}
DATA_TYPE(self) = &mt_state_type;
DATA_PTR(self) = NULL;
t = (mt_state *)mrb_malloc(mrb, sizeof(mt_state));
t->mti = N + 1;
+5 -1
View File
@@ -43,7 +43,11 @@ module MRuby
if params[:github]
params[:git] = "https://github.com/#{params[:github]}.git"
elsif params[:bitbucket]
params[:git] = "https://bitbucket.org/#{params[:bitbucket]}.git"
if params[:method] == "ssh"
params[:git] = "git@bitbucket.org:#{params[:bitbucket]}.git"
else
params[:git] = "https://bitbucket.org/#{params[:bitbucket]}.git"
end
end
if params[:core]
+4
View File
@@ -36,6 +36,10 @@ end
assert('String#*', '15.2.10.5.5') do
assert_equal 'aaaaa', 'a' * 5
assert_equal '', 'a' * 0
assert_raise(ArgumentError) do
'a' * -1
end
end
assert('String#[]', '15.2.10.5.6') do