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

* parse.y (f_larglist): allow bv_decl at the end of lambda

Browse source 
argument list.  [EXPERIMENTAL]

* parse.y (new_bv_gen): allow local variable shadowing, with
  warning in verbose mode.

* ext/socket/socket.c (ruby_connect): break immediately if a
  socket is non-blocking.  [ruby-talk:111654]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8855 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2005-07-28 02:33:28 +00:00
parent bd3404ced0
commit 989b0a6d1e
4 changed files with 67 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,11 @@
Thu Jul 28 11:30:57 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (f_larglist): allow bv_decl at the end of lambda
argument list. [EXPERIMENTAL]
* parse.y (new_bv_gen): allow local variable shadowing, with
warning in verbose mode.
Wed Jul 27 23:23:54 2005 Yukihiro Matsumoto <matz@ruby-lang.org> Wed Jul 27 23:23:54 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* gc.c (obj_free): make message formant consistent with one from * gc.c (obj_free): make message formant consistent with one from
@ -7091,6 +7099,11 @@ Wed Sep 8 15:19:49 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/text.rb: add TkText#clear and erase * ext/tk/lib/tk/text.rb: add TkText#clear and erase
Tue Sep 7 15:17:49 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/socket/socket.c (ruby_connect): break immediately if a
socket is non-blocking. [ruby-talk:111654]
Tue Sep 7 12:48:22 2004 NAKAMURA Usaku <usa@ruby-lang.org> Tue Sep 7 12:48:22 2004 NAKAMURA Usaku <usa@ruby-lang.org>
* {bcc32,win32,wince}/Makefile.sub (config.h): add fcntl. * {bcc32,win32,wince}/Makefile.sub (config.h): add fcntl.

8
ext/socket/socket.c
View file

