rbs 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79b2c9781565a156da1f9a40c4e5facddac2112036a8a225fff739b647b3ff87
-  data.tar.gz: 6477d9d8ebd4eecbae21449c267a62d62835787570880fcc57cebe8da24d2670
+  metadata.gz: 72915c0f663f0fafeda4cbabba1de64b1d1d0c09fe8296308cb66b57c20311f1
+  data.tar.gz: feb1ae7af7f99635e9a16ae86d39cdb0220672e52aa5a264cff31705d7f892cc
 SHA512:
-  metadata.gz: 6d1775cf14742b238334c2269c95446f0d7940a8ca33053cda9fe9bea6ed4a0f2dd3c4e8dee7090e2b469360af0391c01a4eb31bb9a1077df930410dc2e90161
-  data.tar.gz: '074178e6adf827eff91b13774ac77f45737d143ccc0679874ff9bafde373c606fdb052dea25cf7daa1d5ff8dfd05102be98c4398129a8db8c409752326ef5385'
+  metadata.gz: 3f66fa2748f6b1e042498a3bf6a200968d80eca238251e85657f994ebd9a5d4716d162c15168fcebb02890f89c689877ed8d0eecdae0671fcf721220d68d1ded
+  data.tar.gz: a331220a1d7908ac0166b4fbb0e2b0d8c4ca6bb2a79437b9ecd44bd016f88e98dc16b01571e5829620b33d8ba5821b09c6d55c1f18512e5e76863067da509e60

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## master
 
+## 2.3.2 (2022-04-06)
+
+### Library changes
+
+* Let modules have constants under `::Object` ([\#972](https://github.com/ruby/rbs/pull/972))
+
+### Miscellaneous
+
+* Delete `-Wold-style-definition` ([\#971](https://github.com/ruby/rbs/pull/971))
+* `\e` is not defined in C90 ([\#970](https://github.com/ruby/rbs/pull/970))
+
 ## 2.3.1 (2022-04-05)
 
 ### Library changes

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbs (2.3.1)
+    rbs (2.3.2)
 
 PATH
   remote: test/assets/test-gem

data/ext/rbs_extension/extconf.rb

@@ -1,4 +1,4 @@
 require 'mkmf'
 $INCFLAGS << " -I$(top_srcdir)" if $extmk
-append_cflags ['-std=c99', '-Wold-style-definition']
+$CFLAGS += " -std=c99 "
 create_makefile 'rbs_extension'

data/ext/rbs_extension/unescape.c

@@ -22,7 +22,7 @@ void rbs_unescape_string(VALUE string) {
     rb_global_variable(&HASH);
     rb_hash_aset(HASH, rb_str_new_literal("\\a"), rb_str_new_literal("\a"));
     rb_hash_aset(HASH, rb_str_new_literal("\\b"), rb_str_new_literal("\b"));
-    rb_hash_aset(HASH, rb_str_new_literal("\\e"), rb_str_new_literal("\e"));
+    rb_hash_aset(HASH, rb_str_new_literal("\\e"), rb_str_new_literal("\033"));
     rb_hash_aset(HASH, rb_str_new_literal("\\f"), rb_str_new_literal("\f"));
     rb_hash_aset(HASH, rb_str_new_literal("\\n"), rb_str_new_literal("\n"));
     rb_hash_aset(HASH, rb_str_new_literal("\\r"), rb_str_new_literal("\r"));

data/lib/rbs/resolver/constant_resolver.rb

@@ -158,21 +158,11 @@ module RBS
       end
 
       def constants_from_ancestors(module_name, constants:)
-        if (entry = builder.env.class_decls[module_name]).is_a?(Environment::ModuleEntry)
-          self_types = entry.self_types
-          if self_types.empty?
-            self_types << AST::Declarations::Module::Self.new(
-              name: BuiltinNames::Object.name,
-              args: [],
-              location: nil
-            )
-          end
+        entry = builder.env.class_decls[module_name]
 
-          self_types.each do |self_type|
-            if self_type.name.class?
-              constants_from_ancestors(self_type.name, constants: constants)
-            end
-          end
+        if entry.is_a?(Environment::ModuleEntry)
+          constants.merge!(table.children(BuiltinNames::Object.name) || raise)
+          constants.merge!(table.toplevel)
         end
 
         builder.ancestor_builder.instance_ancestors(module_name).ancestors.reverse_each do |ancestor|
@@ -180,7 +170,7 @@ module RBS
             case ancestor.source
             when AST::Members::Include, :super, nil
               consts = table.children(ancestor.name) or raise
-              if ancestor.name == BuiltinNames::Object.name
+              if ancestor.name == BuiltinNames::Object.name && entry.is_a?(Environment::ClassEntry)
                 # Insert toplevel constants as ::Object's constants
                 consts.merge!(table.toplevel)
               end

data/lib/rbs/version.rb

@@ -1,3 +1,3 @@
 module RBS
-  VERSION = "2.3.1"
+  VERSION = "2.3.2"
 end

data/steep/Gemfile.lock

@@ -23,8 +23,8 @@ GEM
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (2.3.0)
-    steep (0.51.0)
+    rbs (2.3.1)
+    steep (0.52.0)
       activesupport (>= 5.1)
       language_server-protocol (>= 3.15, < 4.0)
       listen (~> 3.0)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-05 00:00:00.000000000 Z
+date: 2022-04-06 00:00:00.000000000 Z
 dependencies: []
 description: RBS is the language for type signatures for Ruby and standard library
   definitions.