Re: block args w/ defaults (updated)

Thread: Re: block args w/ defaults (updated)

Search this list only Search all lists
Re: block args w/ defaults (updated)
	2008-05-27 08:07:44

2008/5/26 Rados³aw Bu³at < radek.bulatgmail.com">radek.bulatgmail.com>: Hey! I've tried your patch and have some troubles. I expected to this code: def test yield yield(2) end test {\|x=10\| p x} to print 10 2 but it prints 10 10 I've tried also with &block but the same results. At the end of this message is an update for this patch that fixes the above.  I had to change vminshelper.c. Apparently there is two completely separate functions for handling arguments (lambda vs. block/proc). I updated the block/proc one for handling optional args. ; Seems like some refactoring should be done. Also I updated the tests to call all of these with various blocks (instead of using lambda directly): [method(:lambda), method(:proc), Proc.method(:new), lambda{\|&b\|b}].each do \|lam\| ... end But worse problem was with irb. When I run irb1.9 (with this patch) memory usage has jumped to > 50% (I have 2GB) and irb prompt didn't even show. Don't you have this issue? Maybe it is this: http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-core/16921 I haven't seen this, but I working off of r16568 (problem looks to start at r16615). Here's the updated patch: Index: sample/test.rb =================================================================== --- sample/test.rb   (revision 16568) +++ sample/test.rb   (working copy) -296,6 +296,61 test_ok(f.call([42,55]) == [[42,55]]) test_ok(f.call(42,55) == [42,55])   +[method(:lambda), method(:proc), Proc.method(:new), lambda{\|&b\|b}].each do \|lam\| + + ; f = lam.call { \|a, b=42, c\| [a,b,c] } +   test_ok(f.call(1 ;     ) == [1,42,[  ]] ) +   test_ok(f.call(1,43  ) == [1,43,[  ]] ) +   test_ok(f.call(1,43,44) == [1,43,[44]] ) +   +   f = lam.call { \|a, b=(a\|16), c, &block\| [a,b,c,block&&;block[]] } + ; test_ok(f.call(8 ;     )     == [8,24,[  ],nil] ) +   test_ok(f.call(8,43  )     == [8,43,[  ],nil] ) +   test_ok(f.call(8,43,44)     == [8,43,[44],nil] ) +   test_ok(f.call(8 ;     ) == [8,24,[  ],45 ] ) + ; test_ok(f.call(8,43  ) == [8,43,[  ],45 ] ) +   test_ok(f.call(8,43,44) == [8,43,[44],45 ] ) +   +   f = lam.call { \|a, b=42, c, d\| [a,b,c,d] } +   test_ok(f.call(1 ;     ,99) == [1,42,[  ],99] ) + ; test_ok(f.call(1,43  ,99) == [1,43,[  ],99] ) +   test_ok(f.call(1,43,44,99) == [1,43,[44],99] ) +   +   f = lam.call { \|a, b=(a\|16), &block\| [a,b,block&&block[]] } +   test_ok(f.call(8 ; )     == [8,24,nil] ) + ; test_ok(f.call(8,43)  ; == [8,43,nil] ) +   test_ok(f.call(8 ; ) == [8,24,45 ] ) +   test_ok(f.call(8,43){45} == [8,43,45 ] ) +   +   f = lam.call { \|a, b=42, d\| [a,b,d] } +   test_ok(f.call(1 ; ,99) == [1,42,99] ) + ; test_ok(f.call(1,43,99) == [1,43,99] ) +   +   f = lam.call { \|b=42, c, &block\| [b,c,block&&block[]] } +   test_ok(f.call( ; )     == [42,[ ; ],nil] ) +   test_ok(f.call(43  )     == [43,[ ; ],nil] ) + ; test_ok(f.call(43,44) ;   == [43,[44],nil] ) +   test_ok(f.call( ; ) == [42,[ ; ],45 ] ) +   test_ok(f.call(43  ) == [43,[ ; ],45 ] ) +   test_ok(f.call(43,44) == [43,[44],45 ] ) +   +   f = lam.call { \|b=42, c, d\| [b,c,d] } +   test_ok(f.call( ;   99) == [42,[ ; ],99] ) +   test_ok(f.call(43  ,99) == [43,[ ; ],99] ) +   test_ok(f.call(43,44,99) == [43,[44],99] ) +   +   f = lam.call { \|b=42, &block\| [b,block&&block[]] } + ; test_ok(f.call( )     == [42,nil] ) +   test_ok(f.call(43)    == [43,nil] ) +   test_ok(f.call( ) == [42,45 ] ) +   test_ok(f.call(43){45} == [43,45 ] ) +   +   f = lam.call { \|b=42, d\| [b,d] } + ; test_ok(f.call( 99) == [42,99] ) +   test_ok(f.call(43,99) == [43,99] ) + +end + a,=[1] test_ok(a == 1) a,=[[1]] Index: parse.y =================================================================== --- parse.y    (revision 16568) +++ parse.y    (working copy) -666,6 +666,7 %type <node> open_args paren_args opt_paren_args %type <node> command_args aref_args opt_block_arg block_arg var_ref var_lhs  %type <node> mrhs superclass block_call block_command +%type <node> f_block_optarg f_block_opt %type <node> f_arglist f_args f_arg f_arg_item f_optarg f_marg f_marg_list f_margs  %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 -3169,9 +3170,41         }       ; -block_param ; : f_arg ','; f_rest_arg opt_f_block_arg +block_param    : f_arg ','; f_block_optarg ','; f_rest_arg opt_f_block_arg         {         /%%%/ +      $$ = new_args($1, $3, $5, 0, $6); +        /% + ;       $$ = params_new($1, $3, $5, Qnil, escape_Qundef($6)); + ;     %/ + ;       } +     \| f_arg ','; f_block_optarg ','; f_rest_arg ','; f_arg opt_f_block_arg +        { +       /%%%/ +      $$ = new_args($1, $3, $5, $7, $8); +        /% + ;       $$ = params_new($1, $3, $5, $7, escape_Qundef($8)); + ;     %/ + ;       } +     \| f_arg ','; f_block_optarg opt_f_block_arg +        { +       /%%%/ +      $$ = new_args($1, $3, 0, 0, $4); +        /% + ;       $$ = params_new($1, $3, Qnil, Qnil, escape_Qundef($4)); + ;     %/ + ;       } + ;   \| f_arg ','; f_block_optarg ','; f_arg opt_f_block_arg +        { +       /%%%/ +      $$ = new_args($1, $3, 0, $5, $6); +        /% + ;       $$ = params_new($1, $3, Qnil, $5, escape_Qundef($6)); +       %/ + ;       } +   ;         \| f_arg ','; f_rest_arg opt_f_block_arg +        { +       /%%%/         $$ = new_args($1, 0, $3, 0, $4); ;       /% ;     $$ = params_new($1, Qnil, $3, Qnil, escape_Qundef($4)); -3202,6 +3235,38         $$ = params_new($1, Qnil,Qnil, Qnil, escape_Qundef($2));   ;     %/ ;     } +     \| f_block_optarg ','; f_rest_arg opt_f_block_arg +        { + ;     /%%%/ +      $$ = new_args(0, $1, $3, 0, $4); +        /% + ;       $$ = params_new(Qnil, $1, $3, Qnil, escape_Qundef($4)); + ;     %/ + ;       } +     \| f_block_optarg ','; f_rest_arg ','; f_arg opt_f_block_arg +        { +       /%%%/ +      $$ = new_args(0, $1, $3, $5, $6); +        /% + ;       $$ = params_new(Qnil, $1, $3, $5, escape_Qundef($6)); + ;     %/ + ;       } +     \| f_block_optarg opt_f_block_arg +        { +       /%%%/ +      $$ = new_args(0, $1, 0, 0, $2); +        /% + ;       $$ = params_new(Qnil, $1, Qnil, Qnil,escape_Qundef($2)); + ;     %/ + ;       } + ;   \| f_block_optarg ','; f_arg opt_f_block_arg +        { +       /%%%/ +      $$ = new_args(0, $1, 0, $3, $4); +        /% + ;       $$ = params_new(Qnil, $1, Qnil, $3, escape_Qundef($4)); +       %/ + ;       }       \| f_rest_arg opt_f_block_arg ;       {         /%%%/ -4302,6 +4367,44         }       ; +f_block_opt ; : tIDENTIFIER '='; primary_value + ;       { +       /%%%/ +      if (!is_local_id($1)) +        yyerror("formal argument must be local variable"); +        shadowing_lvar($1); + ;     arg_var($1); + ;     $$ = NEW_OPT_ARG(0, assignable($1, $3)); +        /% + ;       $$ = rb_assoc_new($1, $3); +        %/ + ;       } +     ; + +f_block_optarg    : f_block_opt +       { + ;     /%%%/ +      $$ = $1; + ;       /% + ;       $$ = rb_ary_new3(1, $1); +        %/ + ;       } +     \| f_block_optarg ','; f_block_opt +       { +       /%%%/ + ;     NODE opts = $1; + +        while (opts->nd_next) { +         opts = opts->nd_next; +        } +       opts->nd_next = $3; + ;       $$ = $1; + ;       /% +        $$ = rb_ary_push($1, $3); +        %/ + ;       } +     ; + f_optarg    : f_opt         {         /%%%/ Index: vm_insnhelper.c =================================================================== --- vm_insnhelper.c ; (revision 16568) +++ vm_insnhelper.c ; (working copy) -699,7 +699,8     else {     int i;   int argc = orig_argc; -   const int m = iseq->argc; + ;   int m = iseq->argc; +    int opt_pc = 0; ;   th->mark_stack_len = argc;   -719,18 +720,39       MEMCPY(argv, RARRAY_PTR(ary), VALUE, argc);     } + ;     if (iseq->arg_opts) { +   ;       const int opts = iseq->arg_opts - 1 /* no opt /; +        ; int overrides = argc-(m + iseq->arg_post_len); +   ;       if (overrides > opts) overrides = opts; +      ;   else if (overrides < 0) overrides = 0; + ;         opt_pc = iseq->arg_opt_table[overrides]; + ;         m += overrides; +       } + ; for (i=argc; i<m; i++) {       argv[i] = Qnil;     }   ; if (iseq->arg_rest == -1) { -     if (m < argc) { +     if ( (m + iseq->arg_post_len) < argc) {     /     * yield 1, 2       * => {\|a\|} # truncate   ;   / - ;   th->mark_stack_len = argc = m; + ;   th->mark_stack_len = argc = m + iseq->arg_post_len;       } + ;         if (iseq->arg_post_len) { +     int len = iseq->arg_post_len; +     int start = iseq->arg_post_start; + ;   int rsize = argc > m ? argc - m : 0; + ;   int psize = rsize; + +     MEMMOVE(&argv[start], &argv[argc - psize], VALUE, psize); + +     for (i=psize; i<len; i++) { +       argv[start + i] = Qnil; +      } +   ;       }     }     else {     int r = iseq->arg_rest; -754,7 +776,7       }   ;   / copy post argument */ - ;   MEMMOVE(&argv[start], &argv[r + rsize - psize], VALUE, psize); +    MEMMOVE(&argv[start], &argv[argc - psize], VALUE, psize);   ;     for (i=psize; i<len; i++) {         argv[start + i] = Qnil; -791,7 +813,7     }   ; th->mark_stack_len = 0; - ; return 0; + ; return opt_pc;     } }
Re: block args w/ defaults (updated)
	2008-05-27 09:10:13
