* parse.y (arg): allow newlines before ternary colon. [ruby-dev:29189]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10703 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
0c724c2734
commit
41066ad0b7
@ -1,3 +1,7 @@
|
|||||||
|
Tue Aug 8 12:28:43 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* parse.y (arg): allow newlines before ternary colon. [ruby-dev:29189]
|
||||||
|
|
||||||
Mon Aug 7 17:56:59 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
|
Mon Aug 7 17:56:59 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
|
|
||||||
* ext/bigdecimal/bigdecimal.c, ext/digest/rmd160/rmd160ossl.c,
|
* ext/bigdecimal/bigdecimal.c, ext/digest/rmd160/rmd160ossl.c,
|
||||||
|
6
parse.y
6
parse.y
@ -2094,13 +2094,13 @@ arg : lhs '=' arg
|
|||||||
$$ = dispatch1(defined, $4);
|
$$ = dispatch1(defined, $4);
|
||||||
%*/
|
%*/
|
||||||
}
|
}
|
||||||
| arg '?' arg ':' arg
|
| arg '?' arg opt_nl ':' arg
|
||||||
{
|
{
|
||||||
/*%%%*/
|
/*%%%*/
|
||||||
$$ = NEW_IF(cond($1), $3, $5);
|
$$ = NEW_IF(cond($1), $3, $6);
|
||||||
fixpos($$, $1);
|
fixpos($$, $1);
|
||||||
/*%
|
/*%
|
||||||
$$ = dispatch3(ifop, $1, $3, $5);
|
$$ = dispatch3(ifop, $1, $3, $6);
|
||||||
%*/
|
%*/
|
||||||
}
|
}
|
||||||
| primary
|
| primary
|
||||||
|
Loading…
x
Reference in New Issue
Block a user