Merge pull request #1241 from ruby/fix-ternary

Fix ternary operator immediately followed by underscore
ruby · Aug 11, 2023 · 1c01957 · 1c01957
2 parents d413210 + e907303
commit 1c01957
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 7 deletions.
diff --git a/src/yarp.c b/src/yarp.c
@@ -5411,13 +5411,14 @@ lex_question_mark(yp_parser_t *parser) {
     } else {
         size_t encoding_width = parser->encoding.char_width(parser->current.end, parser->end - parser->current.end);
 
-        // We only want to return a character literal if there's exactly one
-        // alphanumeric character right after the `?`
+        // Ternary operators can have a ? immediately followed by an identifier which starts with
+        // an underscore. We check for this case
         if (
-            !parser->encoding.alnum_char(parser->current.end, parser->end - parser->current.end) ||
+            !(parser->encoding.alnum_char(parser->current.end, parser->end - parser->current.end) ||
+                *parser->current.end == '_') ||
             (
                 (parser->current.end + encoding_width >= parser->end) ||
-                !parser->encoding.alnum_char(parser->current.end + encoding_width, parser->end - (parser->current.end + encoding_width))
+                !char_is_identifier(parser, parser->current.end + encoding_width)
             )
         ) {
             lex_state_set(parser, YP_LEX_STATE_END);

diff --git a/test/fixtures/ternary_operator.txt b/test/fixtures/ternary_operator.txt
@@ -11,3 +11,5 @@ empty??nil:nil
 a??nil:nil
 
 a ?var1 : var2
+
+nil??_a =2:1
diff --git a/test/snapshots/ternary_operator.txt b/test/snapshots/ternary_operator.txt