nobu	2015-01-29 22:22:39 +0900 (Thu, 29 Jan 2015)

  New Revision: 49438

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49438

  Log:
    parse.y: condition node
    
    * parse.y (logop_gen): keep non-null condition node.

  Modified files:
    trunk/bootstraptest/test_syntax.rb
    trunk/parse.y
Index: bootstraptest/test_syntax.rb
===================================================================
--- bootstraptest/test_syntax.rb	(revision 49437)
+++ bootstraptest/test_syntax.rb	(revision 49438)
@@ -376,6 +376,8 @@ assert_equal %q{1}, %q{1 or 2 or 3 or 4} https://github.com/ruby/ruby/blob/trunk/bootstraptest/test_syntax.rb#L376
 assert_equal %q{1}, %q{1 or false or 3 or 4}
 assert_equal %q{2}, %q{nil or 2 or 3 or 4}
 assert_equal %q{2}, %q{false or 2 or 3 or 4}
+assert_equal %q{1}, %q{if true && ""; then 1; end}
+assert_equal %q{1}, %q{if nil || true; then 1; end}
 assert_equal %q{false}, %q{nil or false or nil or false}
 assert_equal %q{elseng}, %q{
   case
Index: parse.y
===================================================================
--- parse.y	(revision 49437)
+++ parse.y	(revision 49438)
@@ -9694,7 +9694,6 @@ logop_gen(struct parser_params *parser, https://github.com/ruby/ruby/blob/trunk/parse.y#L9694
 	  case NODE_NIL:
 	  case NODE_FALSE:
 	    if (type == NODE_AND) return left;
-	    left = 0;
 	    break;
 	  case NODE_TRUE:
 	  case NODE_LIT:

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/