Could you send this patch as attachment please? When I copy it from mail there are some white space issue and patch couldn't be applied automatically (the same was with previous but attached patch worked for me). -- Rados³aw Bu³at http://radarek.jogger.pl - mój blog

Re: block args w/ defaults (updated)
	2008-05-27 20:44:00

2008/5/27 Rados³aw Bu³at < radek.bulatgmail.com">radek.bulatgmail.com>: Could you send this patch as attachment please? When I copy it from mail there are some white space issue and patch couldn';t be applied automatically (the same was with previous but attached patch worked for me). I';m attaching it as a .txt file so that it is viewable (gmail always uses base64 for .patch).

Re: block args w/ defaults (updated)
	2008-05-27 21:04:40
2008/5/27 Radoslaw Bulat <radek.bulatgmail.com>: > > Could you send this patch as attachment please? When I copy it from > mail there are some white space issue and patch couldn't be applied > automatically (the same was with previous but attached patch worked > for me). Another try. This time telling gmail to use plain text for composing. I'm assuming your name was causing the whole message to be base64 encoded making it unreadable on the ruby-core archive.


Re: block args w/ defaults (updated)
United States	2008-05-27 23:54:06
Eric Mahurin wrote: > 2008/5/26 Radosï¿½aw Buï¿½at <radek.bulatgmail.com>: >> I've tried your patch and have some troubles. >> I expected to this code: >> >> def test >> yield >> yield(2) >> end >> >> test {\|x=10\| p x} >> >> to print >> 10 >> 2 >> >> but it prints >> 10 >> 10 >> >> I've tried also with &block but the same results. > > At the end of this message is an update for this patch that fixes the > above. I confirm that this updated patch fixes the above example: >> def test >> yield >> yield 2 >> end => nil >> test {\|x=10\| p x} 10 2 => 2 >> f = lambda {\|x=8\| p x} => #<Proc:0x83af7c0(irb):12 (lambda)> >> test &f 8 2 => 2 >> def test2 &b >> p :b => b >> b.call 15 >> end => nil >> test2 {\|x=5,y=10,z=15\| p x: x, y: y, z: z} {:b=>#<Proc:0x83bd26c(irb):11>} {=> 15, :y=>10, :z=>15} => {=> 15, :y=>10, :z=>15}

[1-5]

about | contact Other archives ( Real Estate discussion Medical topics )