kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* math.c (math_acos): check errno after operation. ditto for

Browse source 
asin, acosh, atanh, log, log10 and sqrt.

* eval.c (rb_add_method): initialize should always be private.

* parse.y (expr): add rescue modifier rule.

* parse.y (command_call): return, break and next with argument is
  now part of this rule.

* parse.y (yylex): "a" in "a /5" should be considered as a local
  variable. [experimental]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3041 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2002-11-14 06:18:59 +00:00
parent e60d556321
commit a1c02ee495
9 changed files with 112 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ChangeLog
View file

@ -1,3 +1,15 @@
Thu Nov 14 08:23:42 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
* math.c (math_acos): check errno after operation. ditto for
asin, acosh, atanh, log, log10 and sqrt.
* eval.c (rb_add_method): initialize should always be private.
* parse.y (expr): add rescue modifier rule.
* parse.y (command_call): return, break and next with argument is
now part of this rule.
Wed Nov 13 16:22:38 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* configure.in (DLDFLAGS): removed -Wl,-no-undefined to
@ -29,6 +41,11 @@ Sat Nov 9 11:39:45 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* eval.c: remove ENABLE_TRACE/DISABLE_TRACE to trace child nodes of
c-call. [ruby-dev:18699]
Fri Nov 8 04:16:55 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (yylex): "a" in "a /5" should be considered as a local
variable. [experimental]
Thu Nov 7 09:51:37 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* eval.c (rb_yield_0): should enable trace for non-cfunc nodes.

1
MANIFEST
View file

@ -255,7 +255,6 @@ missing/strerror.c
missing/strftime.c
missing/strncasecmp.c
missing/strstr.c
missing/strtod.c
missing/strtol.c
missing/strtoul.c
missing/vsnprintf.c

30
configure.in
View file

@ -464,36 +464,6 @@ fi
AC_FUNC_GETPGRP
AC_FUNC_SETPGRP
AC_CACHE_CHECK(for working strtod, rb_cv_func_strtod,
[AC_TRY_RUN([
double strtod ();
int
main()
{
{
/* Some versions of Linux strtod mis-parse strings with leading '+'. */
char *string = " +69";
char *term;
double value;
value = strtod(string, &term);
if (value != 69 || term != (string + 4))
exit(1);
}
{
/* Under Solaris 2.4, strtod returns the wrong value for the
terminating character under some conditions. */
char *string = "NaN";
char *term;
strtod(string, &term);
if (term != string && *(term - 1) == 0)
exit(1);
}
exit(0);
}
], rb_cv_func_strtod=yes, rb_cv_func_strtod=no, rb_cv_func_strtod=no)])
test $rb_cv_func_strtod = no && AC_LIBOBJ([strtod])
AC_C_BIGENDIAN
AC_C_CONST
AC_C_CHAR_UNSIGNED

11
eval.c
View file

@ -230,6 +230,10 @@ rb_clear_cache_by_class(klass)
}
}
static ID init, alloc, eqq, each, aref, aset, match, missing;
static ID added, singleton_added;
static ID __id__, __send__;
void
rb_add_method(klass, mid, node, noex)
VALUE klass;
@ -243,6 +247,9 @@ rb_add_method(klass, mid, node, noex)
if (ruby_safe_level >= 4 && (klass == rb_cObject || !OBJ_TAINTED(klass))) {
rb_raise(rb_eSecurityError, "Insecure: can't define method");
}
if (mid == init) {
noex = NOEX_PRIVATE | (noex & NOEX_NOSUPER);
}
if (OBJ_FROZEN(klass)) rb_error_frozen("class/module");
rb_clear_cache_by_id(mid);
body = NEW_METHOD(node, noex);
@ -313,10 +320,6 @@ rb_get_method_body(klassp, idp, noexp)
return body;
}
static ID init, alloc, eqq, each, aref, aset, match, missing;
static ID added, singleton_added;
static ID __id__, __send__;
static void
remove_method(klass, mid)
VALUE klass;

8
lib/delegate.rb
View file

