From 39238888bc784eb5887d899dc09fad30997464ac Mon Sep 17 00:00:00 2001 From: eileencodes Date: Fri, 1 Dec 2023 14:28:54 -0500 Subject: [PATCH] Implements missing literals for `defined?` This PR implements the following literals: - String - Symbols - Integers - Floats - Regexs - Ranges - Lambdas - Hashes and tests for them. --- prism_compile.c | 9 ++++++++- test/ruby/test_compile_prism.rb | 8 ++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/prism_compile.c b/prism_compile.c index 1b55396b0b..e0279db362 100644 --- a/prism_compile.c +++ b/prism_compile.c @@ -1465,9 +1465,16 @@ pm_compile_defined_expr0(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *co ADD_INSNL(ret, &dummy_line_node, branchunless, lfinish[1]); } } - case PM_STRING_NODE: case PM_AND_NODE: + case PM_FLOAT_NODE: + case PM_HASH_NODE: + case PM_INTEGER_NODE: + case PM_LAMBDA_NODE: case PM_OR_NODE: + case PM_RANGE_NODE: + case PM_REGULAR_EXPRESSION_NODE: + case PM_STRING_NODE: + case PM_SYMBOL_NODE: dtype = DEFINED_EXPR; break; case PM_LOCAL_VARIABLE_READ_NODE: diff --git a/test/ruby/test_compile_prism.rb b/test/ruby/test_compile_prism.rb index f9f42ce7ec..c6047357b2 100644 --- a/test/ruby/test_compile_prism.rb +++ b/test/ruby/test_compile_prism.rb @@ -95,8 +95,16 @@ module Prism assert_prism_eval("defined? self") assert_prism_eval("defined? true") assert_prism_eval("defined? false") + assert_prism_eval("defined? 1") + assert_prism_eval("defined? 1.0") + assert_prism_eval("defined? 1..2") assert_prism_eval("defined? [A, B, C]") + assert_prism_eval("defined? [1, 2, 3]") + assert_prism_eval("defined?({ a: 1 })") assert_prism_eval("defined? 'str'") + assert_prism_eval("defined? :sym") + assert_prism_eval("defined? /foo/") + assert_prism_eval("defined? -> { 1 + 1 }") assert_prism_eval("defined? a && b") assert_prism_eval("defined? a || b")