@ -916,7 +916,8 @@ wait_connectable0(fd, fds_w, fds_e)
int fd; int fd;
rb_fdset_t *fds_w, *fds_e; rb_fdset_t *fds_w, *fds_e;
{ {
int sockerr, sockerrlen; int sockerr;
socklen_t sockerrlen;
for (;;) { for (;;) {
rb_fd_zero(fds_w); rb_fd_zero(fds_w);
@ -1011,7 +1012,9 @@ ruby_connect(fd, sockaddr, len, socks)
int socks; int socks;
{ {
int status; int status;
#if defined(HAVE_FCNTL)
int mode; int mode;
#endif
#if WAIT_IN_PROGRESS > 0 #if WAIT_IN_PROGRESS > 0
int wait_in_progress = -1; int wait_in_progress = -1;
int sockerr, sockerrlen; int sockerr, sockerrlen;
@ -1055,6 +1058,9 @@ ruby_connect(fd, sockaddr, len, socks)
#ifdef EINPROGRESS #ifdef EINPROGRESS
case EINPROGRESS: case EINPROGRESS:
#endif #endif
#if defined(HAVE_FCNTL)
if (mode & NONBLOCKING) break;
#endif
#if WAIT_IN_PROGRESS > 0 #if WAIT_IN_PROGRESS > 0
sockerrlen = sizeof(sockerr); sockerrlen = sizeof(sockerr);
status = getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen); status = getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen);

77
parse.y
View file

@ -393,15 +393,18 @@ static VALUE ripper_id2sym _((ID));
# define rb_warnI(fmt,a) rb_warn(fmt,a) # define rb_warnI(fmt,a) rb_warn(fmt,a)
# define rb_warnS(fmt,a) rb_warn(fmt,a) # define rb_warnS(fmt,a) rb_warn(fmt,a)
# define rb_warning0(fmt) rb_warning(fmt) # define rb_warning0(fmt) rb_warning(fmt)
# define rb_warningS(fmt,a) rb_warning(fmt,a)
#else #else
# define rb_warn0(fmt) ripper_warn0(parser, fmt) # define rb_warn0(fmt) ripper_warn0(parser, fmt)
# define rb_warnI(fmt,a) ripper_warnI(parser, fmt, a) # define rb_warnI(fmt,a) ripper_warnI(parser, fmt, a)
# define rb_warnS(fmt,a) ripper_warnS(parser, fmt, a) # define rb_warnS(fmt,a) ripper_warnS(parser, fmt, a)
# define rb_warning0(fmt) ripper_warning0(parser, fmt) # define rb_warning0(fmt) ripper_warning0(parser, fmt)
# define rb_warningS(fmt,a) ripper_warningS(parser, fmt, a)
static void ripper_warn0 _((struct parser_params*, const char*)); static void ripper_warn0 _((struct parser_params*, const char*));
static void ripper_warnI _((struct parser_params*, const char*, int)); static void ripper_warnI _((struct parser_params*, const char*, int));
static void ripper_warnS _((struct parser_params*, const char*, const char*)); static void ripper_warnS _((struct parser_params*, const char*, const char*));
static void ripper_warning0 _((struct parser_params*, const char*)); static void ripper_warning0 _((struct parser_params*, const char*));
static void ripper_warningS _((struct parser_params*, const char*, const char*));
#endif #endif
#ifdef RIPPER #ifdef RIPPER
@ -414,7 +417,7 @@ static void ripper_compile_error _((struct parser_params*, const char *fmt, ...)
# define PARSER_ARG # define PARSER_ARG
#endif #endif
#define NEW_BLOCK_VAR(b, v) NEW_NODE(NODE_BLOCK_PASS, 0, b, v) #define NEW_BLOCK_PARAM(b, v) NEW_NODE(NODE_BLOCK_PASS, 0, b, v)
/* Older versions of Yacc set YYMAXDEPTH to a very low value by default (150, /* Older versions of Yacc set YYMAXDEPTH to a very low value by default (150,
for instance). This is too low for Ruby to parse some files, such as for instance). This is too low for Ruby to parse some files, such as
@ -507,7 +510,7 @@ static void ripper_compile_error _((struct parser_params*, const char *fmt, ...)
%type <node> mrhs superclass block_call block_command %type <node> mrhs superclass block_call block_command
%type <node> f_arglist f_args f_rest_arg f_optarg f_opt f_block_arg opt_f_block_arg %type <node> f_arglist f_args f_rest_arg f_optarg f_opt f_block_arg opt_f_block_arg
%type <node> assoc_list assocs assoc undef_list backref string_dvar %type <node> assoc_list assocs assoc undef_list backref string_dvar
%type <node> for_var block_var opt_block_var block_var_def block_param %type <node> for_var block_param opt_block_param block_param_def block_param0
%type <node> opt_bv_decl bv_decls bv_decl lambda f_larglist lambda_body %type <node> opt_bv_decl bv_decls bv_decl lambda f_larglist lambda_body
%type <node> brace_block cmd_brace_block do_block lhs none fitem %type <node> brace_block cmd_brace_block do_block lhs none fitem
%type <node> mlhs mlhs_head mlhs_basic mlhs_entry mlhs_item mlhs_node %type <node> mlhs mlhs_head mlhs_basic mlhs_entry mlhs_item mlhs_node
@ -1106,7 +1109,7 @@ cmd_brace_block : tLBRACE_ARG
/*% /*%
%*/ %*/
} }
opt_block_var {$<vars>$ = ruby_dyna_vars;} opt_block_param {$<vars>$ = ruby_dyna_vars;}
compstmt compstmt
'}' '}'
{ {
@ -2962,7 +2965,7 @@ for_var : lhs
| mlhs | mlhs
; ;
block_param : mlhs_item block_param0 : mlhs_item
{ {
/*%%%*/ /*%%%*/
$$ = NEW_LIST($1); $$ = NEW_LIST($1);
@ -2970,7 +2973,7 @@ block_param : mlhs_item
$$ = mlhs_add(mlhs_new(), $1); $$ = mlhs_add(mlhs_new(), $1);
%*/ %*/
} }
| block_param ',' mlhs_item | block_param0 ',' mlhs_item
{ {
/*%%%*/ /*%%%*/
$$ = list_append($1, $3); $$ = list_append($1, $3);
@ -2980,7 +2983,7 @@ block_param : mlhs_item
} }
; ;
block_var : block_param block_param : block_param0
{ {
/*%%%*/ /*%%%*/
if ($1->nd_alen == 1) { if ($1->nd_alen == 1) {
@ -2994,7 +2997,7 @@ block_var : block_param
$$ = blockvar_new($1); $$ = blockvar_new($1);
%*/ %*/
} }
| block_param ',' | block_param0 ','
{ {
/*%%%*/ /*%%%*/
$$ = NEW_MASGN($1, 0); $$ = NEW_MASGN($1, 0);
@ -3002,33 +3005,33 @@ block_var : block_param
$$ = blockvar_new($1); $$ = blockvar_new($1);
%*/ %*/
} }
| block_param ',' tAMPER lhs | block_param0 ',' tAMPER lhs
{ {
/*%%%*/ /*%%%*/
$$ = NEW_BLOCK_VAR($4, NEW_MASGN($1, 0)); $$ = NEW_BLOCK_PARAM($4, NEW_MASGN($1, 0));
/*% /*%
$$ = blockvar_add_block(blockvar_new($1), $4); $$ = blockvar_add_block(blockvar_new($1), $4);
%*/ %*/
} }
| block_param ',' tSTAR lhs ',' tAMPER lhs | block_param0 ',' tSTAR lhs ',' tAMPER lhs
{ {
/*%%%*/ /*%%%*/
$$ = NEW_BLOCK_VAR($7, NEW_MASGN($1, $4)); $$ = NEW_BLOCK_PARAM($7, NEW_MASGN($1, $4));
/*% /*%
$$ = blockvar_add_star(blockvar_new($1), $4); $$ = blockvar_add_star(blockvar_new($1), $4);
$$ = blockvar_add_block($$, $7); $$ = blockvar_add_block($$, $7);
%*/ %*/
} }
| block_param ',' tSTAR ',' tAMPER lhs | block_param0 ',' tSTAR ',' tAMPER lhs
{ {
/*%%%*/ /*%%%*/
$$ = NEW_BLOCK_VAR($6, NEW_MASGN($1, -1)); $$ = NEW_BLOCK_PARAM($6, NEW_MASGN($1, -1));
/*% /*%
$$ = blockvar_add_star(blockvar_new($1), Qnil); $$ = blockvar_add_star(blockvar_new($1), Qnil);
$$ = blockvar_add_block($$, $6); $$ = blockvar_add_block($$, $6);
%*/ %*/
} }
| block_param ',' tSTAR lhs | block_param0 ',' tSTAR lhs
{ {
/*%%%*/ /*%%%*/
$$ = NEW_MASGN($1, $4); $$ = NEW_MASGN($1, $4);
@ -3036,7 +3039,7 @@ block_var : block_param
$$ = blockvar_add_star(blockvar_new($1), $4); $$ = blockvar_add_star(blockvar_new($1), $4);
%*/ %*/
} }
| block_param ',' tSTAR | block_param0 ',' tSTAR
{ {
/*%%%*/ /*%%%*/
$$ = NEW_MASGN($1, -1); $$ = NEW_MASGN($1, -1);
@ -3047,7 +3050,7 @@ block_var : block_param
| tSTAR lhs ',' tAMPER lhs | tSTAR lhs ',' tAMPER lhs
{ {
/*%%%*/ /*%%%*/
$$ = NEW_BLOCK_VAR($5, NEW_MASGN(0, $2)); $$ = NEW_BLOCK_PARAM($5, NEW_MASGN(0, $2));
/*% /*%
$$ = blockvar_add_star(blockvar_new(Qnil), $2); $$ = blockvar_add_star(blockvar_new(Qnil), $2);
$$ = blockvar_add_block($$, $5); $$ = blockvar_add_block($$, $5);
@ -3056,7 +3059,7 @@ block_var : block_param
| tSTAR ',' tAMPER lhs | tSTAR ',' tAMPER lhs
{ {
/*%%%*/ /*%%%*/
$$ = NEW_BLOCK_VAR($4, NEW_MASGN(0, -1)); $$ = NEW_BLOCK_PARAM($4, NEW_MASGN(0, -1));
/*% /*%
$$ = blockvar_add_star(blockvar_new(Qnil), Qnil); $$ = blockvar_add_star(blockvar_new(Qnil), Qnil);
$$ = blockvar_add_block($$, $4); $$ = blockvar_add_block($$, $4);
@ -3081,24 +3084,24 @@ block_var : block_param
| tAMPER lhs | tAMPER lhs
{ {
/*%%%*/ /*%%%*/
$$ = NEW_BLOCK_VAR($2, (NODE*)1); $$ = NEW_BLOCK_PARAM($2, (NODE*)1);
/*% /*%
$$ = blockvar_add_block(blockvar_new(Qnil), $2); $$ = blockvar_add_block(blockvar_new(Qnil), $2);
%*/ %*/
} }
; ;
opt_block_var : none opt_block_param : none
{ {
/*%%%*/ /*%%%*/
$$ = NEW_ITER(0, 0, 0); $$ = NEW_ITER(0, 0, 0);
/*% /*%
%*/ %*/
} }
| block_var_def | block_param_def
; ;
block_var_def : '|' opt_bv_decl '|' block_param_def : '|' opt_bv_decl '|'
{ {
/*%%%*/ /*%%%*/
$$ = NEW_ITER((NODE*)1, 0, $2); $$ = NEW_ITER((NODE*)1, 0, $2);
@ -3114,7 +3117,7 @@ block_var_def : '|' opt_bv_decl '|'
$$ = blockvar_new(mlhs_new()); $$ = blockvar_new(mlhs_new());
%*/ %*/
} }
| '|' block_var opt_bv_decl '|' | '|' block_param opt_bv_decl '|'
{ {
/*%%%*/ /*%%%*/
$$ = NEW_ITER($2, 0, $3); $$ = NEW_ITER($2, 0, $3);
@ -3250,7 +3253,7 @@ do_block : kDO_BLOCK
$<num>1 = ruby_sourceline; $<num>1 = ruby_sourceline;
/*% %*/ /*% %*/
} }
opt_block_var opt_block_param
{ {
/*%%%*/ /*%%%*/
$<vars>$ = ruby_dyna_vars; $<vars>$ = ruby_dyna_vars;
@ -3388,7 +3391,7 @@ brace_block : '{'
$<num>1 = ruby_sourceline; $<num>1 = ruby_sourceline;
/*% %*/ /*% %*/
} }
opt_block_var opt_block_param
{ {
/*%%%*/ /*%%%*/
$<vars>$ = ruby_dyna_vars; $<vars>$ = ruby_dyna_vars;
@ -3414,7 +3417,7 @@ brace_block : '{'
$<num>1 = ruby_sourceline; $<num>1 = ruby_sourceline;
/*% %*/ /*% %*/
} }
opt_block_var opt_block_param
{ {
/*%%%*/ /*%%%*/
$<vars>$ = ruby_dyna_vars; $<vars>$ = ruby_dyna_vars;
@ -7302,16 +7305,18 @@ new_bv_gen(parser, name, val)
ID name; ID name;
NODE *val; NODE *val;
{ {
if (is_local_id(name) && !rb_dvar_defined(name) && !local_id(name)) { if (!is_local_id(name)) {
dyna_var(name); compile_error(PARSER_ARG "invalid local variable - %s",
return NEW_DASGN_CURR(name, val);
}
else {
compile_error(PARSER_ARG "local variable name conflict - %s",
rb_id2name(name)); rb_id2name(name));
return 0; return 0;
} }
if (rb_dvar_defined(name) || local_id(name)) {
rb_warningS("shadowing outer local variable - %s", rb_id2name(name));
}
dyna_var(name);
return NEW_DASGN_CURR(name, val);
} }
static NODE * static NODE *
aryset_gen(parser, recv, idx) aryset_gen(parser, recv, idx)
struct parser_params *parser; struct parser_params *parser;
@ -9029,6 +9034,16 @@ ripper_warning0(parser, fmt)
rb_funcall(parser->value, rb_intern("warning"), 1, rb_str_new2(fmt)); rb_funcall(parser->value, rb_intern("warning"), 1, rb_str_new2(fmt));
} }
static void
ripper_warningS(parser, fmt)
struct parser_params *parser;
const char *fmt;
const char *str;
{
rb_funcall(parser->value, rb_intern("warning"), 2,
rb_str_new2(fmt), rb_str_new2(str));
}
static VALUE ripper_lex_get_generic _((struct parser_params *, VALUE)); static VALUE ripper_lex_get_generic _((struct parser_params *, VALUE));
static VALUE static VALUE

2
sprintf.c
View file

@ -855,7 +855,7 @@ ruby__sfvwrite(fp, uio)
{ {
struct __siov *iov; struct __siov *iov;
VALUE result = (VALUE)fp->_bf._base; VALUE result = (VALUE)fp->_bf._base;
char *buf = fp->_p; char *buf = (char*)fp->_p;
size_t len, n; size_t len, n;
int blen = buf - RSTRING(result)->ptr, bsiz = fp->_w; int blen = buf - RSTRING(result)->ptr, bsiz = fp->_w;