prism 0.17.0 → 0.18.0

data/ext/prism/api_node.c

@@ -36,6 +36,7 @@ static VALUE rb_cPrismCallNode;
 static VALUE rb_cPrismCallOperatorWriteNode;
 static VALUE rb_cPrismCallOrWriteNode;
 static VALUE rb_cPrismCapturePatternNode;
+static VALUE rb_cPrismCaseMatchNode;
 static VALUE rb_cPrismCaseNode;
 static VALUE rb_cPrismClassNode;
 static VALUE rb_cPrismClassVariableAndWriteNode;
@@ -146,7 +147,6 @@ static VALUE rb_cPrismSourceFileNode;
 static VALUE rb_cPrismSourceLineNode;
 static VALUE rb_cPrismSplatNode;
 static VALUE rb_cPrismStatementsNode;
-static VALUE rb_cPrismStringConcatNode;
 static VALUE rb_cPrismStringNode;
 static VALUE rb_cPrismSuperNode;
 static VALUE rb_cPrismSymbolNode;
@@ -403,6 +403,16 @@ pm_ast_new(pm_parser_t *parser, pm_node_t *node, rb_encoding *encoding) {
                     pm_node_stack_push(&node_stack, (pm_node_t *) cast->target);
                     break;
                 }
+#line 118 "api_node.c.erb"
+                case PM_CASE_MATCH_NODE: {
+                    pm_case_match_node_t *cast = (pm_case_match_node_t *) node;
+                    pm_node_stack_push(&node_stack, (pm_node_t *) cast->predicate);
+                    for (size_t index = 0; index < cast->conditions.size; index++) {
+                        pm_node_stack_push(&node_stack, (pm_node_t *) cast->conditions.nodes[index]);
+                    }
+                    pm_node_stack_push(&node_stack, (pm_node_t *) cast->consequent);
+                    break;
+                }
 #line 118 "api_node.c.erb"
                 case PM_CASE_NODE: {
                     pm_case_node_t *cast = (pm_case_node_t *) node;
@@ -798,6 +808,9 @@ pm_ast_new(pm_parser_t *parser, pm_node_t *node, rb_encoding *encoding) {
                 case PM_MATCH_WRITE_NODE: {
                     pm_match_write_node_t *cast = (pm_match_write_node_t *) node;
                     pm_node_stack_push(&node_stack, (pm_node_t *) cast->call);
+                    for (size_t index = 0; index < cast->targets.size; index++) {
+                        pm_node_stack_push(&node_stack, (pm_node_t *) cast->targets.nodes[index]);
+                    }
                     break;
                 }
 #line 118 "api_node.c.erb"
@@ -971,13 +984,6 @@ pm_ast_new(pm_parser_t *parser, pm_node_t *node, rb_encoding *encoding) {
                     }
                     break;
                 }
-#line 118 "api_node.c.erb"
-                case PM_STRING_CONCAT_NODE: {
-                    pm_string_concat_node_t *cast = (pm_string_concat_node_t *) node;
-                    pm_node_stack_push(&node_stack, (pm_node_t *) cast->left);
-                    pm_node_stack_push(&node_stack, (pm_node_t *) cast->right);
-                    break;
-                }
 #line 118 "api_node.c.erb"
                 case PM_SUPER_NODE: {
                     pm_super_node_t *cast = (pm_super_node_t *) node;
@@ -1664,6 +1670,40 @@ pm_ast_new(pm_parser_t *parser, pm_node_t *node, rb_encoding *encoding) {
                     rb_ary_push(value_stack, rb_class_new_instance(4, argv, rb_cPrismCapturePatternNode));
                     break;
                 }
+#line 144 "api_node.c.erb"
+                case PM_CASE_MATCH_NODE: {
+                    pm_case_match_node_t *cast = (pm_case_match_node_t *) node;
+                    VALUE argv[6];
+
+                    // predicate
+#line 155 "api_node.c.erb"
+                    argv[0] = rb_ary_pop(value_stack);
+
+                    // conditions
+#line 158 "api_node.c.erb"
+                    argv[1] = rb_ary_new_capa(cast->conditions.size);
+                    for (size_t index = 0; index < cast->conditions.size; index++) {
+                        rb_ary_push(argv[1], rb_ary_pop(value_stack));
+                    }
+
+                    // consequent
+#line 155 "api_node.c.erb"
+                    argv[2] = rb_ary_pop(value_stack);
+
+                    // case_keyword_loc
+#line 180 "api_node.c.erb"
+                    argv[3] = pm_location_new(parser, cast->case_keyword_loc.start, cast->case_keyword_loc.end, source);
+
+                    // end_keyword_loc
+#line 180 "api_node.c.erb"
+                    argv[4] = pm_location_new(parser, cast->end_keyword_loc.start, cast->end_keyword_loc.end, source);
+
+                    // location
+                    argv[5] = pm_location_new(parser, node->location.start, node->location.end, source);
+
+                    rb_ary_push(value_stack, rb_class_new_instance(6, argv, rb_cPrismCaseMatchNode));
+                    break;
+                }
 #line 144 "api_node.c.erb"
                 case PM_CASE_NODE: {
                     pm_case_node_t *cast = (pm_case_node_t *) node;
@@ -2736,7 +2776,7 @@ pm_ast_new(pm_parser_t *parser, pm_node_t *node, rb_encoding *encoding) {
 #line 144 "api_node.c.erb"
                 case PM_IF_NODE: {
                     pm_if_node_t *cast = (pm_if_node_t *) node;
-                    VALUE argv[6];
+                    VALUE argv[7];
 
                     // if_keyword_loc
 #line 183 "api_node.c.erb"
@@ -2746,22 +2786,26 @@ pm_ast_new(pm_parser_t *parser, pm_node_t *node, rb_encoding *encoding) {
 #line 155 "api_node.c.erb"
                     argv[1] = rb_ary_pop(value_stack);
 
+                    // then_keyword_loc
+#line 183 "api_node.c.erb"
+                    argv[2] = cast->then_keyword_loc.start == NULL ? Qnil : pm_location_new(parser, cast->then_keyword_loc.start, cast->then_keyword_loc.end, source);
+
                     // statements
 #line 155 "api_node.c.erb"
-                    argv[2] = rb_ary_pop(value_stack);
+                    argv[3] = rb_ary_pop(value_stack);
 
                     // consequent
 #line 155 "api_node.c.erb"
-                    argv[3] = rb_ary_pop(value_stack);
+                    argv[4] = rb_ary_pop(value_stack);
 
                     // end_keyword_loc
 #line 183 "api_node.c.erb"
-                    argv[4] = cast->end_keyword_loc.start == NULL ? Qnil : pm_location_new(parser, cast->end_keyword_loc.start, cast->end_keyword_loc.end, source);
+                    argv[5] = cast->end_keyword_loc.start == NULL ? Qnil : pm_location_new(parser, cast->end_keyword_loc.start, cast->end_keyword_loc.end, source);
 
                     // location
-                    argv[5] = pm_location_new(parser, node->location.start, node->location.end, source);
+                    argv[6] = pm_location_new(parser, node->location.start, node->location.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(6, argv, rb_cPrismIfNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(7, argv, rb_cPrismIfNode));
                     break;
                 }
 #line 144 "api_node.c.erb"
@@ -3604,12 +3648,11 @@ pm_ast_new(pm_parser_t *parser, pm_node_t *node, rb_encoding *encoding) {
 #line 155 "api_node.c.erb"
                     argv[0] = rb_ary_pop(value_stack);
 
-                    // locals
-#line 173 "api_node.c.erb"
-                    argv[1] = rb_ary_new_capa(cast->locals.size);
-                    for (size_t index = 0; index < cast->locals.size; index++) {
-                        assert(cast->locals.ids[index] != 0);
-                        rb_ary_push(argv[1], rb_id2sym(constants[cast->locals.ids[index] - 1]));
+                    // targets
+#line 158 "api_node.c.erb"
+                    argv[1] = rb_ary_new_capa(cast->targets.size);
+                    for (size_t index = 0; index < cast->targets.size; index++) {
+                        rb_ary_push(argv[1], rb_ary_pop(value_stack));
                     }
 
                     // location
@@ -4436,24 +4479,6 @@ pm_ast_new(pm_parser_t *parser, pm_node_t *node, rb_encoding *encoding) {
                     rb_ary_push(value_stack, rb_class_new_instance(2, argv, rb_cPrismStatementsNode));
                     break;
                 }
-#line 144 "api_node.c.erb"
-                case PM_STRING_CONCAT_NODE: {
-                    VALUE argv[3];
-
-                    // left
-#line 155 "api_node.c.erb"
-                    argv[0] = rb_ary_pop(value_stack);
-
-                    // right
-#line 155 "api_node.c.erb"
-                    argv[1] = rb_ary_pop(value_stack);
-
-                    // location
-                    argv[2] = pm_location_new(parser, node->location.start, node->location.end, source);
-
-                    rb_ary_push(value_stack, rb_class_new_instance(3, argv, rb_cPrismStringConcatNode));
-                    break;
-                }
 #line 144 "api_node.c.erb"
                 case PM_STRING_NODE: {
                     pm_string_node_t *cast = (pm_string_node_t *) node;
@@ -4578,7 +4603,7 @@ pm_ast_new(pm_parser_t *parser, pm_node_t *node, rb_encoding *encoding) {
 #line 144 "api_node.c.erb"
                 case PM_UNLESS_NODE: {
                     pm_unless_node_t *cast = (pm_unless_node_t *) node;
-                    VALUE argv[6];
+                    VALUE argv[7];
 
                     // keyword_loc
 #line 180 "api_node.c.erb"
@@ -4588,22 +4613,26 @@ pm_ast_new(pm_parser_t *parser, pm_node_t *node, rb_encoding *encoding) {
 #line 155 "api_node.c.erb"
                     argv[1] = rb_ary_pop(value_stack);
 
+                    // then_keyword_loc
+#line 183 "api_node.c.erb"
+                    argv[2] = cast->then_keyword_loc.start == NULL ? Qnil : pm_location_new(parser, cast->then_keyword_loc.start, cast->then_keyword_loc.end, source);
+
                     // statements
 #line 155 "api_node.c.erb"
-                    argv[2] = rb_ary_pop(value_stack);
+                    argv[3] = rb_ary_pop(value_stack);
 
                     // consequent
 #line 155 "api_node.c.erb"
-                    argv[3] = rb_ary_pop(value_stack);
+                    argv[4] = rb_ary_pop(value_stack);
 
                     // end_keyword_loc
 #line 183 "api_node.c.erb"
-                    argv[4] = cast->end_keyword_loc.start == NULL ? Qnil : pm_location_new(parser, cast->end_keyword_loc.start, cast->end_keyword_loc.end, source);
+                    argv[5] = cast->end_keyword_loc.start == NULL ? Qnil : pm_location_new(parser, cast->end_keyword_loc.start, cast->end_keyword_loc.end, source);
 
                     // location
-                    argv[5] = pm_location_new(parser, node->location.start, node->location.end, source);
+                    argv[6] = pm_location_new(parser, node->location.start, node->location.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(6, argv, rb_cPrismUnlessNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(7, argv, rb_cPrismUnlessNode));
                     break;
                 }
 #line 144 "api_node.c.erb"
@@ -4783,6 +4812,7 @@ Init_prism_api_node(void) {
     rb_cPrismCallOperatorWriteNode = rb_define_class_under(rb_cPrism, "CallOperatorWriteNode", rb_cPrismNode);
     rb_cPrismCallOrWriteNode = rb_define_class_under(rb_cPrism, "CallOrWriteNode", rb_cPrismNode);
     rb_cPrismCapturePatternNode = rb_define_class_under(rb_cPrism, "CapturePatternNode", rb_cPrismNode);
+    rb_cPrismCaseMatchNode = rb_define_class_under(rb_cPrism, "CaseMatchNode", rb_cPrismNode);
     rb_cPrismCaseNode = rb_define_class_under(rb_cPrism, "CaseNode", rb_cPrismNode);
     rb_cPrismClassNode = rb_define_class_under(rb_cPrism, "ClassNode", rb_cPrismNode);
     rb_cPrismClassVariableAndWriteNode = rb_define_class_under(rb_cPrism, "ClassVariableAndWriteNode", rb_cPrismNode);
@@ -4893,7 +4923,6 @@ Init_prism_api_node(void) {
     rb_cPrismSourceLineNode = rb_define_class_under(rb_cPrism, "SourceLineNode", rb_cPrismNode);
     rb_cPrismSplatNode = rb_define_class_under(rb_cPrism, "SplatNode", rb_cPrismNode);
     rb_cPrismStatementsNode = rb_define_class_under(rb_cPrism, "StatementsNode", rb_cPrismNode);
-    rb_cPrismStringConcatNode = rb_define_class_under(rb_cPrism, "StringConcatNode", rb_cPrismNode);
     rb_cPrismStringNode = rb_define_class_under(rb_cPrism, "StringNode", rb_cPrismNode);
     rb_cPrismSuperNode = rb_define_class_under(rb_cPrism, "SuperNode", rb_cPrismNode);
     rb_cPrismSymbolNode = rb_define_class_under(rb_cPrism, "SymbolNode", rb_cPrismNode);

data/ext/prism/extconf.rb

@@ -1,136 +1,100 @@
 # frozen_string_literal: true
 
-require "rbconfig"
+if ARGV.delete("--help")
+  print(<<~TEXT)
+    USAGE: ruby #{$PROGRAM_NAME} [options]
+
+      Flags that are always valid:
+
+          --enable-debug-mode-build
+              Enable debug mode build.
+              You may also use set PRISM_DEBUG_MODE_BUILD environment variable.
+
+          --help
+              Display this message.
+
+      Environment variables used:
 
-module Prism
-  module ExtConf
-    class << self
-      def configure
-        unless RUBY_ENGINE == "ruby"
-          # On non-CRuby we only need the shared library, so 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 librubyparser is run natively.
-          build_shared_rubyparser
-          File.write("Makefile", "all install clean:\n\t@#{RbConfig::CONFIG["NULLCMD"]}\n")
-          return
-        end
-
-        require "mkmf"
-        configure_c_extension
-        configure_rubyparser
-
-        create_makefile("prism/prism")
-
-        if static_link?
-          File.open('Makefile', 'a') do |mf|
-            mf.puts
-            mf.puts '# Automatically rebuild the extension if librubyparser.a changed'
-            mf.puts '$(TARGET_SO): $(LOCAL_LIBS)'
-          end
-        end
-      end
-
-      def configure_c_extension
-        append_cflags("-DPRISM_DEBUG_MODE_BUILD") if debug_mode_build?
-        append_cflags("-fvisibility=hidden")
-      end
-
-      def configure_rubyparser
-        if static_link?
-          static_archive_path = File.join(build_dir, "librubyparser.a")
-          unless File.exist?(static_archive_path)
-            build_static_rubyparser
-          end
-          $LOCAL_LIBS << " #{static_archive_path}"
-        else
-          shared_library_path = File.join(build_dir, "librubyparser.#{RbConfig::CONFIG["SOEXT"]}")
-          unless File.exist?(shared_library_path)
-            build_shared_rubyparser
-          end
-          unless find_library("rubyparser", "pm_parser_init", build_dir)
-            raise "could not link against #{File.basename(shared_library_path)}"
-          end
-        end
-
-        find_header("prism.h", include_dir) or raise "prism.h is required"
-
-        # Explicitly look for the extension header in the parent directory
-        # because we want to consistently look for prism/extension.h in our
-        # source files to line up with our mirroring in CRuby.
-        find_header("prism/extension.h", File.join(__dir__, "..")) or raise "prism/extension.h is required"
-      end
-
-      def build_shared_rubyparser
-        build_target_rubyparser "build/librubyparser.#{RbConfig::CONFIG["SOEXT"]}"
-      end
-
-      def build_static_rubyparser
-        build_target_rubyparser "build/librubyparser.a"
-      end
-
-      def build_target_rubyparser(target)
-        Dir.chdir(root_dir) do
-          if !File.exist?("include/prism/ast.h") && Dir.exist?(".git")
-            # this block only exists to support building the gem from a "git" source,
-            # normally we package up the configure and other files in the gem itself
-            system("templates/template.rb", exception: true)
-          end
-          system("make", target, exception: true)
-        end
-      end
-
-      def root_dir
-        File.expand_path("../..", __dir__)
-      end
-
-      def include_dir
-        File.join(root_dir, "include")
-      end
-
-      def build_dir
-        File.join(root_dir, "build")
-      end
-
-      def print_help
-        print(<<~TEXT)
-          USAGE: ruby #{$PROGRAM_NAME} [options]
-
-            Flags that are always valid:
-
-                --enable-static
-                --disable-static
-                    Enable or disable static linking against librubyparser.
-                    The default is to statically link.
-
-                --enable-debug-mode-build
-                    Enable debug mode build.
-                    You may also use set PRISM_DEBUG_MODE_BUILD environment variable.
-
-                --help
-                    Display this message.
-
-            Environment variables used:
-
-                PRISM_DEBUG_MODE_BUILD
-                    Equivalent to `--enable-debug-mode-build` when set, even if nil or blank.
-
-        TEXT
-      end
-
-      def static_link?
-        enable_config("static", true)
-      end
-
-      def debug_mode_build?
-        enable_config("debug-mode-build", ENV["PRISM_DEBUG_MODE_BUILD"] || false)
-      end
+          PRISM_DEBUG_MODE_BUILD
+              Equivalent to `--enable-debug-mode-build` when set, even if nil or blank.
+
+  TEXT
+  exit!(0)
+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.`
+def make(target)
+  Dir.chdir(File.expand_path("../..", __dir__)) do
+    # If this gem is being build from a git source, then we need to run
+    # templating if it hasn't been run yet. In normal packaging, we would have
+    # shipped the templated files with the gem, so this wouldn't be necessary.
+    if !File.exist?("include/prism/ast.h") && Dir.exist?(".git")
+      system("templates/template.rb", exception: true)
     end
+
+    system("make", target, exception: true)
   end
 end
 
-if ARGV.delete("--help")
-  Prism::ExtConf.print_help
-  exit!(0)
+require "rbconfig"
+
+# 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.
+if RUBY_ENGINE != "ruby"
+  make("build/libprism.#{RbConfig::CONFIG["SOEXT"]}")
+  File.write("Makefile", "all install clean:\n\t@#{RbConfig::CONFIG["NULLCMD"]}\n")
+  return
+end
+
+require "mkmf"
+
+# First, ensure that we can find the header for the prism library.
+unless find_header("prism.h", File.expand_path("../../include", __dir__))
+  raise "prism.h is required"
 end
 
-Prism::ExtConf.configure
+# Next, ensure we can find the header for the C extension. Explicitly look for
+# the extension header in the parent directory because we want to consistently
+# look for `prism/extension.h` in our source files to line up with our mirroring
+# in CRuby.
+unless find_header("prism/extension.h", File.expand_path("..", __dir__))
+  raise "prism/extension.h is required"
+end
+
+# If `--enable-debug-mode-build` is passed to this script or the
+# `PRISM_DEBUG_MODE_BUILD` environment variable is defined, we'll build with the
+# `PRISM_DEBUG_MODE_BUILD` macro defined. This causes parse functions to
+# duplicate their input so that they have clearly set bounds, which is useful
+# for finding bugs that cause the parser to read off the end of the input.
+if enable_config("debug-mode-build", ENV["PRISM_DEBUG_MODE_BUILD"] || false)
+  append_cflags("-DPRISM_DEBUG_MODE_BUILD")
+end
+
+# By default, all symbols are hidden in the shared library.
+append_cflags("-fvisibility=hidden")
+
+# We need to link against the libprism.a archive, which is built by the
+# project's `Makefile`. We'll build it if it doesn't exist yet, and then add it
+# to `mkmf`'s list of local libraries.
+archive_target = "build/libprism.a"
+archive_path = File.expand_path("../../#{archive_target}", __dir__)
+
+make(archive_target) unless File.exist?(archive_path)
+$LOCAL_LIBS << " #{archive_path}"
+
+# Finally, we'll create the `Makefile` that is going to be used to configure and
+# build the C extension.
+create_makefile("prism/prism")
+
+# Now that the `Makefile` for the C extension is built, we'll append on an extra
+# rule that dictates that the extension should be rebuilt if the archive is
+# updated.
+File.open("Makefile", "a") do |mf|
+  mf.puts
+  mf.puts("# Automatically rebuild the extension if libprism.a changed")
+  mf.puts("$(TARGET_SO): $(LOCAL_LIBS)")
+end

data/ext/prism/extension.c

@@ -1,7 +1,7 @@
 #include "prism/extension.h"
 
 // NOTE: this file should contain only bindings. All non-trivial logic should be
-// in librubyparser so it can be shared its the various callers.
+// in libprism so it can be shared its the various callers.
 
 VALUE rb_cPrism;
 VALUE rb_cPrismNode;
@@ -331,6 +331,9 @@ parser_comments(pm_parser_t *parser, VALUE source) {
             case PM_COMMENT___END__:
                 type = rb_cPrismDATAComment;
                 break;
+            default:
+                type = rb_cPrismInlineComment;
+                break;
         }
 
         VALUE comment_argv[] = { rb_class_new_instance(3, location_argv, rb_cPrismLocation) };

data/ext/prism/extension.h

@@ -1,7 +1,7 @@
 #ifndef PRISM_EXT_NODE_H
 #define PRISM_EXT_NODE_H
 
-#define EXPECTED_PRISM_VERSION "0.17.0"
+#define EXPECTED_PRISM_VERSION "0.18.0"
 
 #include <ruby.h>
 #include <ruby/encoding.h>