@ -19,10 +19,10 @@
class Delegator
def initialize(obj)
preserved = ::Kernel.instance_methods
preserved = ::Kernel.public_instance_methods
preserved -= ["to_s","to_a","inspect","==","=~","==="]
for t in self.class.ancestors
preserved |= t.instance_methods
preserved |= t.public_instance_methods
preserved |= t.private_instance_methods
preserved |= t.protected_instance_methods
break if t == Delegator
@ -76,8 +76,8 @@ SimpleDelegater = SimpleDelegator
#
def DelegateClass(superclass)
klass = Class.new
methods = superclass.instance_methods(true)
methods -= ::Kernel.instance_methods
methods = superclass.public_instance_methods(true)
methods -= ::Kernel.public_instance_methods
methods |= ["to_s","to_a","inspect","==","=~","==="]
klass.module_eval <<-EOS
def initialize(obj)

7
lib/pstore.rb
View file

@ -102,7 +102,7 @@ class PStore
file.flock(read_only ? File::LOCK_SH : File::LOCK_EX)
if read_only
@table = Marshal::load(file)
elsif orig and (content = file.read) != nil
elsif orig and (content = file.read) != ""
@table = Marshal::load(content)
size = content.size
md5 = Digest::MD5.digest(content)
@ -118,7 +118,7 @@ class PStore
@abort = true
raise
ensure
if !read_only && !@abort
if !read_only and !@abort
file.rewind
content = Marshal::dump(@table)
if !md5 || size != content.size || md5 != Digest::MD5.digest(content)
@ -133,6 +133,9 @@ class PStore
end
end
end
if @abort and !orig
File.unlink(@filename)
end
@abort = false
end
ensure

91
math.c
View file

@ -12,6 +12,7 @@
#include "ruby.h"
#include <math.h>
#include <sys/errno.h>
VALUE rb_mMath;
@ -26,7 +27,6 @@ math_atan2(obj, y, x)
VALUE obj, x, y;
{
Need_Float2(y, x);
return rb_float_new(atan2(RFLOAT(y)->value, RFLOAT(x)->value));
}
@ -35,7 +35,6 @@ math_cos(obj, x)
VALUE obj, x;
{
Need_Float(x);
return rb_float_new(cos(RFLOAT(x)->value));
}
@ -61,24 +60,30 @@ static VALUE
math_acos(obj, x)
VALUE obj, x;
{
double d;
Need_Float(x);
/*
if (RFLOAT(x)->value < -1.0 || RFLOAT(x)->value > 1.0)
rb_raise(rb_eArgError, "Out of range (-1..1)");
*/
return rb_float_new(acos(RFLOAT(x)->value));
errno = 0;
d = acos(RFLOAT(x)->value);
if (errno) {
rb_sys_fail("acos");
}
return rb_float_new(d);
}
static VALUE
math_asin(obj, x)
VALUE obj, x;
{
double d;
Need_Float(x);
/*
if (RFLOAT(x)->value < -1.0 || RFLOAT(x)->value > 1.0)
rb_raise(rb_eArgError, "Out of range (-1..1)");
*/
return rb_float_new(asin(RFLOAT(x)->value));
errno = 0;
d = asin(RFLOAT(x)->value);
if (errno) {
rb_sys_fail("asin");
}
return rb_float_new(d);
}
static VALUE
@ -86,7 +91,6 @@ math_atan(obj, x)
VALUE obj, x;
{
Need_Float(x);
return rb_float_new(atan(RFLOAT(x)->value));
}
@ -122,7 +126,6 @@ math_sinh(obj, x)
VALUE obj, x;
{
Need_Float(x);
return rb_float_new(sinh(RFLOAT(x)->value));
}
@ -140,7 +143,6 @@ math_tanh(obj, x)
VALUE obj, x;
{
Need_Float(x);
return rb_float_new(tanh(RFLOAT(x)->value));
}
@ -148,9 +150,15 @@ static VALUE
math_acosh(obj, x)
VALUE obj, x;
{
double d;
Need_Float(x);
return rb_float_new(acosh(RFLOAT(x)->value));
errno = 0;
d = acosh(RFLOAT(x)->value);
if (errno) {
rb_sys_fail("acosh");
}
return rb_float_new(d);
}
static VALUE
@ -158,7 +166,6 @@ math_asinh(obj, x)
VALUE obj, x;
{
Need_Float(x);
return rb_float_new(asinh(RFLOAT(x)->value));
}
@ -166,9 +173,15 @@ static VALUE
math_atanh(obj, x)
VALUE obj, x;
{
double d;
Need_Float(x);
return rb_float_new(atanh(RFLOAT(x)->value));
errno = 0;
d = atanh(RFLOAT(x)->value);
if (errno) {
rb_sys_fail("atanh");
}
return rb_float_new(d);
}
static VALUE
@ -176,7 +189,6 @@ math_exp(obj, x)
VALUE obj, x;
{
Need_Float(x);
return rb_float_new(exp(RFLOAT(x)->value));
}
@ -189,28 +201,45 @@ static VALUE
math_log(obj, x)
VALUE obj, x;
{
double d;
Need_Float(x);
return rb_float_new(log(RFLOAT(x)->value));
errno = 0;
d = log(RFLOAT(x)->value);
if (errno) {
rb_sys_fail("log");
}
return rb_float_new(d);
}
static VALUE
math_log10(obj, x)
VALUE obj, x;
{
double d;
Need_Float(x);
return rb_float_new(log10(RFLOAT(x)->value));
errno = 0;
d = log10(RFLOAT(x)->value);
if (errno) {
rb_sys_fail("log10");
}
return rb_float_new(d);
}
static VALUE
math_sqrt(obj, x)
VALUE obj, x;
{
Need_Float(x);
double d;
if (RFLOAT(x)->value < 0.0) rb_raise(rb_eArgError, "square root for negative number");
return rb_float_new(sqrt(RFLOAT(x)->value));
Need_Float(x);
errno = 0;
d = sqrt(RFLOAT(x)->value);
if (errno) {
rb_sys_fail("sqrt");
}
return rb_float_new(d);
}
static VALUE
@ -230,11 +259,8 @@ static VALUE
math_ldexp(obj, x, n)
VALUE obj, x, n;
{
double d;
Need_Float(x);
return rb_float_new(d = ldexp(RFLOAT(x)->value, NUM2INT(n)));
return rb_float_new(ldexp(RFLOAT(x)->value, NUM2INT(n)));
}
static VALUE
@ -242,7 +268,6 @@ math_hypot(obj, x, y)
VALUE obj, x, y;
{
Need_Float2(x, y);
return rb_float_new(hypot(RFLOAT(x)->value, RFLOAT(y)->value));
}

