rbs 2.8.4 → 3.8.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/dependabot.yml +12 -4
- data/.github/workflows/comments.yml +11 -11
- data/.github/workflows/dependabot.yml +30 -0
- data/.github/workflows/ruby.yml +40 -49
- data/.github/workflows/typecheck.yml +36 -0
- data/.github/workflows/windows.yml +28 -0
- data/.gitignore +1 -0
- data/.rubocop.yml +42 -2
- data/CHANGELOG.md +845 -1
- data/README.md +64 -4
- data/Rakefile +198 -18
- data/Steepfile +11 -11
- data/config.yml +311 -0
- data/core/array.rbs +2189 -1914
- data/core/basic_object.rbs +59 -84
- data/core/binding.rbs +7 -69
- data/core/builtin.rbs +210 -11
- data/core/class.rbs +37 -0
- data/core/comparable.rbs +23 -25
- data/core/complex.rbs +449 -227
- data/core/constants.rbs +29 -21
- data/core/data.rbs +415 -0
- data/core/dir.rbs +698 -415
- data/core/encoding.rbs +468 -843
- data/core/enumerable.rbs +495 -455
- data/core/enumerator/product.rbs +92 -0
- data/core/enumerator.rbs +106 -9
- data/core/env.rbs +1 -1
- data/core/errno.rbs +506 -605
- data/core/errors.rbs +15 -17
- data/core/exception.rbs +361 -145
- data/core/false_class.rbs +39 -26
- data/core/fiber.rbs +121 -14
- data/core/file.rbs +1262 -320
- data/core/file_test.rbs +62 -45
- data/core/float.rbs +187 -208
- data/core/gc.rbs +446 -196
- data/core/global_variables.rbs +29 -29
- data/core/hash.rbs +242 -349
- data/core/integer.rbs +246 -308
- data/core/io/buffer.rbs +373 -122
- data/core/io/wait.rbs +29 -17
- data/core/io.rbs +1881 -1518
- data/core/kernel.rbs +2116 -1538
- data/core/marshal.rbs +24 -14
- data/core/match_data.rbs +413 -166
- data/core/math.rbs +531 -291
- data/core/method.rbs +101 -32
- data/core/module.rbs +228 -64
- data/core/nil_class.rbs +106 -47
- data/core/numeric.rbs +206 -292
- data/core/object.rbs +73 -1168
- data/core/object_space/weak_key_map.rbs +166 -0
- data/core/object_space.rbs +5 -3
- data/core/proc.rbs +280 -39
- data/core/process.rbs +1318 -658
- data/core/ractor.rbs +200 -134
- data/core/random.rbs +21 -4
- data/core/range.rbs +309 -153
- data/core/rational.rbs +4 -12
- data/core/rb_config.rbs +64 -43
- data/core/rbs/unnamed/argf.rbs +411 -147
- data/core/rbs/unnamed/env_class.rbs +137 -253
- data/core/rbs/unnamed/random.rbs +49 -26
- data/core/refinement.rbs +16 -1
- data/core/regexp.rbs +1568 -862
- data/core/ruby_vm.rbs +719 -7
- data/core/rubygems/config_file.rbs +3 -0
- data/core/rubygems/errors.rbs +69 -6
- data/core/rubygems/rubygems.rbs +71 -17
- data/core/rubygems/version.rbs +11 -7
- data/{stdlib/set/0 → core}/set.rbs +80 -91
- data/core/signal.rbs +14 -8
- data/core/string.rbs +1732 -1607
- data/core/struct.rbs +467 -95
- data/core/symbol.rbs +215 -245
- data/core/thread.rbs +133 -89
- data/core/thread_group.rbs +9 -9
- data/core/time.rbs +1141 -841
- data/core/trace_point.rbs +181 -121
- data/core/true_class.rbs +58 -32
- data/core/unbound_method.rbs +103 -30
- data/core/warning.rbs +50 -5
- data/docs/CONTRIBUTING.md +1 -1
- data/docs/architecture.md +110 -0
- data/docs/collection.md +59 -5
- data/docs/data_and_struct.md +86 -0
- data/docs/gem.md +57 -0
- data/docs/rbs_by_example.md +16 -35
- data/docs/repo.md +1 -1
- data/docs/sigs.md +7 -7
- data/docs/stdlib.md +63 -5
- data/docs/syntax.md +255 -61
- data/docs/tools.md +1 -0
- data/ext/rbs_extension/extconf.rb +10 -0
- data/ext/rbs_extension/lexer.c +1741 -1548
- data/ext/rbs_extension/lexer.h +11 -1
- data/ext/rbs_extension/lexer.re +12 -6
- data/ext/rbs_extension/lexstate.c +26 -3
- data/ext/rbs_extension/location.c +119 -111
- data/ext/rbs_extension/location.h +32 -7
- data/ext/rbs_extension/main.c +3 -0
- data/ext/rbs_extension/parser.c +883 -481
- data/ext/rbs_extension/parserstate.c +65 -25
- data/ext/rbs_extension/parserstate.h +13 -3
- data/ext/rbs_extension/rbs_extension.h +1 -10
- data/ext/rbs_extension/unescape.c +7 -47
- data/goodcheck.yml +2 -2
- data/{ext/rbs_extension → include/rbs}/constants.h +26 -15
- data/include/rbs/ruby_objs.h +72 -0
- data/include/rbs.h +7 -0
- data/lib/rbs/annotate/annotations.rb +3 -3
- data/lib/rbs/annotate/formatter.rb +13 -3
- data/lib/rbs/annotate/rdoc_annotator.rb +1 -1
- data/lib/rbs/annotate/rdoc_source.rb +12 -3
- data/lib/rbs/ast/declarations.rb +85 -2
- data/lib/rbs/ast/directives.rb +39 -0
- data/lib/rbs/ast/members.rb +49 -15
- data/lib/rbs/ast/type_param.rb +104 -15
- data/lib/rbs/ast/visitor.rb +137 -0
- data/lib/rbs/buffer.rb +5 -0
- data/lib/rbs/cli/colored_io.rb +48 -0
- data/lib/rbs/cli/diff.rb +83 -0
- data/lib/rbs/cli/validate.rb +356 -0
- data/lib/rbs/cli.rb +253 -143
- data/lib/rbs/collection/cleaner.rb +8 -1
- data/lib/rbs/collection/config/lockfile.rb +92 -0
- data/lib/rbs/collection/config/lockfile_generator.rb +154 -65
- data/lib/rbs/collection/config.rb +19 -46
- data/lib/rbs/collection/installer.rb +12 -13
- data/lib/rbs/collection/sources/base.rb +2 -2
- data/lib/rbs/collection/sources/git.rb +146 -69
- data/lib/rbs/collection/sources/local.rb +81 -0
- data/lib/rbs/collection/sources/rubygems.rb +10 -12
- data/lib/rbs/collection/sources/stdlib.rb +14 -13
- data/lib/rbs/collection/sources.rb +15 -2
- data/lib/rbs/collection.rb +2 -1
- data/lib/rbs/definition.rb +13 -16
- data/lib/rbs/definition_builder/ancestor_builder.rb +100 -24
- data/lib/rbs/definition_builder/method_builder.rb +4 -4
- data/lib/rbs/definition_builder.rb +489 -584
- data/lib/rbs/diff.rb +125 -0
- data/lib/rbs/environment/use_map.rb +77 -0
- data/lib/rbs/environment.rb +406 -105
- data/lib/rbs/environment_loader.rb +48 -44
- data/lib/rbs/environment_walker.rb +1 -1
- data/lib/rbs/errors.rb +175 -56
- data/lib/rbs/file_finder.rb +28 -0
- data/lib/rbs/location_aux.rb +8 -7
- data/lib/rbs/locator.rb +37 -15
- data/lib/rbs/method_type.rb +23 -0
- data/lib/rbs/namespace.rb +1 -0
- data/lib/rbs/parser/lex_result.rb +15 -0
- data/lib/rbs/parser/token.rb +23 -0
- data/lib/rbs/parser_aux.rb +22 -13
- data/lib/rbs/prototype/helpers.rb +48 -22
- data/lib/rbs/prototype/node_usage.rb +99 -0
- data/lib/rbs/prototype/rb.rb +125 -31
- data/lib/rbs/prototype/rbi.rb +49 -36
- data/lib/rbs/prototype/runtime/helpers.rb +59 -0
- data/lib/rbs/prototype/runtime/reflection.rb +19 -0
- data/lib/rbs/prototype/runtime/value_object_generator.rb +279 -0
- data/lib/rbs/prototype/runtime.rb +273 -159
- data/lib/rbs/resolver/constant_resolver.rb +24 -8
- data/lib/rbs/resolver/type_name_resolver.rb +41 -7
- data/lib/rbs/sorter.rb +153 -123
- data/lib/rbs/substitution.rb +19 -0
- data/lib/rbs/subtractor.rb +201 -0
- data/lib/rbs/test/errors.rb +24 -11
- data/lib/rbs/test/guaranteed.rb +30 -0
- data/lib/rbs/test/hook.rb +45 -40
- data/lib/rbs/test/setup.rb +1 -1
- data/lib/rbs/test/tester.rb +1 -1
- data/lib/rbs/test/type_check.rb +120 -23
- data/lib/rbs/test.rb +6 -3
- data/lib/rbs/type_alias_dependency.rb +13 -3
- data/lib/rbs/type_alias_regularity.rb +21 -14
- data/lib/rbs/type_name.rb +18 -13
- data/lib/rbs/types.rb +352 -18
- data/lib/rbs/unit_test/convertibles.rb +176 -0
- data/lib/rbs/unit_test/spy.rb +136 -0
- data/lib/rbs/unit_test/type_assertions.rb +341 -0
- data/lib/rbs/unit_test/with_aliases.rb +143 -0
- data/lib/rbs/unit_test.rb +6 -0
- data/lib/rbs/validator.rb +55 -30
- data/lib/rbs/variance_calculator.rb +26 -23
- data/lib/rbs/vendorer.rb +3 -3
- data/lib/rbs/version.rb +1 -1
- data/lib/rbs/writer.rb +69 -22
- data/lib/rbs.rb +7 -2
- data/lib/rdoc/discover.rb +1 -1
- data/lib/rdoc_plugin/parser.rb +5 -5
- data/rbs.gemspec +12 -2
- data/schema/decls.json +1 -1
- data/schema/members.json +15 -10
- data/sig/ancestor_builder.rbs +4 -0
- data/sig/ancestor_graph.rbs +22 -2
- data/sig/annotate/formatter.rbs +2 -2
- data/sig/annotate/rdoc_annotater.rbs +1 -1
- data/sig/cli/colored_io.rbs +15 -0
- data/sig/cli/diff.rbs +21 -0
- data/sig/cli/validate.rbs +43 -0
- data/sig/cli.rbs +4 -0
- data/sig/collection/config/lockfile.rbs +74 -0
- data/sig/collection/config/lockfile_generator.rbs +66 -0
- data/sig/collection/config.rbs +5 -48
- data/sig/collection/installer.rbs +1 -1
- data/sig/collection/sources.rbs +105 -33
- data/sig/constant.rbs +1 -1
- data/sig/declarations.rbs +42 -3
- data/sig/definition.rbs +26 -10
- data/sig/definition_builder.rbs +103 -81
- data/sig/diff.rbs +28 -0
- data/sig/directives.rbs +61 -0
- data/sig/environment.rbs +175 -29
- data/sig/environment_loader.rbs +20 -18
- data/sig/errors.rbs +123 -2
- data/sig/file_finder.rbs +28 -0
- data/sig/location.rbs +0 -3
- data/sig/locator.rbs +14 -2
- data/sig/manifest.yaml +0 -1
- data/sig/members.rbs +32 -9
- data/sig/method_types.rbs +10 -4
- data/sig/namespace.rbs +2 -3
- data/sig/parser.rbs +55 -16
- data/sig/prototype/helpers.rbs +4 -0
- data/sig/prototype/node_usage.rbs +20 -0
- data/sig/prototype/rb.rbs +10 -2
- data/sig/prototype/rbi.rbs +2 -0
- data/sig/prototype/runtime.rbs +182 -0
- data/sig/rbs.rbs +1 -1
- data/sig/rdoc/rbs.rbs +4 -0
- data/sig/repository.rbs +7 -5
- data/sig/resolver/constant_resolver.rbs +3 -4
- data/sig/resolver/context.rbs +1 -1
- data/sig/resolver/type_name_resolver.rbs +5 -1
- data/sig/shims/bundler.rbs +38 -0
- data/sig/shims/rubygems.rbs +19 -0
- data/sig/sorter.rbs +23 -5
- data/sig/substitution.rbs +6 -0
- data/sig/subtractor.rbs +37 -0
- data/sig/test/errors.rbs +52 -0
- data/sig/test/guranteed.rbs +9 -0
- data/sig/test/type_check.rbs +19 -0
- data/sig/test.rbs +82 -0
- data/sig/type_alias_dependency.rbs +31 -0
- data/sig/type_alias_regularity.rbs +12 -6
- data/sig/type_param.rbs +45 -9
- data/sig/typename.rbs +8 -5
- data/sig/types.rbs +119 -12
- data/sig/unit_test/convertibles.rbs +154 -0
- data/sig/unit_test/spy.rbs +28 -0
- data/sig/unit_test/type_assertions.rbs +194 -0
- data/sig/unit_test/with_aliases.rbs +136 -0
- data/sig/use_map.rbs +35 -0
- data/sig/validator.rbs +12 -5
- data/sig/variance_calculator.rbs +3 -1
- data/sig/vendorer.rbs +1 -1
- data/sig/visitor.rbs +47 -0
- data/sig/writer.rbs +6 -2
- data/src/constants.c +153 -0
- data/src/ruby_objs.c +793 -0
- data/stdlib/base64/0/base64.rbs +298 -45
- data/stdlib/benchmark/0/benchmark.rbs +12 -3
- data/stdlib/bigdecimal/0/big_decimal.rbs +62 -198
- data/stdlib/cgi/0/core.rbs +68 -15
- data/stdlib/cgi/0/manifest.yaml +1 -0
- data/stdlib/coverage/0/coverage.rbs +50 -11
- data/stdlib/csv/0/csv.rbs +90 -119
- data/stdlib/csv/0/manifest.yaml +1 -0
- data/stdlib/date/0/date.rbs +806 -735
- data/stdlib/date/0/date_time.rbs +70 -211
- data/stdlib/dbm/0/dbm.rbs +0 -2
- data/stdlib/delegate/0/delegator.rbs +184 -0
- data/stdlib/delegate/0/kernel.rbs +47 -0
- data/stdlib/delegate/0/simple_delegator.rbs +96 -0
- data/stdlib/did_you_mean/0/did_you_mean.rbs +3 -8
- data/stdlib/digest/0/digest.rbs +48 -35
- data/stdlib/erb/0/erb.rbs +15 -39
- data/stdlib/etc/0/etc.rbs +174 -54
- data/stdlib/fileutils/0/fileutils.rbs +1234 -385
- data/stdlib/forwardable/0/forwardable.rbs +4 -4
- data/stdlib/io-console/0/io-console.rbs +82 -17
- data/stdlib/ipaddr/0/ipaddr.rbs +11 -6
- data/stdlib/json/0/json.rbs +434 -151
- data/stdlib/kconv/0/kconv.rbs +166 -0
- data/stdlib/logger/0/formatter.rbs +0 -2
- data/stdlib/logger/0/log_device.rbs +1 -3
- data/stdlib/logger/0/logger.rbs +465 -328
- data/stdlib/minitest/0/kernel.rbs +2 -2
- data/stdlib/minitest/0/minitest/abstract_reporter.rbs +4 -1
- data/stdlib/minitest/0/minitest/assertion.rbs +1 -0
- data/stdlib/minitest/0/minitest/assertions.rbs +58 -13
- data/stdlib/minitest/0/minitest/backtrace_filter.rbs +7 -0
- data/stdlib/minitest/0/minitest/bench_spec.rbs +8 -8
- data/stdlib/minitest/0/minitest/benchmark.rbs +17 -16
- data/stdlib/minitest/0/minitest/compress.rbs +13 -0
- data/stdlib/minitest/0/minitest/error_on_warning.rbs +3 -0
- data/stdlib/minitest/0/minitest/mock.rbs +9 -5
- data/stdlib/minitest/0/minitest/parallel/executor.rbs +4 -0
- data/stdlib/minitest/0/minitest/parallel/test/class_methods.rbs +0 -1
- data/stdlib/minitest/0/minitest/pride_io.rbs +8 -0
- data/stdlib/minitest/0/minitest/pride_lol.rbs +2 -0
- data/stdlib/minitest/0/minitest/progress_reporter.rbs +1 -1
- data/stdlib/minitest/0/minitest/reportable.rbs +2 -0
- data/stdlib/minitest/0/minitest/runnable.rbs +33 -1
- data/stdlib/minitest/0/minitest/spec/dsl/instance_methods.rbs +1 -1
- data/stdlib/minitest/0/minitest/spec/dsl.rbs +10 -6
- data/stdlib/minitest/0/minitest/spec.rbs +1 -1
- data/stdlib/minitest/0/minitest/statistics_reporter.rbs +5 -0
- data/stdlib/minitest/0/minitest/summary_reporter.rbs +0 -7
- data/stdlib/minitest/0/minitest/test/lifecycle_hooks.rbs +7 -7
- data/stdlib/minitest/0/minitest/test.rbs +7 -14
- data/stdlib/minitest/0/minitest/unexpected_error.rbs +2 -0
- data/stdlib/minitest/0/minitest/unexpected_warning.rbs +6 -0
- data/stdlib/minitest/0/minitest/unit.rbs +1 -2
- data/stdlib/minitest/0/minitest.rbs +41 -892
- data/stdlib/monitor/0/monitor.rbs +91 -10
- data/stdlib/mutex_m/0/mutex_m.rbs +0 -2
- data/stdlib/net-http/0/manifest.yaml +1 -1
- data/stdlib/net-http/0/net-http.rbs +3858 -964
- data/stdlib/net-protocol/0/manifest.yaml +2 -0
- data/stdlib/net-protocol/0/net-protocol.rbs +56 -0
- data/stdlib/net-smtp/0/manifest.yaml +2 -0
- data/stdlib/net-smtp/0/net-smtp.rbs +55 -0
- data/stdlib/nkf/0/nkf.rbs +35 -5
- data/stdlib/objspace/0/objspace.rbs +40 -18
- data/stdlib/observable/0/observable.rbs +217 -0
- data/stdlib/open-uri/0/manifest.yaml +4 -0
- data/stdlib/open-uri/0/open-uri.rbs +393 -0
- data/stdlib/open3/0/open3.rbs +147 -0
- data/stdlib/openssl/0/manifest.yaml +1 -0
- data/stdlib/openssl/0/openssl.rbs +681 -316
- data/stdlib/optparse/0/optparse.rbs +100 -65
- data/stdlib/pathname/0/pathname.rbs +24 -15
- data/stdlib/pp/0/manifest.yaml +2 -0
- data/stdlib/pp/0/pp.rbs +300 -0
- data/stdlib/prettyprint/0/prettyprint.rbs +2 -6
- data/stdlib/pstore/0/pstore.rbs +370 -156
- data/stdlib/psych/0/core_ext.rbs +12 -0
- data/stdlib/{yaml → psych}/0/dbm.rbs +3 -3
- data/stdlib/psych/0/manifest.yaml +3 -0
- data/stdlib/psych/0/psych.rbs +402 -0
- data/stdlib/{yaml → psych}/0/store.rbs +2 -2
- data/stdlib/pty/0/pty.rbs +63 -11
- data/stdlib/rdoc/0/code_object.rbs +51 -0
- data/stdlib/rdoc/0/comment.rbs +59 -0
- data/stdlib/rdoc/0/context.rbs +153 -0
- data/stdlib/rdoc/0/markup.rbs +117 -0
- data/stdlib/rdoc/0/parser.rbs +56 -0
- data/stdlib/rdoc/0/rdoc.rbs +13 -380
- data/stdlib/rdoc/0/ri.rbs +17 -0
- data/stdlib/rdoc/0/store.rbs +48 -0
- data/stdlib/rdoc/0/top_level.rbs +97 -0
- data/stdlib/resolv/0/resolv.rbs +16 -79
- data/stdlib/ripper/0/ripper.rbs +1648 -0
- data/stdlib/securerandom/0/securerandom.rbs +7 -2
- data/stdlib/shellwords/0/shellwords.rbs +11 -12
- data/stdlib/singleton/0/singleton.rbs +0 -3
- data/stdlib/socket/0/addrinfo.rbs +13 -18
- data/stdlib/socket/0/basic_socket.rbs +5 -10
- data/stdlib/socket/0/ip_socket.rbs +0 -2
- data/stdlib/socket/0/socket.rbs +77 -46
- data/stdlib/socket/0/tcp_server.rbs +0 -5
- data/stdlib/socket/0/tcp_socket.rbs +36 -3
- data/stdlib/socket/0/udp_socket.rbs +4 -5
- data/stdlib/socket/0/unix_server.rbs +0 -5
- data/stdlib/socket/0/unix_socket.rbs +2 -4
- data/{core/string_io.rbs → stdlib/stringio/0/stringio.rbs} +188 -107
- data/stdlib/strscan/0/string_scanner.rbs +1269 -425
- data/stdlib/tempfile/0/tempfile.rbs +224 -61
- data/stdlib/time/0/time.rbs +48 -35
- data/stdlib/timeout/0/timeout.rbs +17 -8
- data/stdlib/tmpdir/0/tmpdir.rbs +10 -3
- data/stdlib/tsort/0/tsort.rbs +0 -4
- data/stdlib/uri/0/common.rbs +271 -144
- data/stdlib/uri/0/file.rbs +5 -0
- data/stdlib/uri/0/ftp.rbs +1 -1
- data/stdlib/uri/0/generic.rbs +26 -22
- data/stdlib/uri/0/http.rbs +4 -4
- data/stdlib/uri/0/ldap.rbs +1 -1
- data/stdlib/uri/0/mailto.rbs +84 -0
- data/stdlib/uri/0/rfc2396_parser.rbs +3 -0
- data/stdlib/yaml/0/manifest.yaml +1 -2
- data/stdlib/yaml/0/yaml.rbs +1 -199
- data/stdlib/zlib/0/buf_error.rbs +10 -0
- data/stdlib/zlib/0/data_error.rbs +10 -0
- data/stdlib/zlib/0/deflate.rbs +210 -0
- data/stdlib/zlib/0/error.rbs +20 -0
- data/stdlib/zlib/0/gzip_file/crc_error.rbs +12 -0
- data/stdlib/zlib/0/gzip_file/error.rbs +23 -0
- data/stdlib/zlib/0/gzip_file/length_error.rbs +12 -0
- data/stdlib/zlib/0/gzip_file/no_footer.rbs +11 -0
- data/stdlib/zlib/0/gzip_file.rbs +156 -0
- data/stdlib/zlib/0/gzip_reader.rbs +293 -0
- data/stdlib/zlib/0/gzip_writer.rbs +166 -0
- data/stdlib/zlib/0/inflate.rbs +180 -0
- data/stdlib/zlib/0/mem_error.rbs +10 -0
- data/stdlib/zlib/0/need_dict.rbs +13 -0
- data/stdlib/zlib/0/stream_end.rbs +11 -0
- data/stdlib/zlib/0/stream_error.rbs +11 -0
- data/stdlib/zlib/0/version_error.rbs +11 -0
- data/stdlib/zlib/0/zlib.rbs +1 -3
- data/stdlib/zlib/0/zstream.rbs +200 -0
- data/templates/include/rbs/constants.h.erb +20 -0
- data/templates/include/rbs/ruby_objs.h.erb +10 -0
- data/templates/src/constants.c.erb +36 -0
- data/templates/src/ruby_objs.c.erb +27 -0
- data/templates/template.rb +122 -0
- metadata +136 -36
- data/Gemfile +0 -33
- data/Gemfile.lock +0 -118
- data/core/deprecated.rbs +0 -9
- data/ext/rbs_extension/constants.c +0 -135
- data/ext/rbs_extension/ruby_objs.c +0 -525
- data/ext/rbs_extension/ruby_objs.h +0 -43
- data/lib/rbs/constant_table.rb +0 -167
- data/lib/rbs/parser_compat/lexer_error.rb +0 -6
- data/lib/rbs/parser_compat/located_value.rb +0 -7
- data/lib/rbs/parser_compat/semantics_error.rb +0 -6
- data/lib/rbs/parser_compat/syntax_error.rb +0 -6
- data/lib/rbs/test/spy.rb +0 -6
- data/lib/rbs/type_name_resolver.rb +0 -67
- data/sig/constant_table.rbs +0 -30
- data/sig/shims/abstract_syntax_tree.rbs +0 -25
- data/sig/shims/pp.rbs +0 -3
- data/sig/shims/ripper.rbs +0 -8
- data/sig/shims.rbs +0 -69
- data/sig/type_name_resolver.rbs +0 -26
- data/stdlib/minitest/0/manifest.yaml +0 -2
- data/stdlib/prime/0/integer-extension.rbs +0 -41
- data/stdlib/prime/0/manifest.yaml +0 -2
- data/stdlib/prime/0/prime.rbs +0 -372
@@ -1,24 +1,84 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
+
require_relative 'runtime/helpers'
|
4
|
+
require_relative 'runtime/value_object_generator'
|
5
|
+
require_relative 'runtime/reflection'
|
6
|
+
|
3
7
|
module RBS
|
4
8
|
module Prototype
|
5
9
|
class Runtime
|
6
|
-
|
10
|
+
class Todo
|
11
|
+
def initialize(builder:)
|
12
|
+
@builder = builder
|
13
|
+
end
|
14
|
+
|
15
|
+
def skip_mixin?(type_name:, module_name:, mixin_class:)
|
16
|
+
return false unless @builder.env.module_class_entry(type_name.absolute!)
|
17
|
+
return false unless @builder.env.module_class_entry(module_name.absolute!)
|
18
|
+
|
19
|
+
mixin_decls(type_name).any? do |decl|
|
20
|
+
decl.instance_of?(mixin_class) && decl.name == module_name.absolute!
|
21
|
+
end
|
22
|
+
end
|
23
|
+
|
24
|
+
def skip_singleton_method?(module_name:, method:, accessibility:)
|
25
|
+
return false unless @builder.env.module_class_entry(module_name.absolute!)
|
26
|
+
|
27
|
+
method_definition = @builder.build_singleton(module_name.absolute!).methods[method.name]
|
28
|
+
return false unless method_definition
|
29
|
+
|
30
|
+
method_definition.accessibility == accessibility
|
31
|
+
end
|
32
|
+
|
33
|
+
def skip_instance_method?(module_name:, method:, accessibility:)
|
34
|
+
return false unless @builder.env.module_class_entry(module_name.absolute!)
|
35
|
+
|
36
|
+
method_definition = @builder.build_instance(module_name.absolute!).methods[method.name]
|
37
|
+
return false unless method_definition
|
38
|
+
|
39
|
+
method_definition.accessibility == accessibility
|
40
|
+
end
|
41
|
+
|
42
|
+
def skip_constant?(module_name:, name:)
|
43
|
+
namespace = Namespace.new(path: module_name.split('::').map(&:to_sym), absolute: true)
|
44
|
+
@builder.env.constant_decl?(TypeName.new(namespace: namespace, name: name))
|
45
|
+
end
|
46
|
+
|
47
|
+
private
|
48
|
+
|
49
|
+
def mixin_decls(type_name)
|
50
|
+
type_name_absolute = type_name.absolute!
|
51
|
+
@mixin_decls_cache ||= {} #: Hash[TypeName, Array[AST::Members::Mixin]]
|
52
|
+
@mixin_decls_cache.fetch(type_name_absolute) do
|
53
|
+
@mixin_decls_cache[type_name_absolute] = @builder.env.class_decls[type_name_absolute].decls.flat_map do |d|
|
54
|
+
d.decl.members.select { |m| m.kind_of?(AST::Members::Mixin) }
|
55
|
+
end
|
56
|
+
end
|
57
|
+
end
|
58
|
+
end
|
59
|
+
private_constant :Todo
|
60
|
+
|
61
|
+
include Prototype::Helpers
|
62
|
+
include Runtime::Helpers
|
7
63
|
|
8
64
|
attr_reader :patterns
|
9
65
|
attr_reader :env
|
10
66
|
attr_reader :merge
|
67
|
+
attr_reader :todo
|
11
68
|
attr_reader :owners_included
|
69
|
+
attr_accessor :outline
|
12
70
|
|
13
|
-
def initialize(patterns:, env:, merge:, owners_included: [])
|
71
|
+
def initialize(patterns:, env:, merge:, todo: false, owners_included: [])
|
14
72
|
@patterns = patterns
|
15
73
|
@decls = nil
|
16
|
-
@modules =
|
74
|
+
@modules = {}
|
17
75
|
@env = env
|
18
76
|
@merge = merge
|
19
77
|
@owners_included = owners_included.map do |name|
|
20
78
|
Object.const_get(name)
|
21
79
|
end
|
80
|
+
@outline = false
|
81
|
+
@todo = todo
|
22
82
|
end
|
23
83
|
|
24
84
|
def target?(const)
|
@@ -34,6 +94,10 @@ module RBS
|
|
34
94
|
end
|
35
95
|
end
|
36
96
|
|
97
|
+
def todo_object
|
98
|
+
@todo_object ||= Todo.new(builder: builder) if todo
|
99
|
+
end
|
100
|
+
|
37
101
|
def builder
|
38
102
|
@builder ||= DefinitionBuilder.new(env: env)
|
39
103
|
end
|
@@ -45,8 +109,11 @@ module RBS
|
|
45
109
|
def decls
|
46
110
|
unless @decls
|
47
111
|
@decls = []
|
48
|
-
@modules = ObjectSpace.each_object(Module)
|
49
|
-
|
112
|
+
@modules = ObjectSpace.each_object(Module)
|
113
|
+
.map { |mod| [const_name(mod), mod] }
|
114
|
+
.select { |name, _| name }
|
115
|
+
.to_h
|
116
|
+
@modules.select { |name, mod| target?(mod) }.sort_by { |name, _| name }.each do |_, mod|
|
50
117
|
case mod
|
51
118
|
when Class
|
52
119
|
generate_class mod
|
@@ -56,48 +123,46 @@ module RBS
|
|
56
123
|
end
|
57
124
|
end
|
58
125
|
|
59
|
-
@decls
|
126
|
+
@decls or raise
|
60
127
|
end
|
61
128
|
|
62
|
-
def
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
else
|
69
|
-
TypeName.new(name: last.to_sym, namespace: Namespace.parse(prefix.join("::")))
|
70
|
-
end
|
71
|
-
else
|
72
|
-
TypeName.new(name: last.to_sym, namespace: Namespace.empty)
|
129
|
+
private def each_mixined_module(type_name, mod)
|
130
|
+
each_mixined_module_one(type_name, mod) do |module_name, module_full_name, is_prepend|
|
131
|
+
yield module_name, module_full_name, is_prepend ? AST::Members::Prepend : AST::Members::Include
|
132
|
+
end
|
133
|
+
each_mixined_module_one(type_name, mod.singleton_class) do |module_name, module_full_name, _|
|
134
|
+
yield module_name, module_full_name, AST::Members::Extend
|
73
135
|
end
|
74
136
|
end
|
75
137
|
|
76
|
-
def
|
77
|
-
supers = Set[]
|
138
|
+
private def each_mixined_module_one(type_name, mod)
|
139
|
+
supers = Set[] #: Set[Module]
|
140
|
+
prepends = mod.ancestors.take_while { |m| !mod.equal?(m) }.to_set
|
78
141
|
|
79
142
|
mod.included_modules.each do |mix|
|
80
143
|
supers.merge(mix.included_modules)
|
81
144
|
end
|
82
145
|
|
83
|
-
if mod.is_a?(Class)
|
84
|
-
mod.superclass
|
85
|
-
|
86
|
-
|
146
|
+
if mod.is_a?(Class)
|
147
|
+
if superclass = mod.superclass
|
148
|
+
superclass.included_modules.each do |mix|
|
149
|
+
supers << mix
|
150
|
+
supers.merge(mix.included_modules)
|
151
|
+
end
|
87
152
|
end
|
88
153
|
end
|
89
154
|
|
90
|
-
mod.included_modules.each do |mix|
|
91
|
-
|
155
|
+
mod.included_modules.uniq.each do |mix|
|
156
|
+
if !supers.include?(mix) || prepends.include?(mix)
|
92
157
|
unless const_name(mix)
|
93
158
|
RBS.logger.warn("Skipping anonymous module #{mix} included in #{mod}")
|
94
159
|
else
|
95
|
-
module_name = module_full_name = to_type_name(const_name(mix), full_name: true)
|
160
|
+
module_name = module_full_name = to_type_name(const_name!(mix), full_name: true)
|
96
161
|
if module_full_name.namespace == type_name.namespace
|
97
162
|
module_name = TypeName.new(name: module_full_name.name, namespace: Namespace.empty)
|
98
163
|
end
|
99
164
|
|
100
|
-
yield module_name, module_full_name, mix
|
165
|
+
yield module_name, module_full_name, prepends.include?(mix)
|
101
166
|
end
|
102
167
|
end
|
103
168
|
end
|
@@ -106,19 +171,19 @@ module RBS
|
|
106
171
|
def method_type(method)
|
107
172
|
untyped = Types::Bases::Any.new(location: nil)
|
108
173
|
|
109
|
-
required_positionals = []
|
110
|
-
optional_positionals = []
|
111
|
-
rest = nil
|
112
|
-
trailing_positionals = []
|
113
|
-
required_keywords = {}
|
114
|
-
optional_keywords = {}
|
115
|
-
rest_keywords = nil
|
174
|
+
required_positionals = [] #: Array[Types::Function::Param]
|
175
|
+
optional_positionals = [] #: Array[Types::Function::Param]
|
176
|
+
rest = nil #: Types::Function::Param?
|
177
|
+
trailing_positionals = [] #: Array[Types::Function::Param]
|
178
|
+
required_keywords = {} #: Hash[Symbol, Types::Function::Param]
|
179
|
+
optional_keywords = {} #: Hash[Symbol, Types::Function::Param]
|
180
|
+
rest_keywords = nil #: Types::Function::Param?
|
116
181
|
|
117
182
|
requireds = required_positionals
|
118
183
|
|
119
|
-
block = nil
|
184
|
+
block = nil #: Types::Block?
|
120
185
|
|
121
|
-
method.parameters.each do |kind, name|
|
186
|
+
method.parameters.each do |(kind, name)|
|
122
187
|
case kind
|
123
188
|
when :req
|
124
189
|
requireds << Types::Function::Param.new(name: name, type: untyped)
|
@@ -130,8 +195,10 @@ module RBS
|
|
130
195
|
name = nil if name == :* # For `def f(...) end` syntax
|
131
196
|
rest = Types::Function::Param.new(name: name, type: untyped)
|
132
197
|
when :keyreq
|
198
|
+
name or raise
|
133
199
|
required_keywords[name] = Types::Function::Param.new(name: nil, type: untyped)
|
134
200
|
when :key
|
201
|
+
name or raise
|
135
202
|
optional_keywords[name] = Types::Function::Param.new(name: nil, type: untyped)
|
136
203
|
when :keyrest
|
137
204
|
rest_keywords = Types::Function::Param.new(name: nil, type: untyped)
|
@@ -173,6 +240,7 @@ module RBS
|
|
173
240
|
def merge_rbs(module_name, members, instance: nil, singleton: nil)
|
174
241
|
if merge
|
175
242
|
if env.class_decls[module_name.absolute!]
|
243
|
+
# @type var kind: AST::Members::MethodDefinition::kind
|
176
244
|
case
|
177
245
|
when instance
|
178
246
|
method = builder.build_instance(module_name.absolute!).methods[instance]
|
@@ -187,18 +255,23 @@ module RBS
|
|
187
255
|
if method
|
188
256
|
members << AST::Members::MethodDefinition.new(
|
189
257
|
name: method_name,
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
258
|
+
overloads: method.method_types.map {|type|
|
259
|
+
AST::Members::MethodDefinition::Overload.new(
|
260
|
+
annotations: [],
|
261
|
+
method_type: type.update.tap do |ty|
|
262
|
+
def ty.to_s
|
263
|
+
location or raise
|
264
|
+
location.source
|
265
|
+
end
|
194
266
|
end
|
195
|
-
|
267
|
+
)
|
196
268
|
},
|
197
269
|
kind: kind,
|
198
270
|
location: nil,
|
199
271
|
comment: method.comments[0],
|
200
272
|
annotations: method.annotations,
|
201
|
-
|
273
|
+
overloading: false,
|
274
|
+
visibility: nil
|
202
275
|
)
|
203
276
|
return
|
204
277
|
end
|
@@ -218,110 +291,140 @@ module RBS
|
|
218
291
|
when singleton
|
219
292
|
method = mod.singleton_class.instance_method(singleton)
|
220
293
|
method.owner == mod.singleton_class || owners_included.any? {|m| method.owner == m.singleton_class }
|
294
|
+
else
|
295
|
+
raise
|
221
296
|
end
|
222
297
|
end
|
223
298
|
|
224
299
|
def generate_methods(mod, module_name, members)
|
300
|
+
module_name_absolute = to_type_name(const_name!(mod), full_name: true).absolute!
|
225
301
|
mod.singleton_methods.select {|name| target_method?(mod, singleton: name) }.sort.each do |name|
|
226
302
|
method = mod.singleton_class.instance_method(name)
|
303
|
+
next if todo_object&.skip_singleton_method?(module_name: module_name_absolute, method: method, accessibility: :public)
|
227
304
|
|
228
|
-
if
|
305
|
+
if can_alias?(mod.singleton_class, method)
|
306
|
+
members << AST::Members::Alias.new(
|
307
|
+
new_name: method.name,
|
308
|
+
old_name: method.original_name,
|
309
|
+
kind: :singleton,
|
310
|
+
location: nil,
|
311
|
+
comment: nil,
|
312
|
+
annotations: [],
|
313
|
+
)
|
314
|
+
else
|
229
315
|
merge_rbs(module_name, members, singleton: name) do
|
230
316
|
RBS.logger.info "missing #{module_name}.#{name} #{method.source_location}"
|
231
317
|
|
232
318
|
members << AST::Members::MethodDefinition.new(
|
233
319
|
name: method.name,
|
234
|
-
|
320
|
+
overloads: [
|
321
|
+
AST::Members::MethodDefinition::Overload.new(annotations: [], method_type: method_type(method))
|
322
|
+
],
|
235
323
|
kind: :singleton,
|
236
324
|
location: nil,
|
237
325
|
comment: nil,
|
238
326
|
annotations: [],
|
239
|
-
|
327
|
+
overloading: false,
|
328
|
+
visibility: nil
|
240
329
|
)
|
241
330
|
end
|
242
|
-
else
|
243
|
-
members << AST::Members::Alias.new(
|
244
|
-
new_name: method.name,
|
245
|
-
old_name: method.original_name,
|
246
|
-
kind: :singleton,
|
247
|
-
location: nil,
|
248
|
-
comment: nil,
|
249
|
-
annotations: [],
|
250
|
-
)
|
251
331
|
end
|
252
332
|
end
|
253
333
|
|
254
334
|
public_instance_methods = mod.public_instance_methods.select {|name| target_method?(mod, instance: name) }
|
255
335
|
unless public_instance_methods.empty?
|
256
|
-
members << AST::Members::Public.new(location: nil)
|
257
|
-
|
258
336
|
public_instance_methods.sort.each do |name|
|
259
337
|
method = mod.instance_method(name)
|
338
|
+
next if todo_object&.skip_instance_method?(module_name: module_name_absolute, method: method, accessibility: :public)
|
260
339
|
|
261
|
-
if
|
340
|
+
if can_alias?(mod, method)
|
341
|
+
members << AST::Members::Alias.new(
|
342
|
+
new_name: method.name,
|
343
|
+
old_name: method.original_name,
|
344
|
+
kind: :instance,
|
345
|
+
location: nil,
|
346
|
+
comment: nil,
|
347
|
+
annotations: [],
|
348
|
+
)
|
349
|
+
else
|
262
350
|
merge_rbs(module_name, members, instance: name) do
|
263
351
|
RBS.logger.info "missing #{module_name}##{name} #{method.source_location}"
|
264
352
|
|
265
353
|
members << AST::Members::MethodDefinition.new(
|
266
354
|
name: method.name,
|
267
|
-
|
355
|
+
overloads: [
|
356
|
+
AST::Members::MethodDefinition::Overload.new(annotations: [], method_type: method_type(method))
|
357
|
+
],
|
268
358
|
kind: :instance,
|
269
359
|
location: nil,
|
270
360
|
comment: nil,
|
271
361
|
annotations: [],
|
272
|
-
|
362
|
+
overloading: false,
|
363
|
+
visibility: nil
|
273
364
|
)
|
274
365
|
end
|
275
|
-
else
|
276
|
-
members << AST::Members::Alias.new(
|
277
|
-
new_name: method.name,
|
278
|
-
old_name: method.original_name,
|
279
|
-
kind: :instance,
|
280
|
-
location: nil,
|
281
|
-
comment: nil,
|
282
|
-
annotations: [],
|
283
|
-
)
|
284
366
|
end
|
285
367
|
end
|
286
368
|
end
|
287
369
|
|
288
370
|
private_instance_methods = mod.private_instance_methods.select {|name| target_method?(mod, instance: name) }
|
289
371
|
unless private_instance_methods.empty?
|
372
|
+
added = false
|
290
373
|
members << AST::Members::Private.new(location: nil)
|
291
374
|
|
292
375
|
private_instance_methods.sort.each do |name|
|
293
376
|
method = mod.instance_method(name)
|
377
|
+
next if todo_object&.skip_instance_method?(module_name: module_name_absolute, method: method, accessibility: :private)
|
294
378
|
|
295
|
-
|
379
|
+
added = true
|
380
|
+
if can_alias?(mod, method)
|
381
|
+
members << AST::Members::Alias.new(
|
382
|
+
new_name: method.name,
|
383
|
+
old_name: method.original_name,
|
384
|
+
kind: :instance,
|
385
|
+
location: nil,
|
386
|
+
comment: nil,
|
387
|
+
annotations: [],
|
388
|
+
)
|
389
|
+
else
|
296
390
|
merge_rbs(module_name, members, instance: name) do
|
297
391
|
RBS.logger.info "missing #{module_name}##{name} #{method.source_location}"
|
298
392
|
|
299
393
|
members << AST::Members::MethodDefinition.new(
|
300
394
|
name: method.name,
|
301
|
-
|
395
|
+
overloads: [
|
396
|
+
AST::Members::MethodDefinition::Overload.new(annotations: [], method_type: method_type(method))
|
397
|
+
],
|
302
398
|
kind: :instance,
|
303
399
|
location: nil,
|
304
400
|
comment: nil,
|
305
401
|
annotations: [],
|
306
|
-
|
402
|
+
overloading: false,
|
403
|
+
visibility: nil
|
307
404
|
)
|
308
405
|
end
|
309
|
-
else
|
310
|
-
members << AST::Members::Alias.new(
|
311
|
-
new_name: method.name,
|
312
|
-
old_name: method.original_name,
|
313
|
-
kind: :instance,
|
314
|
-
location: nil,
|
315
|
-
comment: nil,
|
316
|
-
annotations: [],
|
317
|
-
)
|
318
406
|
end
|
319
407
|
end
|
408
|
+
|
409
|
+
members.pop unless added
|
410
|
+
end
|
411
|
+
end
|
412
|
+
|
413
|
+
private def can_alias?(mod, method)
|
414
|
+
return false if method.name == method.original_name
|
415
|
+
|
416
|
+
begin
|
417
|
+
mod.instance_method(method.original_name) && true
|
418
|
+
rescue NameError
|
419
|
+
false
|
320
420
|
end
|
321
421
|
end
|
322
422
|
|
323
423
|
def generate_constants(mod, decls)
|
324
|
-
mod
|
424
|
+
module_name = const_name!(mod)
|
425
|
+
Reflection.constants_of(mod, false).sort.each do |name|
|
426
|
+
next if todo_object&.skip_constant?(module_name: module_name, name: name)
|
427
|
+
|
325
428
|
begin
|
326
429
|
value = mod.const_get(name)
|
327
430
|
rescue StandardError, LoadError => e
|
@@ -329,8 +432,10 @@ module RBS
|
|
329
432
|
next
|
330
433
|
end
|
331
434
|
|
332
|
-
next if
|
333
|
-
|
435
|
+
next if Reflection.object_class(value).equal?(Class)
|
436
|
+
next if Reflection.object_class(value).equal?(Module)
|
437
|
+
|
438
|
+
unless Reflection.object_class(value).name
|
334
439
|
RBS.logger.warn("Skipping constant #{name} #{value} of #{mod} as an instance of anonymous class")
|
335
440
|
next
|
336
441
|
end
|
@@ -343,8 +448,12 @@ module RBS
|
|
343
448
|
type: Types::Bases::Any.new(location: nil),
|
344
449
|
location: nil
|
345
450
|
)
|
451
|
+
when ARGF
|
452
|
+
Types::ClassInstance.new(name: TypeName.parse("::RBS::Unnamed::ARGFClass"), args: [], location: nil)
|
453
|
+
when ENV
|
454
|
+
Types::ClassInstance.new(name: TypeName.parse("::RBS::Unnamed::ENVClass"), args: [], location: nil)
|
346
455
|
else
|
347
|
-
value_type_name = to_type_name(const_name(value
|
456
|
+
value_type_name = to_type_name(const_name!(Reflection.object_class(value)), full_name: true).absolute!
|
348
457
|
args = type_args(value_type_name)
|
349
458
|
Types::ClassInstance.new(name: value_type_name, args: args, location: nil)
|
350
459
|
end
|
@@ -359,62 +468,56 @@ module RBS
|
|
359
468
|
end
|
360
469
|
|
361
470
|
def generate_super_class(mod)
|
362
|
-
|
471
|
+
superclass = mod.superclass
|
472
|
+
|
473
|
+
if superclass.nil? || superclass == ::Object
|
363
474
|
nil
|
364
|
-
elsif const_name(
|
365
|
-
RBS.logger.warn("Skipping anonymous superclass #{
|
475
|
+
elsif const_name(superclass).nil?
|
476
|
+
RBS.logger.warn("Skipping anonymous superclass #{superclass} of #{mod}")
|
366
477
|
nil
|
367
478
|
else
|
368
|
-
super_name = to_type_name(const_name(
|
479
|
+
super_name = to_type_name(const_name!(superclass), full_name: true).absolute!
|
369
480
|
super_args = type_args(super_name)
|
370
481
|
AST::Declarations::Class::Super.new(name: super_name, args: super_args, location: nil)
|
371
482
|
end
|
372
483
|
end
|
373
484
|
|
374
485
|
def generate_class(mod)
|
375
|
-
|
486
|
+
type_name_absolute = to_type_name(const_name!(mod), full_name: true).absolute!
|
487
|
+
type_name = to_type_name(const_name!(mod))
|
376
488
|
outer_decls = ensure_outer_module_declarations(mod)
|
377
489
|
|
378
490
|
# Check if a declaration exists for the actual module
|
379
|
-
decl = outer_decls.detect
|
491
|
+
decl = outer_decls.detect do |decl|
|
492
|
+
decl.is_a?(AST::Declarations::Class) && decl.name.name == only_name(mod).to_sym
|
493
|
+
end #: AST::Declarations::Class?
|
494
|
+
|
380
495
|
unless decl
|
381
|
-
|
382
|
-
|
383
|
-
|
384
|
-
|
385
|
-
|
386
|
-
|
387
|
-
|
388
|
-
|
389
|
-
|
496
|
+
if StructGenerator.generatable?(mod)
|
497
|
+
decl = StructGenerator.new(mod).build_decl
|
498
|
+
elsif DataGenerator.generatable?(mod)
|
499
|
+
decl = DataGenerator.new(mod).build_decl
|
500
|
+
else
|
501
|
+
decl = AST::Declarations::Class.new(
|
502
|
+
name: to_type_name(only_name(mod)),
|
503
|
+
type_params: type_params(mod),
|
504
|
+
super_class: generate_super_class(mod),
|
505
|
+
members: [],
|
506
|
+
annotations: [],
|
507
|
+
location: nil,
|
508
|
+
comment: nil
|
509
|
+
)
|
510
|
+
end
|
390
511
|
|
391
512
|
outer_decls << decl
|
392
513
|
end
|
393
514
|
|
394
|
-
|
395
|
-
args = type_args(module_full_name)
|
396
|
-
decl.members << AST::Members::Include.new(
|
397
|
-
name: module_name,
|
398
|
-
args: args,
|
399
|
-
location: nil,
|
400
|
-
comment: nil,
|
401
|
-
annotations: []
|
402
|
-
)
|
403
|
-
end
|
515
|
+
generate_mixin(mod, decl, type_name, type_name_absolute)
|
404
516
|
|
405
|
-
|
406
|
-
|
407
|
-
decl.members << AST::Members::Extend.new(
|
408
|
-
name: module_name,
|
409
|
-
args: args,
|
410
|
-
location: nil,
|
411
|
-
comment: nil,
|
412
|
-
annotations: []
|
413
|
-
)
|
517
|
+
unless mod < Struct || (RUBY_VERSION >= '3.2' && mod < Data)
|
518
|
+
generate_methods(mod, type_name, decl.members) unless outline
|
414
519
|
end
|
415
520
|
|
416
|
-
generate_methods(mod, type_name, decl.members)
|
417
|
-
|
418
521
|
generate_constants mod, decl.members
|
419
522
|
end
|
420
523
|
|
@@ -426,15 +529,19 @@ module RBS
|
|
426
529
|
return
|
427
530
|
end
|
428
531
|
|
532
|
+
type_name_absolute = to_type_name(name, full_name: true).absolute!
|
429
533
|
type_name = to_type_name(name)
|
430
534
|
outer_decls = ensure_outer_module_declarations(mod)
|
431
535
|
|
432
536
|
# Check if a declaration exists for the actual class
|
433
|
-
decl = outer_decls.detect
|
537
|
+
decl = outer_decls.detect do |decl|
|
538
|
+
decl.is_a?(AST::Declarations::Module) && decl.name.name == only_name(mod).to_sym
|
539
|
+
end #: AST::Declarations::Module?
|
540
|
+
|
434
541
|
unless decl
|
435
542
|
decl = AST::Declarations::Module.new(
|
436
543
|
name: to_type_name(only_name(mod)),
|
437
|
-
type_params:
|
544
|
+
type_params: type_params(mod),
|
438
545
|
self_types: [],
|
439
546
|
members: [],
|
440
547
|
annotations: [],
|
@@ -445,20 +552,19 @@ module RBS
|
|
445
552
|
outer_decls << decl
|
446
553
|
end
|
447
554
|
|
448
|
-
|
449
|
-
|
450
|
-
|
451
|
-
|
452
|
-
|
453
|
-
|
454
|
-
|
455
|
-
|
456
|
-
|
457
|
-
|
555
|
+
generate_mixin(mod, decl, type_name, type_name_absolute)
|
556
|
+
|
557
|
+
generate_methods(mod, type_name, decl.members) unless outline
|
558
|
+
|
559
|
+
generate_constants mod, decl.members
|
560
|
+
end
|
561
|
+
|
562
|
+
def generate_mixin(mod, decl, type_name, type_name_absolute)
|
563
|
+
each_mixined_module(type_name, mod) do |module_name, module_full_name, mixin_class|
|
564
|
+
next if todo_object&.skip_mixin?(type_name: type_name_absolute, module_name: module_full_name, mixin_class: mixin_class)
|
458
565
|
|
459
|
-
each_included_module(type_name, mod.singleton_class) do |module_name, module_full_name, _|
|
460
566
|
args = type_args(module_full_name)
|
461
|
-
decl.members <<
|
567
|
+
decl.members << mixin_class.new(
|
462
568
|
name: module_name,
|
463
569
|
args: args,
|
464
570
|
location: nil,
|
@@ -466,30 +572,37 @@ module RBS
|
|
466
572
|
annotations: []
|
467
573
|
)
|
468
574
|
end
|
469
|
-
|
470
|
-
generate_methods(mod, type_name, decl.members)
|
471
|
-
|
472
|
-
generate_constants mod, decl.members
|
473
575
|
end
|
474
576
|
|
475
577
|
# Generate/find outer module declarations
|
476
578
|
# This is broken down into another method to comply with `DRY`
|
477
579
|
# This generates/finds declarations in nested form & returns the last array of declarations
|
478
580
|
def ensure_outer_module_declarations(mod)
|
479
|
-
|
480
|
-
|
581
|
+
# @type var outer_module_names: Array[String]
|
582
|
+
*outer_module_names, _ = const_name!(mod).split(/::/) #=> parent = [A, B], mod = C
|
583
|
+
# Copy the entries in ivar @decls, not .dup
|
584
|
+
destination = @decls || [] #: Array[AST::Declarations::Class::member]
|
481
585
|
|
482
586
|
outer_module_names&.each_with_index do |outer_module_name, i|
|
483
|
-
current_name = outer_module_names
|
484
|
-
outer_module = @modules
|
485
|
-
outer_decl = destination.detect
|
587
|
+
current_name = outer_module_names.take(i+1).join('::')
|
588
|
+
outer_module = @modules[current_name]
|
589
|
+
outer_decl = destination.detect do |decl|
|
590
|
+
case outer_module
|
591
|
+
when Class
|
592
|
+
decl.is_a?(AST::Declarations::Class) && decl.name.name == outer_module_name.to_sym
|
593
|
+
when Module
|
594
|
+
decl.is_a?(AST::Declarations::Module) && decl.name.name == outer_module_name.to_sym
|
595
|
+
end
|
596
|
+
end #: AST::Declarations::Class | AST::Declarations::Module | nil
|
486
597
|
|
487
598
|
# Insert AST::Declarations if declarations are not added previously
|
488
599
|
unless outer_decl
|
600
|
+
outer_module or raise
|
601
|
+
|
489
602
|
if outer_module.is_a?(Class)
|
490
603
|
outer_decl = AST::Declarations::Class.new(
|
491
604
|
name: to_type_name(outer_module_name),
|
492
|
-
type_params:
|
605
|
+
type_params: type_params(outer_module),
|
493
606
|
super_class: generate_super_class(outer_module),
|
494
607
|
members: [],
|
495
608
|
annotations: [],
|
@@ -499,7 +612,7 @@ module RBS
|
|
499
612
|
else
|
500
613
|
outer_decl = AST::Declarations::Module.new(
|
501
614
|
name: to_type_name(outer_module_name),
|
502
|
-
type_params:
|
615
|
+
type_params: type_params(outer_module),
|
503
616
|
self_types: [],
|
504
617
|
members: [],
|
505
618
|
annotations: [],
|
@@ -518,35 +631,36 @@ module RBS
|
|
518
631
|
destination
|
519
632
|
end
|
520
633
|
|
521
|
-
|
522
|
-
|
523
|
-
|
524
|
-
|
525
|
-
|
526
|
-
|
527
|
-
def const_name(const)
|
528
|
-
@module_name_method ||= Module.instance_method(:name)
|
529
|
-
@module_name_method.bind(const).call
|
634
|
+
def type_args(type_name)
|
635
|
+
if class_decl = env.class_decls.fetch(type_name.absolute!, nil)
|
636
|
+
class_decl.type_params.size.times.map { Types::Bases::Any.new(location: nil) }
|
637
|
+
else
|
638
|
+
[]
|
639
|
+
end
|
530
640
|
end
|
531
641
|
|
532
|
-
def
|
642
|
+
def type_params(mod)
|
643
|
+
type_name = to_type_name(const_name!(mod), full_name: true)
|
533
644
|
if class_decl = env.class_decls[type_name.absolute!]
|
534
|
-
class_decl.type_params
|
645
|
+
class_decl.type_params
|
535
646
|
else
|
536
647
|
[]
|
537
648
|
end
|
538
649
|
end
|
539
650
|
|
540
651
|
def block_from_ast_of(method)
|
541
|
-
return nil if RUBY_VERSION < '3.1'
|
542
|
-
|
543
652
|
begin
|
544
653
|
ast = RubyVM::AbstractSyntaxTree.of(method)
|
545
654
|
rescue ArgumentError
|
546
655
|
return # When the method is defined in eval
|
656
|
+
rescue RuntimeError => error
|
657
|
+
raise unless error.message.include?("prism")
|
658
|
+
return # When the method was compiled by prism
|
547
659
|
end
|
548
660
|
|
549
|
-
|
661
|
+
if ast && ast.type == :SCOPE
|
662
|
+
block_from_body(ast)
|
663
|
+
end
|
550
664
|
end
|
551
665
|
end
|
552
666
|
end
|