ruby-core

On Sun, May 25, 2008 at 2:31 AM, Eric Mahurin <eric.mahurin@gmail.com> wrote:
> This patch is an independent but related one to my previous one.  It can be
> combined to allow for normal block syntax lambdas with default arguments.
> This patch allows you to make lambda's more concisely by simply removing the
> "lambda":

Here is the same patch as an attachment for those that had issues with
the patch in the message.  I haven't figured out how to make gmail not
base64 encode it.

Attachments (1)

block_lambda.patch (2.99 KB, text/x-diff)

Index: sample/test.rb
===================================================================
--- sample/test.rb	(revision 16585)
+++ sample/test.rb	(working copy)
@@ -1027,6 +1027,20 @@
 call_argument_test(false, lambda{|a,|})
 call_argument_test(false, lambda{|a,|}, 1,2)
 
+call_argument_test(true, {||})
+call_argument_test(false, {||}, 1)
+call_argument_test(true, {|a,|}, 1)
+call_argument_test(false, {|a,|})
+call_argument_test(false, {|a,|}, 1,2)
+
+call_argument_test(true, do end)
+call_argument_test(false, do end, 1)
+call_argument_test(true, do || end)
+call_argument_test(false, do || end, 1)
+call_argument_test(true, do |a,| end, 1)
+call_argument_test(false, do |a,| end)
+call_argument_test(false, do |a,| end, 1,2)
+
 call_argument_test(true, Proc.new{||})
 call_argument_test(true, Proc.new{||}, 1)
 call_argument_test(true, Proc.new{|a,|}, 1)
Index: parse.y
===================================================================
--- parse.y	(revision 16585)
+++ parse.y	(working copy)
@@ -670,6 +670,7 @@
 %type <node> assoc_list assocs assoc undef_list backref string_dvar for_var
 %type <node> block_param opt_block_param block_param_def f_opt
 %type <node> bv_decls opt_bv_decl bvar
+%type <node> block_lambda
 %type <node> lambda f_larglist lambda_body
 %type <node> brace_block cmd_brace_block do_block lhs none fitem
 %type <node> mlhs mlhs_head mlhs_basic mlhs_item mlhs_node mlhs_post mlhs_inner
@@ -2641,6 +2642,10 @@
 			$$ = dispatch1(hash, escape_Qundef($2));
 		    %*/
 		    }
+                | block_lambda
+		    {
+			$$ = $1;
+		    }
 		| keyword_return
 		    {
 		    /*%%%*/
@@ -3327,6 +3332,56 @@
 		    }
 		;
 
+block_lambda	: tLBRACE
+		    {
+		    /*%%%*/
+			dyna_push();
+			$<num>$ = ruby_sourceline;
+		    /*%
+                    %*/
+		    }
+                  block_param_def compstmt '}'
+		    {
+		    /*%%%*/
+                        $$ = NEW_ITER($3, $4);
+			nd_set_line($$, $<num>2);
+			dyna_pop();
+			$$->nd_iter = NEW_FCALL(rb_intern("lambda"), 0);
+			fixpos($$->nd_iter, $$);
+		    /*%
+			$$ = method_arg(
+                            dispatch1(fcall, rb_intern("lambda")),
+                            arg_new());
+			$$ = method_add_block($$,
+                            dispatch2(brace_block, escape_Qundef($3), $4));
+		    %*/
+		    }
+		| keyword_do_block
+		    {
+		    /*%%%*/
+			dyna_push();
+			$<num>$ = ruby_sourceline;
+		    /*%
+                    %*/
+		    }
+                  opt_block_param compstmt keyword_end
+		    {
+		    /*%%%*/
+                        $$ = NEW_ITER($3, $4);
+			nd_set_line($$, $<num>2);
+			dyna_pop();
+			$$->nd_iter = NEW_FCALL(rb_intern("lambda"), 0);
+			fixpos($$->nd_iter, $$);
+		    /*%
+			$$ = method_arg(
+                            dispatch1(fcall, rb_intern("lambda")),
+                            arg_new());
+			$$ = method_add_block($$,
+                            dispatch2(do_block, escape_Qundef($3), $4));
+		    %*/
+		    }
+                ;
+
 f_larglist	: '(' f_args opt_bv_decl rparen
 		    {
 		    /*%%%*/

Thread

Prev Next

In This Thread

Prev Next