[ruby-dev:22858] Re: parse error in ruby-1.8.0 (PR#1221)

なかだです。

At 11 Feb 2004 13:49:15 -0800,
Ted Chang wrote:
> Sorry to bother you again. Although the simple example
> you have seem to compile fine under ruby-1.8.1 but the
> original example I gave still has problem with the
> extra space before '(' on line 24. Please see the attached.
> 
> Ted

> [2 test181.rb <text/plain; iso-8859-1 (7bit)>]
> #!/usr/bin/env ruby
> =begin
> def p(i)
>   puts i
> end
> p (
>   1
>   )
> =end
> 
> def f_rtn_thread_fr_blk(&code)
>   nt = Thread.new do
>     code.call
>   end
>   return nt
> end
> 
> def f_take_2_threads(*args)
>   args.each do |t|
>     puts t
>   end
> end
> 
> f_take_2_threads (
>                  f_rtn_thread_fr_blk {
>                    puts "hello from thread 1"
>                    # ...etc.
>                  },
>                  f_rtn_thread_fr_blk {
>                    puts "hello from thread 2"
>                    # ...etc.
>                  }
>                  )

こういうのが来たんですが、いっそ閉じカッコの前の改行は一律無視
することにしてはどうでしょうか。


Index: parse.y
===================================================================
RCS file: /cvs/ruby/src/ruby/parse.y,v
retrieving revision 1.315
diff -u -2 -p -r1.315 parse.y
--- parse.y	3 Feb 2004 02:23:20 -0000	1.315
+++ parse.y	12 Feb 2004 02:17:35 -0000
@@ -735,5 +735,5 @@ command		: operation command_args       
 
 mlhs		: mlhs_basic
-		| tLPAREN mlhs_entry ')'
+		| tLPAREN mlhs_entry rparen
 		    {
 			$$ = $2;
@@ -742,5 +742,5 @@ mlhs		: mlhs_basic
 
 mlhs_entry	: mlhs_basic
-		| tLPAREN mlhs_entry ')'
+		| tLPAREN mlhs_entry rparen
 		    {
 			$$ = NEW_MASGN(NEW_LIST($2), 0);
@@ -775,5 +775,5 @@ mlhs_basic	: mlhs_head
 
 mlhs_item	: mlhs_node
-		| tLPAREN mlhs_entry ')'
+		| tLPAREN mlhs_entry rparen
 		    {
 			$$ = $2;
@@ -1243,14 +1243,14 @@ paren_args	: '(' none ')'
 			$$ = $2;
 		    }
-		| '(' call_args opt_nl ')'
+		| '(' call_args rparen
 		    {
 			$$ = $2;
 		    }
-		| '(' block_call opt_nl ')'
+		| '(' block_call rparen
 		    {
 		        rb_warn("parenthesize argument for future version");
 			$$ = NEW_LIST($2);
 		    }
-		| '(' args ',' block_call opt_nl ')'
+		| '(' args ',' block_call rparen
 		    {
 		        rb_warn("parenthesize argument for future version");
@@ -1373,10 +1373,10 @@ command_args	:  {
 
 open_args	: call_args
-		| tLPAREN_ARG  {lex_state = EXPR_ENDARG;} ')'
+		| tLPAREN_ARG  {lex_state = EXPR_ENDARG;} rparen
 		    {
 		        rb_warn("don't put space before argument parentheses");
 			$$ = 0;
 		    }
-		| tLPAREN_ARG call_args2 {lex_state = EXPR_ENDARG;} ')'
+		| tLPAREN_ARG call_args2 {lex_state = EXPR_ENDARG;} rparen
 		    {
 		        rb_warn("don't put space before argument parentheses");
@@ -1422,4 +1422,7 @@ mrhs		: args ',' arg_value
 		;
 
+rparen		: opt_nl ')'
+		;
+
 primary		: literal
 		| strings
@@ -1444,5 +1447,5 @@ primary		: literal
 			nd_set_line($$, $<num>1);
 		    }
-		| tLPAREN_ARG expr {lex_state = EXPR_ENDARG;} opt_nl ')'
+		| tLPAREN_ARG expr {lex_state = EXPR_ENDARG;} rparen
 		    {
 		        rb_warning("(...) interpreted as grouped expression");
@@ -1486,9 +1489,9 @@ primary		: literal
 			$$ = NEW_RETURN(0);
 		    }
-		| kYIELD '(' call_args ')'
+		| kYIELD '(' call_args rparen
 		    {
 			$$ = new_yield($3);
 		    }
-		| kYIELD '(' ')'
+		| kYIELD '(' rparen
 		    {
 			$$ = NEW_YIELD(0, Qfalse);
@@ -1498,5 +1501,5 @@ primary		: literal
 			$$ = NEW_YIELD(0, Qfalse);
 		    }
-		| kDEFINED opt_nl '(' {in_defined = 1;} expr ')'
+		| kDEFINED opt_nl '(' {in_defined = 1;} expr rparen
 		    {
 		        in_defined = 0;
@@ -2191,5 +2194,5 @@ superclass	: term
 		;
 
-f_arglist	: '(' f_args opt_nl ')'
+f_arglist	: '(' f_args rparen
 		    {
 			$$ = $2;
@@ -2344,5 +2347,5 @@ singleton	: var_ref
 			}
 		    }
-		| '(' {lex_state = EXPR_BEG;} expr opt_nl ')'
+		| '(' {lex_state = EXPR_BEG;} expr rparen
 		    {
 			if ($3 == 0) {
@@ -2558,4 +2561,9 @@ yycompile(f, line)
     ruby_sourcefile = rb_source_filename(f);
     n = yyparse();
+    if (compile_for_eval) {
+	NODE *begin = ruby_eval_tree_begin;
+	ruby_eval_tree_begin = 0;
+	ruby_eval_tree = block_append(begin, ruby_eval_tree);
+    }
     ruby_debug_lines = 0;
     compile_for_eval = 0;


-- 
--- 僕の前にBugはない。
--- 僕の後ろにBugはできる。
    中田 伸悦