From: Lukas Mai Date: Sun, 28 Oct 2012 02:03:28 +0000 (+0100) Subject: fix broken build X-Git-Tag: v0.10_03~1 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=f0c9847692abf3c3070d63daef414245c22059ad;p=p5sagit%2FFunction-Parameters.git fix broken build --- diff --git a/Parameters.xs b/Parameters.xs index 5d97321..bf5192f 100644 --- a/Parameters.xs +++ b/Parameters.xs @@ -1431,7 +1431,7 @@ static int parse_fun(pTHX_ OP **pop, const char *keyword_ptr, STRLEN keyword_len } else { vec = newASSIGNOP( OPf_STACKED, - my_var(0, vc), + my_var(aTHX_ 0, vc), OP_BIT_OR, newSVOP(OP_CONST, 0, newSVuv((UV)1 << i)) ); @@ -1483,7 +1483,7 @@ static int parse_fun(pTHX_ OP **pop, const char *keyword_ptr, STRLEN keyword_len } else { vec = newASSIGNOP( OPf_STACKED, - my_var(0, vb), + my_var(aTHX_ 0, vb), OP_BIT_OR, newSVOP(OP_CONST, 0, newSVuv((UV)1 << i)) ); @@ -1560,7 +1560,7 @@ static int parse_fun(pTHX_ OP **pop, const char *keyword_ptr, STRLEN keyword_len 0, vb_is_str ? mkvecbits(aTHX_ vb, i) - : newBINOP(OP_BIT_AND, 0, my_var(0, vb), newSVOP(OP_CONST, 0, newSVuv((UV)1 << i))) + : newBINOP(OP_BIT_AND, 0, my_var(aTHX_ 0, vb), newSVOP(OP_CONST, 0, newSVuv((UV)1 << i))) , newNULLLIST(), newSVOP(OP_CONST, 0, newSVpvn_utf8(p + 1, n - 1, SvUTF8(sv))) @@ -1643,7 +1643,7 @@ static int parse_fun(pTHX_ OP **pop, const char *keyword_ptr, STRLEN keyword_len OP_NOT, OPf_SPECIAL, vc_is_str ? mkvecbits(aTHX_ vc, i) - : newBINOP(OP_BIT_AND, 0, my_var(0, vc), newSVOP(OP_CONST, 0, newSVuv((UV)1 << i))) + : newBINOP(OP_BIT_AND, 0, my_var(aTHX_ 0, vc), newSVOP(OP_CONST, 0, newSVuv((UV)1 << i))) ); init = newCONDOP(0, cond, init, NULL); diff --git a/t/named_params.t b/t/named_params.t index 32a2bd7..4e6d784 100644 --- a/t/named_params.t +++ b/t/named_params.t @@ -90,7 +90,7 @@ fun name_1_slurp(:$n1, @rest) { [$n1, \@rest, @_] } like exception { name_1_slurp }, qr/Not enough arguments/; like exception { name_1_slurp 'n1' }, qr/Not enough arguments/; like exception { name_1_slurp 'asdf' }, qr/Not enough arguments/; -like exception { name_1_slurp huh => 1 }, qr/Missing named\b.+\bn1\b/; +like exception { name_1_slurp huh => 1 }, qr/missing named\b.+\bn1\b/; is_deeply name_1_slurp(n1 => 'a'), ['a', [], n1 => 'a']; like exception { name_1_slurp n1 => 'a', 'n1' }, qr/Odd number/; is_deeply name_1_slurp(n1 => 'a', foo => 'bar'), ['a', [foo => 'bar'], n1 => 'a', foo => 'bar']; @@ -116,9 +116,9 @@ like exception { name_2 'n1' }, qr/Not enough arguments/; like exception { name_2 'asdf' }, qr/Not enough arguments/; like exception { name_2 huh => 1 }, qr/Not enough arguments/; like exception { name_2 n1 => 'a' }, qr/Not enough arguments/; -like exception { name_2 n1 => 'a', n1 => 'b' }, qr/Missing named\b.+\bn2\b/; +like exception { name_2 n1 => 'a', n1 => 'b' }, qr/missing named\b.+\bn2\b/; like exception { name_2 n2 => 'a' }, qr/Not enough arguments/; -like exception { name_2 n2 => 'a', n2 => 'b' }, qr/Missing named\b.+\bn1\b/; +like exception { name_2 n2 => 'a', n2 => 'b' }, qr/missing named\b.+\bn1\b/; like exception { name_2 n1 => 'a', 'n2' }, qr/Not enough arguments/; like exception { name_2 n1 => 'a', 'asdf' }, qr/Not enough arguments/; like exception { name_2 n2 => 'b', n1 => 'a', huh => 1 }, qr/\bnamed\b.+\bhuh\b/; @@ -140,8 +140,8 @@ like exception { name_1_2 'asdf' }, qr/Not enough arguments/; like exception { name_1_2 huh => 1 }, qr/\bnamed\b.+\bhuh\b/; is_deeply name_1_2(n1 => 'a'), ['a', 'f', n1 => 'a']; is_deeply name_1_2(n1 => 'a', n1 => 'b'), ['b', 'f', n1 => 'a', n1 => 'b']; -like exception { name_1_2 n2 => 'a' }, qr/Missing named\b.+\bn1\b/; -like exception { name_1_2 n2 => 'a', n2 => 'b' }, qr/Missing named\b.+\bn1\b/; +like exception { name_1_2 n2 => 'a' }, qr/missing named\b.+\bn1\b/; +like exception { name_1_2 n2 => 'a', n2 => 'b' }, qr/missing named\b.+\bn1\b/; like exception { name_1_2 n1 => 'a', 'n2' }, qr/Odd number/; like exception { name_1_2 n1 => 'a', 'asdf' }, qr/Odd number/; like exception { name_1_2 n2 => 'b', n1 => 'a', huh => 1 }, qr/\bnamed\b.+\bhuh\b/;