lib/parser/ruby23.y in parser-2.3.0.pre.5 vs lib/parser/ruby23.y in parser-2.3.0.pre.6

@@ -782,28 +782,13 @@
                     }
                 | kDEFINED opt_nl arg
                     {
                       result = @builder.keyword_cmd(:defined?, val[0], nil, [ val[2] ], nil)
                     }
-
-                # Note: MRI eventually came to rely on disambiguation based on
-                # the lexer state, but it is too contrived with the Ragel lexer,
-                # so we kept this approach. See ruby/ruby@b0c03f63e5 for
-                # the initial commit, and ruby/ruby@23352f62a for MRI revert,
-                # which we decided not to track.
-                | arg tEH
+                | arg tEH arg opt_nl tCOLON arg
                     {
-                      @lexer.push_cond
-                      @lexer.cond.push(true)
-                    }
-                  arg opt_nl tCOLON
-                    {
-                      @lexer.pop_cond
-                    }
-                  arg
-                    {
                       result = @builder.ternary(val[0], val[1],
-                                                val[3], val[5], val[7])
+                                                val[2], val[4], val[5])
                     }
                 | primary
 
        arg_value: arg