4
missing.h
View file

@ -107,10 +107,6 @@ extern size_t strftime _((char *, size_t, const char *, const struct tm *));
extern char *strstr _((char *, char *));
#endif
#ifndef HAVE_STRTOD
extern double strtod _((const char *, char **));
#endif
/*
#ifndef HAVE_STRTOL
extern long strtol _((char *, char **, int));

40
parse.y
View file

@ -555,19 +555,7 @@ stmt : kALIAS fitem {lex_state = EXPR_FNAME;} fitem
| expr
;
expr : kRETURN call_args
{
$$ = NEW_RETURN(ret_args($2));
}
| kBREAK call_args
{
$$ = NEW_BREAK(ret_args($2));
}
| kNEXT call_args
{
$$ = NEW_NEXT(ret_args($2));
}
| command_call
expr : command_call
| expr kAND expr
{
$$ = logop(NODE_AND, $1, $3);
@ -584,6 +572,7 @@ expr : kRETURN call_args
{
$$ = NEW_NOT(cond($2));
}
| arg kRESCUE_MOD command_call
| arg
;
@ -596,6 +585,18 @@ expr_value : expr
command_call : command
| block_command
| kRETURN call_args
{
$$ = NEW_RETURN(ret_args($2));
}
| kBREAK call_args
{
$$ = NEW_BREAK(ret_args($2));
}
| kNEXT call_args
{
$$ = NEW_NEXT(ret_args($2));
}
;
block_command : block_call
@ -3129,10 +3130,6 @@ arg_ambiguous()
rb_warning("ambiguous first argument; make sure");
}
#if !defined(strtod) && !defined(HAVE_STDLIB_H)
double strtod ();
#endif
#define IS_ARG() (lex_state == EXPR_ARG || lex_state == EXPR_CMDARG)
static int
@ -4251,10 +4248,12 @@ yylex()
lex_state == EXPR_DOT ||
lex_state == EXPR_ARG ||
lex_state == EXPR_CMDARG) {
if (cmd_state)
if (cmd_state) {
lex_state = EXPR_CMDARG;
else
}
else {
lex_state = EXPR_ARG;
}
}
else {
lex_state = EXPR_END;
@ -4269,6 +4268,9 @@ yylex()
return -1;
}
last_id = yylval.id = rb_intern(tok());
if ((dyna_in_block() && rb_dvar_defined(last_id)) || local_id(last_id)) {
lex_state = EXPR_END;
}
return result;
}
}