Merge master and support upstream's parser enhancements #41

st0012 · 2025-04-25T08:19:06Z

ruby/rbs recently received a few enhancements for new keywords and inline parsing:

So the major change of this PR is to reimplement them under the c-api structure.

A sub buffer is a buffer that contains slices of a buffer.

* Position APIs returns the absolute position of the buffer * Use `#local_location` to access the local positions of a sub-buffer

Bumps [csv](https://github.com/ruby/csv) from 3.3.3 to 3.3.4. - [Release notes](https://github.com/ruby/csv/releases) - [Changelog](https://github.com/ruby/csv/blob/main/NEWS.md) - [Commits](ruby/csv@v3.3.3...v3.3.4) --- updated-dependencies: - dependency-name: csv dependency-version: 3.3.4 dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [strscan](https://github.com/ruby/strscan) from 3.1.2 to 3.1.3. - [Release notes](https://github.com/ruby/strscan/releases) - [Changelog](https://github.com/ruby/strscan/blob/master/NEWS.md) - [Commits](ruby/strscan@v3.1.2...v3.1.3) --- updated-dependencies: - dependency-name: strscan dependency-version: 3.1.3 dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

….3.4 Bump csv from 3.3.3 to 3.3.4 in /steep

…an-3.1.3 Bump strscan from 3.1.2 to 3.1.3 in /steep

Bumps [rubocop-ast](https://github.com/rubocop/rubocop-ast) from 1.44.0 to 1.44.1. - [Release notes](https://github.com/rubocop/rubocop-ast/releases) - [Changelog](https://github.com/rubocop/rubocop-ast/blob/master/CHANGELOG.md) - [Commits](rubocop/rubocop-ast@v1.44.0...v1.44.1) --- updated-dependencies: - dependency-name: rubocop-ast dependency-version: 1.44.1 dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [parser](https://github.com/whitequark/parser) from 3.3.7.4 to 3.3.8.0. - [Changelog](https://github.com/whitequark/parser/blob/master/CHANGELOG.md) - [Commits](whitequark/parser@v3.3.7.4...v3.3.8.0) --- updated-dependencies: - dependency-name: parser dependency-version: 3.3.8.0 dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

…-1.44.1 Bump rubocop-ast from 1.44.0 to 1.44.1

Bump parser from 3.3.7.4 to 3.3.8.0

Inline annotations

Add `@rbs skip` annotation

Bumps [sorbet-runtime](https://github.com/sorbet/sorbet) from 0.5.12017 to 0.5.12020. - [Release notes](https://github.com/sorbet/sorbet/releases) - [Commits](https://github.com/sorbet/sorbet/commits) --- updated-dependencies: - dependency-name: sorbet-runtime dependency-version: 0.5.12020 dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [connection_pool](https://github.com/mperham/connection_pool) from 2.5.0 to 2.5.1. - [Changelog](https://github.com/mperham/connection_pool/blob/main/Changes.md) - [Commits](mperham/connection_pool@v2.5.0...v2.5.1) --- updated-dependencies: - dependency-name: connection_pool dependency-version: 2.5.1 dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

…t-runtime-0.5.12020 Bump sorbet-runtime from 0.5.12017 to 0.5.12020 in /steep

…ction_pool-2.5.1 Bump connection_pool from 2.5.0 to 2.5.1 in /steep

Bumps [connection_pool](https://github.com/mperham/connection_pool) from 2.5.0 to 2.5.1. - [Changelog](https://github.com/mperham/connection_pool/blob/main/Changes.md) - [Commits](mperham/connection_pool@v2.5.0...v2.5.1) --- updated-dependencies: - dependency-name: connection_pool dependency-version: 2.5.1 dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

…pool-2.5.1 Bump connection_pool from 2.5.0 to 2.5.1

Bumps [sorbet-runtime](https://github.com/sorbet/sorbet) from 0.5.12020 to 0.5.12024. - [Release notes](https://github.com/sorbet/sorbet/releases) - [Commits](https://github.com/sorbet/sorbet/commits) --- updated-dependencies: - dependency-name: sorbet-runtime dependency-version: 0.5.12024 dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

…t-runtime-0.5.12024 Bump sorbet-runtime from 0.5.12020 to 0.5.12024 in /steep

Bumps [sorbet-runtime](https://github.com/sorbet/sorbet) from 0.5.12024 to 0.5.12026. - [Release notes](https://github.com/sorbet/sorbet/releases) - [Commits](https://github.com/sorbet/sorbet/commits) --- updated-dependencies: - dependency-name: sorbet-runtime dependency-version: 0.5.12026 dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

…t-runtime-0.5.12026 Bump sorbet-runtime from 0.5.12024 to 0.5.12026 in /steep

Bumps [stringio](https://github.com/ruby/stringio) from 3.1.6 to 3.1.7. - [Release notes](https://github.com/ruby/stringio/releases) - [Changelog](https://github.com/ruby/stringio/blob/master/NEWS.md) - [Commits](ruby/stringio@v3.1.6...v3.1.7) --- updated-dependencies: - dependency-name: stringio dependency-version: 3.1.7 dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

Bump stringio from 3.1.6 to 3.1.7

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.18.7 to 1.18.8. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](sparklemotion/nokogiri@v1.18.7...v1.18.8) --- updated-dependencies: - dependency-name: nokogiri dependency-version: 1.18.8 dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>

…18.8 Bump nokogiri from 1.18.7 to 1.18.8

Bumps [sorbet-runtime](https://github.com/sorbet/sorbet) from 0.5.12026 to 0.5.12028. - [Release notes](https://github.com/sorbet/sorbet/releases) - [Commits](https://github.com/sorbet/sorbet/commits) --- updated-dependencies: - dependency-name: sorbet-runtime dependency-version: 0.5.12028 dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

…t-runtime-0.5.12028 Bump sorbet-runtime from 0.5.12026 to 0.5.12028 in /steep

Bumps [sorbet-runtime](https://github.com/sorbet/sorbet) from 0.5.12028 to 0.5.12032. - [Release notes](https://github.com/sorbet/sorbet/releases) - [Commits](https://github.com/sorbet/sorbet/commits) --- updated-dependencies: - dependency-name: sorbet-runtime dependency-version: 0.5.12032 dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

…t-runtime-0.5.12032 Bump sorbet-runtime from 0.5.12028 to 0.5.12032 in /steep

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.75.2 to 1.75.3. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](rubocop/rubocop@v1.75.2...v1.75.3) --- updated-dependencies: - dependency-name: rubocop dependency-version: 1.75.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

Bump rubocop from 1.75.2 to 1.75.3

st0012 · 2025-04-25T08:21:09Z

include/rbs/location.h

+  rbs_location_list_node_t *head;
+  rbs_location_list_node_t *tail;
+  size_t length;
+} rbs_location_list_t;


The new MethodTypesAnnotation type node has an attribute called vertical_bar_locations that holds a list of locations. Since we currently don't have a data structure for that, I added this by mimicking the rbs_node_list struct.

st0012 · 2025-04-25T08:31:00Z

src/parser.c

-      rbs_parser_set_error(parser, parser->current_token, false, "Unexpected error");
-      return false;
-    }
+    switch (parser->current_token.type) {


Following upstream to use switch

st0012 · 2025-04-25T08:32:11Z

templates/ext/rbs_extension/ast_translation.c.erb

@@ -37,6 +37,10 @@ VALUE rbs_hash_to_ruby_hash(rbs_translation_context_t ctx, rbs_hash_t *rbs_hash)
 }

 VALUE rbs_loc_to_ruby_location(rbs_translation_context_t ctx, rbs_location_t *source_loc) {
+  if (source_loc == NULL) {


This is for the new ReturnTypeAnnotation as its comment_location attribute is a nilable Location.
The alternatives would be either:

Add a new nilable_rbs_location C type to the template and config.yml

Or, have a case in templates specifically for comment_location

st0012 · 2025-04-25T08:34:40Z

templates/src/ast.c.erb

@@ -207,6 +207,8 @@ void rbs_node_destroy(rbs_node_t *any_node) {
        <%- case field.c_type -%>
        <%- when "rbs_node_list" -%>
        rbs_node_list_free(node-><%= field.c_name %>);
+        <%- when "rbs_location_list" -%>
+        // We don't need to free locations as they're owned by the arena.


We probably won't need this anyway with #40

`rbs_node_destroy`, `rbs_hash_free`, `rbs_node_list_free` are only calling each other recursively without any real freeing logic. This is the result of previous efforts to allocate all nodes on the arena. So we don't need these functions anymore. Discovered while working on #41

Morriar · 2025-04-25T13:53:29Z

lib/rbs/ast/ruby/annotations.rb

+            self.class.new(
+              location:, prefix_location:,
+              type: type.map_type_name { yield _1 }
+            ) #: self


soutaro and others added 30 commits April 9, 2025 16:13

Introduce sub buffer

5668949

A sub buffer is a buffer that contains slices of a buffer.

Let Location support sub buffers

cbff9ec

* Position APIs returns the absolute position of the buffer * Use `#local_location` to access the local positions of a sub-buffer

Add inline annotation AST

4a9d257

Add @rbs token

7211c18

Setup bridge between parser and AST

d0b2e36

Parse inline trailing : TYPE annotation

41da42e

Parser inline leading : METHOD-TYPE annotation

7ac54d4

Parser inline leading @rbs METHOD-TYPEs annotation

94facd8

Add parsing error test

13478cf

Add CommentBlock

15d2614

Add CommentAssociation

0f4fd2c

Merge pull request ruby#2399 from ruby/dependabot/bundler/steep/csv-3…

816a5a0

….3.4 Bump csv from 3.3.3 to 3.3.4 in /steep

Merge pull request ruby#2400 from ruby/dependabot/bundler/steep/strsc…

de95753

…an-3.1.3 Bump strscan from 3.1.2 to 3.1.3 in /steep

Merge pull request ruby#2401 from ruby/dependabot/bundler/rubocop-ast…

9100dc6

…-1.44.1 Bump rubocop-ast from 1.44.0 to 1.44.1

Merge pull request ruby#2402 from ruby/dependabot/bundler/parser-3.3.8.0

6f9725e

Bump parser from 3.3.7.4 to 3.3.8.0

Add MethodTypeAnnotation class

594ee7d

Implement inline parser with method type annotations

3178cfc

Use Struct instead of Data

b0173c2

Add frozen_string_literal comment

de06b01

Merge pull request ruby#2403 from ruby/inline-annotations

674dbdf

Inline annotations

Add SkipAnnotation AST

c8b7fce

Add skip keyword

1ceb7af

Implement parser

0795a23

Update parser to support skip annotation

76e1b46

Merge pull request ruby#2405 from ruby/inline-skip-annotation

351b6cd

Add `@rbs skip` annotation

Add annotation AST

30af9cb

dependabot bot and others added 20 commits April 17, 2025 06:41

Merge pull request ruby#2415 from ruby/dependabot/bundler/steep/sorbe…

2323647

…t-runtime-0.5.12020 Bump sorbet-runtime from 0.5.12017 to 0.5.12020 in /steep

Merge pull request ruby#2416 from ruby/dependabot/bundler/steep/conne…

442c31e

…ction_pool-2.5.1 Bump connection_pool from 2.5.0 to 2.5.1 in /steep

Merge pull request ruby#2417 from ruby/dependabot/bundler/connection_…

a69db44

…pool-2.5.1 Bump connection_pool from 2.5.0 to 2.5.1

Merge pull request ruby#2418 from ruby/dependabot/bundler/steep/sorbe…

33804aa

…t-runtime-0.5.12024 Bump sorbet-runtime from 0.5.12020 to 0.5.12024 in /steep

Merge pull request ruby#2420 from ruby/dependabot/bundler/steep/sorbe…

e43b3b6

…t-runtime-0.5.12026 Bump sorbet-runtime from 0.5.12024 to 0.5.12026 in /steep

Merge pull request ruby#2421 from ruby/dependabot/bundler/stringio-3.1.7

bdefcc4

Bump stringio from 3.1.6 to 3.1.7

Merge pull request ruby#2422 from ruby/dependabot/bundler/nokogiri-1.…

65141c9

…18.8 Bump nokogiri from 1.18.7 to 1.18.8

Merge pull request ruby#2423 from ruby/dependabot/bundler/steep/sorbe…

8d6a164

…t-runtime-0.5.12028 Bump sorbet-runtime from 0.5.12026 to 0.5.12028 in /steep

Merge pull request ruby#2424 from ruby/dependabot/bundler/steep/sorbe…

b25d268

…t-runtime-0.5.12032 Bump sorbet-runtime from 0.5.12028 to 0.5.12032 in /steep

Merge pull request ruby#2425 from ruby/dependabot/bundler/rubocop-1.75.3

e73a2ec

Bump rubocop from 1.75.2 to 1.75.3

st0012 commented Apr 25, 2025

View reviewed changes

Merge branch 'master' into merge-master

afc0f98

st0012 force-pushed the merge-master branch from 791e0bc to afc0f98 Compare April 25, 2025 08:35

st0012 mentioned this pull request Apr 25, 2025

Remove unnecessary freeing functions #40

Merged

st0012 requested review from Morriar and amomchilov April 25, 2025 12:21

Merge branch 'c-api' into merge-master

b5e5032

Morriar reviewed Apr 25, 2025

View reviewed changes

lib/rbs/ast/ruby/annotations.rb

self.class.new(

location:, prefix_location:,

type: type.map_type_name { yield _1 }

) #: self

Copy link

Morriar Apr 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❤️

Morriar approved these changes Apr 25, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge master and support upstream's parser enhancements #41

Merge master and support upstream's parser enhancements #41

st0012 commented Apr 25, 2025

st0012 Apr 25, 2025

st0012 Apr 25, 2025

st0012 Apr 25, 2025

st0012 Apr 25, 2025

Morriar Apr 25, 2025

Merge master and support upstream's parser enhancements #41

Are you sure you want to change the base?

Merge master and support upstream's parser enhancements #41

Conversation

st0012 commented Apr 25, 2025

st0012 Apr 25, 2025

Choose a reason for hiding this comment

st0012 Apr 25, 2025

Choose a reason for hiding this comment

st0012 Apr 25, 2025

Choose a reason for hiding this comment

st0012 Apr 25, 2025

Choose a reason for hiding this comment

Morriar Apr 25, 2025

Choose a reason for hiding this comment