diff options
| author | Daniel Bovensiepen <[email protected]> | 2012-11-21 15:58:52 +0800 |
|---|---|---|
| committer | Daniel Bovensiepen <[email protected]> | 2012-11-21 15:58:52 +0800 |
| commit | 754c853300b8824d1b57e40e86280164bfd1a4dd (patch) | |
| tree | e8140d06028152be25725fb6dc3cded483139aa4 /src | |
| parent | ed92a86212c2428e64d385b2b89f1dcfcec265e6 (diff) | |
| parent | 8894cbe00f6202e2088000d2a3e7553fa7730bad (diff) | |
| download | mruby-754c853300b8824d1b57e40e86280164bfd1a4dd.tar.gz mruby-754c853300b8824d1b57e40e86280164bfd1a4dd.zip | |
Merge remote-tracking branch 'upstream/master' into mrbgems
Diffstat (limited to 'src')
| -rw-r--r-- | src/class.c | 1 | ||||
| -rw-r--r-- | src/math.c | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/class.c b/src/class.c index d95a05789..fe2baa4f2 100644 --- a/src/class.c +++ b/src/class.c @@ -1400,6 +1400,7 @@ mrb_init_class(mrb_state *mrb) make_metaclass(mrb, cls); /* name basic classes */ + mrb_define_const(mrb, bob, "BasicObject", mrb_obj_value(bob)); mrb_define_const(mrb, obj, "BasicObject", mrb_obj_value(bob)); mrb_define_const(mrb, obj, "Object", mrb_obj_value(obj)); mrb_define_const(mrb, obj, "Module", mrb_obj_value(mod)); diff --git a/src/math.c b/src/math.c index 9aae87acd..3e4550946 100644 --- a/src/math.c +++ b/src/math.c @@ -51,7 +51,7 @@ erf(double x) term *= xsqr/j; sum += term/(2*j+1); ++j; - } while (fabs(term)/sum > MATH_TOLERANCE); + } while (fabs(term/sum) > MATH_TOLERANCE); return two_sqrtpi*sum; } @@ -64,7 +64,8 @@ erfc(double x) double b = x; double c = x; double d = x*x+0.5; - double q1, q2; + double q1; + double q2 = b/d; double n = 1.0; double t; if (fabs(x) < 2.2) { |