prism 0.28.0 → 0.30.0

data/ext/prism/api_node.c

@@ -102,6 +102,7 @@ static VALUE rb_cPrismInterpolatedRegularExpressionNode;
 static VALUE rb_cPrismInterpolatedStringNode;
 static VALUE rb_cPrismInterpolatedSymbolNode;
 static VALUE rb_cPrismInterpolatedXStringNode;
+static VALUE rb_cPrismItLocalVariableReadNode;
 static VALUE rb_cPrismItParametersNode;
 static VALUE rb_cPrismKeywordHashNode;
 static VALUE rb_cPrismKeywordRestParameterNode;
@@ -980,12 +981,6 @@ pm_ast_new(const pm_parser_t *parser, const pm_node_t *node, rb_encoding *encodi
                     pm_node_stack_push(&node_stack, (pm_node_t *) cast->right);
                     break;
                 }
-#line 146 "api_node.c.erb"
-                case PM_RATIONAL_NODE: {
-                    pm_rational_node_t *cast = (pm_rational_node_t *) node;
-                    pm_node_stack_push(&node_stack, (pm_node_t *) cast->numeric);
-                    break;
-                }
 #line 146 "api_node.c.erb"
                 case PM_RESCUE_MODIFIER_NODE: {
                     pm_rescue_modifier_node_t *cast = (pm_rescue_modifier_node_t *) node;
@@ -1708,14 +1703,14 @@ pm_ast_new(const pm_parser_t *parser, const pm_node_t *node, rb_encoding *encodi
                     assert(cast->write_name != 0);
                     argv[6] = RARRAY_AREF(constants, cast->write_name - 1);
 
-                    // operator
+                    // binary_operator
 #line 198 "api_node.c.erb"
-                    assert(cast->operator != 0);
-                    argv[7] = RARRAY_AREF(constants, cast->operator - 1);
+                    assert(cast->binary_operator != 0);
+                    argv[7] = RARRAY_AREF(constants, cast->binary_operator - 1);
 
-                    // operator_loc
+                    // binary_operator_loc
 #line 211 "api_node.c.erb"
-                    argv[8] = pm_location_new(parser, cast->operator_loc.start, cast->operator_loc.end);
+                    argv[8] = pm_location_new(parser, cast->binary_operator_loc.start, cast->binary_operator_loc.end);
 
                     // value
 #line 186 "api_node.c.erb"
@@ -2009,18 +2004,18 @@ pm_ast_new(const pm_parser_t *parser, const pm_node_t *node, rb_encoding *encodi
 #line 211 "api_node.c.erb"
                     argv[2] = pm_location_new(parser, cast->name_loc.start, cast->name_loc.end);
 
-                    // operator_loc
+                    // binary_operator_loc
 #line 211 "api_node.c.erb"
-                    argv[3] = pm_location_new(parser, cast->operator_loc.start, cast->operator_loc.end);
+                    argv[3] = pm_location_new(parser, cast->binary_operator_loc.start, cast->binary_operator_loc.end);
 
                     // value
 #line 186 "api_node.c.erb"
                     argv[4] = rb_ary_pop(value_stack);
 
-                    // operator
+                    // binary_operator
 #line 198 "api_node.c.erb"
-                    assert(cast->operator != 0);
-                    argv[5] = RARRAY_AREF(constants, cast->operator - 1);
+                    assert(cast->binary_operator != 0);
+                    argv[5] = RARRAY_AREF(constants, cast->binary_operator - 1);
 
                     // location
                     argv[6] = pm_location_new(parser, node->location.start, node->location.end);
@@ -2176,18 +2171,18 @@ pm_ast_new(const pm_parser_t *parser, const pm_node_t *node, rb_encoding *encodi
 #line 211 "api_node.c.erb"
                     argv[2] = pm_location_new(parser, cast->name_loc.start, cast->name_loc.end);
 
-                    // operator_loc
+                    // binary_operator_loc
 #line 211 "api_node.c.erb"
-                    argv[3] = pm_location_new(parser, cast->operator_loc.start, cast->operator_loc.end);
+                    argv[3] = pm_location_new(parser, cast->binary_operator_loc.start, cast->binary_operator_loc.end);
 
                     // value
 #line 186 "api_node.c.erb"
                     argv[4] = rb_ary_pop(value_stack);
 
-                    // operator
+                    // binary_operator
 #line 198 "api_node.c.erb"
-                    assert(cast->operator != 0);
-                    argv[5] = RARRAY_AREF(constants, cast->operator - 1);
+                    assert(cast->binary_operator != 0);
+                    argv[5] = RARRAY_AREF(constants, cast->binary_operator - 1);
 
                     // location
                     argv[6] = pm_location_new(parser, node->location.start, node->location.end);
@@ -2293,18 +2288,18 @@ pm_ast_new(const pm_parser_t *parser, const pm_node_t *node, rb_encoding *encodi
 #line 186 "api_node.c.erb"
                     argv[1] = rb_ary_pop(value_stack);
 
-                    // operator_loc
+                    // binary_operator_loc
 #line 211 "api_node.c.erb"
-                    argv[2] = pm_location_new(parser, cast->operator_loc.start, cast->operator_loc.end);
+                    argv[2] = pm_location_new(parser, cast->binary_operator_loc.start, cast->binary_operator_loc.end);
 
                     // value
 #line 186 "api_node.c.erb"
                     argv[3] = rb_ary_pop(value_stack);
 
-                    // operator
+                    // binary_operator
 #line 198 "api_node.c.erb"
-                    assert(cast->operator != 0);
-                    argv[4] = RARRAY_AREF(constants, cast->operator - 1);
+                    assert(cast->binary_operator != 0);
+                    argv[4] = RARRAY_AREF(constants, cast->binary_operator - 1);
 
                     // location
                     argv[5] = pm_location_new(parser, node->location.start, node->location.end);
@@ -2894,18 +2889,18 @@ pm_ast_new(const pm_parser_t *parser, const pm_node_t *node, rb_encoding *encodi
 #line 211 "api_node.c.erb"
                     argv[2] = pm_location_new(parser, cast->name_loc.start, cast->name_loc.end);
 
-                    // operator_loc
+                    // binary_operator_loc
 #line 211 "api_node.c.erb"
-                    argv[3] = pm_location_new(parser, cast->operator_loc.start, cast->operator_loc.end);
+                    argv[3] = pm_location_new(parser, cast->binary_operator_loc.start, cast->binary_operator_loc.end);
 
                     // value
 #line 186 "api_node.c.erb"
                     argv[4] = rb_ary_pop(value_stack);
 
-                    // operator
+                    // binary_operator
 #line 198 "api_node.c.erb"
-                    assert(cast->operator != 0);
-                    argv[5] = RARRAY_AREF(constants, cast->operator - 1);
+                    assert(cast->binary_operator != 0);
+                    argv[5] = RARRAY_AREF(constants, cast->binary_operator - 1);
 
                     // location
                     argv[6] = pm_location_new(parser, node->location.start, node->location.end);
@@ -3280,14 +3275,14 @@ pm_ast_new(const pm_parser_t *parser, const pm_node_t *node, rb_encoding *encodi
 #line 186 "api_node.c.erb"
                     argv[7] = rb_ary_pop(value_stack);
 
-                    // operator
+                    // binary_operator
 #line 198 "api_node.c.erb"
-                    assert(cast->operator != 0);
-                    argv[8] = RARRAY_AREF(constants, cast->operator - 1);
+                    assert(cast->binary_operator != 0);
+                    argv[8] = RARRAY_AREF(constants, cast->binary_operator - 1);
 
-                    // operator_loc
+                    // binary_operator_loc
 #line 211 "api_node.c.erb"
-                    argv[9] = pm_location_new(parser, cast->operator_loc.start, cast->operator_loc.end);
+                    argv[9] = pm_location_new(parser, cast->binary_operator_loc.start, cast->binary_operator_loc.end);
 
                     // value
 #line 186 "api_node.c.erb"
@@ -3435,18 +3430,18 @@ pm_ast_new(const pm_parser_t *parser, const pm_node_t *node, rb_encoding *encodi
 #line 211 "api_node.c.erb"
                     argv[2] = pm_location_new(parser, cast->name_loc.start, cast->name_loc.end);
 
-                    // operator_loc
+                    // binary_operator_loc
 #line 211 "api_node.c.erb"
-                    argv[3] = pm_location_new(parser, cast->operator_loc.start, cast->operator_loc.end);
+                    argv[3] = pm_location_new(parser, cast->binary_operator_loc.start, cast->binary_operator_loc.end);
 
                     // value
 #line 186 "api_node.c.erb"
                     argv[4] = rb_ary_pop(value_stack);
 
-                    // operator
+                    // binary_operator
 #line 198 "api_node.c.erb"
-                    assert(cast->operator != 0);
-                    argv[5] = RARRAY_AREF(constants, cast->operator - 1);
+                    assert(cast->binary_operator != 0);
+                    argv[5] = RARRAY_AREF(constants, cast->binary_operator - 1);
 
                     // location
                     argv[6] = pm_location_new(parser, node->location.start, node->location.end);
@@ -3733,6 +3728,19 @@ pm_ast_new(const pm_parser_t *parser, const pm_node_t *node, rb_encoding *encodi
                     rb_ary_push(value_stack, rb_class_new_instance(5, argv, rb_cPrismInterpolatedXStringNode));
                     break;
                 }
+#line 172 "api_node.c.erb"
+                case PM_IT_LOCAL_VARIABLE_READ_NODE: {
+                    VALUE argv[2];
+
+                    // source
+                    argv[0] = source;
+
+                    // location
+                    argv[1] = pm_location_new(parser, node->location.start, node->location.end);
+
+                    rb_ary_push(value_stack, rb_class_new_instance(2, argv, rb_cPrismItLocalVariableReadNode));
+                    break;
+                }
 #line 172 "api_node.c.erb"
                 case PM_IT_PARAMETERS_NODE: {
                     VALUE argv[2];
@@ -3889,9 +3897,9 @@ pm_ast_new(const pm_parser_t *parser, const pm_node_t *node, rb_encoding *encodi
 #line 211 "api_node.c.erb"
                     argv[1] = pm_location_new(parser, cast->name_loc.start, cast->name_loc.end);
 
-                    // operator_loc
+                    // binary_operator_loc
 #line 211 "api_node.c.erb"
-                    argv[2] = pm_location_new(parser, cast->operator_loc.start, cast->operator_loc.end);
+                    argv[2] = pm_location_new(parser, cast->binary_operator_loc.start, cast->binary_operator_loc.end);
 
                     // value
 #line 186 "api_node.c.erb"
@@ -3902,10 +3910,10 @@ pm_ast_new(const pm_parser_t *parser, const pm_node_t *node, rb_encoding *encodi
                     assert(cast->name != 0);
                     argv[4] = RARRAY_AREF(constants, cast->name - 1);
 
-                    // operator
+                    // binary_operator
 #line 198 "api_node.c.erb"
-                    assert(cast->operator != 0);
-                    argv[5] = RARRAY_AREF(constants, cast->operator - 1);
+                    assert(cast->binary_operator != 0);
+                    argv[5] = RARRAY_AREF(constants, cast->binary_operator - 1);
 
                     // depth
 #line 220 "api_node.c.erb"
@@ -4723,19 +4731,28 @@ pm_ast_new(const pm_parser_t *parser, const pm_node_t *node, rb_encoding *encodi
                 }
 #line 172 "api_node.c.erb"
                 case PM_RATIONAL_NODE: {
-                    VALUE argv[3];
+                    pm_rational_node_t *cast = (pm_rational_node_t *) node;
+                    VALUE argv[5];
 
                     // source
                     argv[0] = source;
 
-                    // numeric
-#line 186 "api_node.c.erb"
-                    argv[1] = rb_ary_pop(value_stack);
+                    // flags
+#line 223 "api_node.c.erb"
+                    argv[1] = ULONG2NUM(node->flags & ~PM_NODE_FLAG_COMMON_MASK);
+
+                    // numerator
+#line 226 "api_node.c.erb"
+                    argv[2] = pm_integer_new(&cast->numerator);
+
+                    // denominator
+#line 226 "api_node.c.erb"
+                    argv[3] = pm_integer_new(&cast->denominator);
 
                     // location
-                    argv[2] = pm_location_new(parser, node->location.start, node->location.end);
+                    argv[4] = pm_location_new(parser, node->location.start, node->location.end);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(3, argv, rb_cPrismRationalNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(5, argv, rb_cPrismRationalNode));
                     break;
                 }
 #line 172 "api_node.c.erb"
@@ -5578,6 +5595,7 @@ Init_prism_api_node(void) {
     rb_cPrismInterpolatedStringNode = rb_define_class_under(rb_cPrism, "InterpolatedStringNode", rb_cPrismNode);
     rb_cPrismInterpolatedSymbolNode = rb_define_class_under(rb_cPrism, "InterpolatedSymbolNode", rb_cPrismNode);
     rb_cPrismInterpolatedXStringNode = rb_define_class_under(rb_cPrism, "InterpolatedXStringNode", rb_cPrismNode);
+    rb_cPrismItLocalVariableReadNode = rb_define_class_under(rb_cPrism, "ItLocalVariableReadNode", rb_cPrismNode);
     rb_cPrismItParametersNode = rb_define_class_under(rb_cPrism, "ItParametersNode", rb_cPrismNode);
     rb_cPrismKeywordHashNode = rb_define_class_under(rb_cPrism, "KeywordHashNode", rb_cPrismNode);
     rb_cPrismKeywordRestParameterNode = rb_define_class_under(rb_cPrism, "KeywordRestParameterNode", rb_cPrismNode);

data/ext/prism/extconf.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "rbconfig"
+
 if ARGV.delete("--help")
   print(<<~TEXT)
     USAGE: ruby #{$PROGRAM_NAME} [options]
@@ -40,26 +42,6 @@ def generate_templates
   end
 end
 
-# We're going to need to run `make` using prism's `Makefile`. We want to match
-# up as much of the configuration to the configuration that built the current
-# version of Ruby as possible.
-require "rbconfig"
-env = RbConfig::CONFIG.slice("SOEXT", "CPPFLAGS", "CFLAGS", "CC", "AR", "ARFLAGS", "MAKEDIRS", "RMALL")
-
-# It's possible that the Ruby that is being run wasn't actually compiled on this
-# machine, in which case the configuration might be incorrect. In this case
-# we'll need to do some additional checks and potentially fall back to defaults.
-if env.key?("CC") && !File.exist?(env["CC"])
-  env.delete("CC")
-  env.delete("CFLAGS")
-  env.delete("CPPFLAGS")
-end
-
-if env.key?("AR") && !File.exist?(env["AR"])
-  env.delete("AR")
-  env.delete("ARFLAGS")
-end
-
 # Runs `make` in the root directory of the project. Note that this is the
 # `Makefile` for the overall project, not the `Makefile` that is being generated
 # by this script.`
@@ -77,15 +59,37 @@ end
 
 # On non-CRuby we only need the shared library since we'll interface with it
 # through FFI, so we'll build only that and not the C extension. We also avoid
-# `require "mkmf"` as that prepends the LLVM toolchain to PATH on TruffleRuby,
-# but we want to use the native toolchain here since libprism is run natively.
+# `require "mkmf"` as that prepends the GraalVM LLVM toolchain to PATH on TruffleRuby < 24.0,
+# but we want to use the system toolchain here since libprism is run natively.
 if RUBY_ENGINE != "ruby"
   generate_templates
-  make(env, "build/libprism.#{RbConfig::CONFIG["SOEXT"]}")
+  soext = RbConfig::CONFIG["SOEXT"]
+  # Pass SOEXT to avoid an extra subprocess just to query that
+  make({ "SOEXT" => soext }, "build/libprism.#{soext}")
   File.write("Makefile", "all install clean:\n\t@#{RbConfig::CONFIG["NULLCMD"]}\n")
   return
 end
 
+# We're going to need to run `make` using prism's `Makefile`.
+# We want to use the same toolchain (compiler, flags, etc) to compile libprism.a and
+# the C extension since they will be linked together.
+# The C extension uses RbConfig, which contains values from the toolchain that built the running Ruby.
+env = RbConfig::CONFIG.slice("SOEXT", "CPPFLAGS", "CFLAGS", "CC", "AR", "ARFLAGS", "MAKEDIRS", "RMALL")
+
+# It's possible that the Ruby that is being run wasn't actually compiled on this
+# machine, in which case parts of RbConfig might be incorrect. In this case
+# we'll need to do some additional checks and potentially fall back to defaults.
+if env.key?("CC") && !File.exist?(env["CC"])
+  env.delete("CC")
+  env.delete("CFLAGS")
+  env.delete("CPPFLAGS")
+end
+
+if env.key?("AR") && !File.exist?(env["AR"])
+  env.delete("AR")
+  env.delete("ARFLAGS")
+end
+
 require "mkmf"
 
 # First, ensure that we can find the header for the prism library.