rbs 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f16a35868e75e53f28b6c63c095c60190f14e3eecb9d30b87046d184646176dd
-  data.tar.gz: 123998b67c9b926af173e64adeb0e9437ff784d13d960d50219274f472c36973
+  metadata.gz: 79b2c9781565a156da1f9a40c4e5facddac2112036a8a225fff739b647b3ff87
+  data.tar.gz: 6477d9d8ebd4eecbae21449c267a62d62835787570880fcc57cebe8da24d2670
 SHA512:
-  metadata.gz: f9ba3b43d4dbf19239b4ece9443d5da88ff2ca62cf73bfa102464537ecad3a3893b2d6de97679e51d25c2abd5bc43cfb69d608227aa779b6352a9a9ae78c1cac
-  data.tar.gz: cdec18fab9146ce955a5b10b74f9c068a8ebec8a229bf9019ec2772d99e47b57ece38342cb71a8b9b2740d99106151b6fa91e3a6c2c80685a386f58c63eb5757
+  metadata.gz: 6d1775cf14742b238334c2269c95446f0d7940a8ca33053cda9fe9bea6ed4a0f2dd3c4e8dee7090e2b469360af0391c01a4eb31bb9a1077df930410dc2e90161
+  data.tar.gz: '074178e6adf827eff91b13774ac77f45737d143ccc0679874ff9bafde373c606fdb052dea25cf7daa1d5ff8dfd05102be98c4398129a8db8c409752326ef5385'

data/.github/workflows/ruby.yml

@@ -66,3 +66,21 @@ jobs:
     - name: Run test
       run: |
         bundle exec rake ${{ matrix.job }}
+
+  windows:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ windows-2019, windows-2022 ]
+        ruby: [ ucrt, mswin ]
+    steps:
+      - uses: actions/checkout@v3
+      - name: load ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: rake-compiler
+        run: gem install rake-compiler
+      - name: compile
+        run: rake compile

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## master
 
+## 2.3.1 (2022-04-05)
+
+### Library changes
+
+* Fix mswin build, use `append_cflags`, add Windows 'compile only' CI  ([\#964](https://github.com/ruby/rbs/pull/964))
+* Raise `RBS::SyntaxError` from `parse_record_attributes` ([\#966](https://github.com/ruby/rbs/pull/966))
+* Toplevel constant must have the lowest precedence ([\#967](https://github.com/ruby/rbs/pull/967))
+
+#### rbs prototype
+
+* Use default value also for `literal_to_type` ([\#962](https://github.com/ruby/rbs/pull/962))
+
 ## 2.3.0 (2022-04-01)
 
 ### Signature updates

data/Gemfile.lock

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

data/ext/rbs_extension/extconf.rb

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

data/ext/rbs_extension/parser.c

@@ -684,7 +684,11 @@ VALUE parse_record_attributes(parserstate *state) {
         key = rb_funcall(parse_type(state), rb_intern("literal"), 0);
         break;
       default:
-        rbs_abort();
+        raise_syntax_error(
+          state,
+          state->next_token,
+          "unexpected record key token"
+        );
       }
       parser_advance_assert(state, pFATARROW);
     }

data/lib/rbs/definition_builder/ancestor_builder.rb

@@ -398,6 +398,7 @@ module RBS
 
         one_ancestors = one_instance_ancestors(type_name)
 
+        # @type var ancestors: Array[::RBS::Definition::Ancestor::t]
         ancestors = []
 
         case entry

data/lib/rbs/prototype/rb.rb

@@ -542,7 +542,7 @@ module RBS
           when :freeze, :tap, :itself, :dup, :clone, :taint, :untaint, :extend
             literal_to_type(receiver)
           else
-            default
+            untyped
           end
         else
           untyped

data/lib/rbs/resolver/constant_resolver.rb

@@ -106,10 +106,10 @@ module RBS
         # @type var consts: Hash[Symbol, Constant]
         consts = {}
 
-        if context
-          if last = context[1]
-            constants_from_ancestors(last, constants: consts)
-          end
+        if last = context&.[](1)
+          constants_from_ancestors(last, constants: consts)
+        else
+          constants_from_ancestors(BuiltinNames::Object.name, constants: consts)
         end
         constants_from_context(context, constants: consts) or return
         constants_itself(context, constants: consts)
@@ -122,7 +122,7 @@ module RBS
         constants = {}
 
         if table.children(name)
-          builder.ancestor_builder.instance_ancestors(name).ancestors.each do |ancestor|
+          builder.ancestor_builder.instance_ancestors(name).ancestors.reverse_each do |ancestor|
             if ancestor.is_a?(Definition::Ancestor::Instance)
               if ancestor.name == BuiltinNames::Object.name
                 if name != BuiltinNames::Object.name
@@ -152,19 +152,38 @@ module RBS
             consts = table.children(last) or return false
             constants.merge!(consts)
           end
-        else
-          constants.merge!(table.toplevel)
         end
 
         true
       end
 
       def constants_from_ancestors(module_name, constants:)
-        builder.ancestor_builder.instance_ancestors(module_name).ancestors.each do |ancestor|
+        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
+
+          self_types.each do |self_type|
+            if self_type.name.class?
+              constants_from_ancestors(self_type.name, constants: constants)
+            end
+          end
+        end
+
+        builder.ancestor_builder.instance_ancestors(module_name).ancestors.reverse_each do |ancestor|
           if ancestor.is_a?(Definition::Ancestor::Instance)
             case ancestor.source
             when AST::Members::Include, :super, nil
               consts = table.children(ancestor.name) or raise
+              if ancestor.name == BuiltinNames::Object.name
+                # Insert toplevel constants as ::Object's constants
+                consts.merge!(table.toplevel)
+              end
               constants.merge!(consts)
             end
           end

data/lib/rbs/version.rb

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

data/steep/Gemfile.lock

@@ -16,22 +16,22 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     minitest (5.15.0)
-    parallel (1.22.0)
+    parallel (1.22.1)
     parser (3.1.1.0)
       ast (~> 2.4.1)
     rainbow (3.1.1)
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (2.2.2)
-    steep (0.50.0)
+    rbs (2.3.0)
+    steep (0.51.0)
       activesupport (>= 5.1)
       language_server-protocol (>= 3.15, < 4.0)
       listen (~> 3.0)
       parallel (>= 1.0.0)
       parser (>= 3.0)
       rainbow (>= 2.2.2, < 4.0)
-      rbs (>= 2.2.0)
+      rbs (>= 2.3.0)
       terminal-table (>= 2, < 4)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)

metadata

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