summaryrefslogtreecommitdiff
path: root/parse.y
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-10-04 17:51:11 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-10-04 17:51:11 +0000
commit415283ac95e1dd93518836dbaad4545cca4dfa57 (patch)
tree585ea22726278cfc32e1b108583e578732c07853 /parse.y
parent28af5f6cf58158ea366cf31177db7b4ced43a714 (diff)
* marshal.c (w_object): instance variable dump do not cause error
for objects that cannot be dumped, if they traversed from marshal_dump. they are just ignored. * gc.c (Init_stack): cast "space" (doble value) into unsigned int. should run on PowerPC. * eval.c (rb_eval): should not execute else part if any exception is caught. [ruby-dev:21482] * parse.y (f_args): should allow unparenthesized block argument. * parse.y (f_rest_arg): should allow unparenthesized rest argument. * lib/irb/ruby-lex.rb (RubyLex::identify_identifier): support 'class ::Foo' syntax. [ruby-talk:83514] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4680 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r--parse.y14
1 files changed, 11 insertions, 3 deletions
diff --git a/parse.y b/parse.y
index 7b3d2e6..7f70de0 100644
--- a/parse.y
+++ b/parse.y
@@ -2267,7 +2267,11 @@ f_optarg : f_opt
}
;
-f_rest_arg : tSTAR tIDENTIFIER
+restarg_mark : '*'
+ | tSTAR
+ ;
+
+f_rest_arg : restarg_mark tIDENTIFIER
{
if (!is_local_id($2))
yyerror("rest argument must be local variable");
@@ -2275,13 +2279,17 @@ f_rest_arg : tSTAR tIDENTIFIER
yyerror("duplicate rest argument name");
$$ = local_cnt($2);
}
- | tSTAR
+ | restarg_mark
{
$$ = -2;
}
;
-f_block_arg : tAMPER tIDENTIFIER
+blkarg_mark : '&'
+ | tAMPER
+ ;
+
+f_block_arg : blkarg_mark tIDENTIFIER
{
if (!is_local_id($2))
yyerror("block argument must be local variable");