steep 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e44524f5daae1f0506108ead6a30bc8abff67ab100d2639e21dd75e3384dab7e
-  data.tar.gz: 1a5595ef390995476f5d6dd88fb3c1684bdca27a87ec26d048b071e4a5ccf9d0
+  metadata.gz: a5bc8e25ce0d9d4c9946d0100d3a011ca486086997b4ba86644939cfed1a9b08
+  data.tar.gz: 7d4c26a383e9387a9f4c15c09f488eb24dc5d7ede91b9acc8da1d033f32389ff
 SHA512:
-  metadata.gz: 97c834ae154ac5bc617f4f65be66820531524888237ace9bc316c9cbecb1e2433f8a40b947c9c4d1ae97da7701b55622fe2a7407464fb9db90666e6fd790897b
-  data.tar.gz: fe8b9e5ab3367df5b28281a0179b58af6b96fd497ee84293b69533808d2b52ffa7ebc801021456fd0fc528c21d2cd07eb63f9b6ca49899052b9cf746eb184cdd
+  metadata.gz: d491cda774d07a99a41be32e9bf7559104d84a68bb36ba590e70d1592a1a4cda40a1bba416c50969279b7e6c1cfd3f4b80274d32e7ef29fa8b71851de4d214f7
+  data.tar.gz: 5140446569e665f76971fbf4dec158a664f8e2e4ae32339480069288c1e3fdbbc50237db5999c3f9d124190859a334696dcb579f09009762c25aa5bdd3361edc

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+# CHANGELOG
+
+## master
+
+## 0.2.0 (2018-05-30)
+
+* Add `attr_reader` and `attr_accessor` syntax to signature (#33)
+* Fix parsing on union with `any`

data/lib/steep/ast/signature/members.rb

@@ -65,6 +65,30 @@ module Steep
             @type = type
           end
         end
+
+        class Attr
+          attr_reader :location
+          attr_reader :kind
+          attr_reader :name
+          attr_reader :ivar
+          attr_reader :type
+
+          def initialize(location:, kind:, name:, ivar:, type:)
+            @location = location
+            @kind = kind
+            @name = name
+            @ivar = ivar
+            @type = type
+          end
+
+          def reader?
+            kind == :reader
+          end
+
+          def accessor?
+            kind == :accessor
+          end
+        end
       end
     end
   end

data/lib/steep/ast/types/intersection.rb

@@ -20,9 +20,9 @@ module Steep
           end.map do |type|
             case type
             when AST::Types::Any
-              return AST::Types::Any.new()
+              return AST::Types::Any.new(location: location)
             when AST::Types::Bot
-              return AST::Types::Bot.new()
+              return AST::Types::Bot.new(location: location)
             when AST::Types::Top
               nil
             else

data/lib/steep/ast/types/union.rb

@@ -20,9 +20,9 @@ module Steep
           end.map do |type|
             case type
             when AST::Types::Any
-              return AST::Types::Any.new()
+              return AST::Types::Any.new(location: location)
             when AST::Types::Top
-              return AST::Types::Top.new()
+              return AST::Types::Top.new(location: location)
             when AST::Types::Bot
               nil
             else

data/lib/steep/interface/builder.rb

@@ -358,6 +358,45 @@ module Steep
           when AST::Signature::Members::Ivar
             merge_ivars(ivar_chains,
                         { member.name => absolute_type(member.type, current: sig.name) })
+          when AST::Signature::Members::Attr
+            if member.ivar != false
+              ivar_name = member.ivar || "@#{member.name}".to_sym
+              merge_ivars(ivar_chains,
+                          { ivar_name => absolute_type(member.type, current: sig.name) })
+            end
+
+            reader_method = AST::Signature::Members::Method.new(
+              location: member.location,
+              name: member.name,
+              kind: :instance,
+              types: [
+                AST::MethodType.new(location: member.type.location,
+                                    type_params: nil,
+                                    params: nil,
+                                    block: nil,
+                                    return_type: member.type)
+              ],
+              attributes: []
+            )
+            add_method(type_name, reader_method, methods: methods)
+
+            if member.accessor?
+              writer_method = AST::Signature::Members::Method.new(
+                location: member.location,
+                name: "#{member.name}=".to_sym,
+                kind: :instance,
+                types: [
+                  AST::MethodType.new(location: member.type.location,
+                                      type_params: nil,
+                                      params: AST::MethodType::Params::Required.new(location: member.type.location,
+                                                                                    type: member.type),
+                                      block: nil,
+                                      return_type: member.type)
+                ],
+                attributes: []
+              )
+              add_method(type_name, writer_method, methods: methods)
+            end
           end
         end
 

data/lib/steep/parser.y

@@ -293,6 +293,8 @@ class_member: instance_method_member
             | include_member
             | extend_member
             | ivar_member
+            | attr_reader_member
+            | attr_accessor_member
 
 ivar_member: IVAR_NAME COLON type {
                loc = val.first.location + val.last.location
@@ -353,6 +355,18 @@ extend_member: EXTEND module_name {
                  name = val[1].value
                  result = AST::Signature::Members::Extend.new(name: name, location: loc, args: val[3])
                }
+attr_reader_member: ATTR_READER method_name attr_ivar_opt COLON type {
+                      loc = val.first.location + val.last.location
+                      result = AST::Signature::Members::Attr.new(location: loc, name: val[1].value, kind: :reader, ivar: val[2], type: val[4])
+                    }
+attr_accessor_member: ATTR_ACCESSOR method_name attr_ivar_opt COLON type {
+                        loc = val.first.location + val.last.location
+                        result = AST::Signature::Members::Attr.new(location: loc, name: val[1].value, kind: :accessor, ivar: val[2], type: val[4])
+                      }
+
+attr_ivar_opt: { result = nil }
+             | LPAREN RPAREN { result = false }
+             | LPAREN IVAR_NAME RPAREN { result = val[1].value }
 
 constructor_method: { result = false }
                   | LPAREN CONSTRUCTOR RPAREN { result = true }
@@ -421,6 +435,8 @@ method_name: IDENT
                raise ParseError, "\nunexpected method name > >" unless val[0].location.pred?(val[1].location)
                result = LocatedValue.new(location: val[0].location + val[1].location, value: :>>)
              }
+           | ATTR_READER
+           | ATTR_ACCESSOR
 
 annotation: AT_TYPE VAR subject COLON type {
               loc = val.first.location + val.last.location
@@ -640,6 +656,10 @@ def next_token
     new_token(:SELF, :self)
   when input.scan(/'\w+/)
     new_token(:TVAR, input.matched.gsub(/\A'/, '').to_sym)
+  when input.scan(/attr_reader\b/)
+    new_token(:ATTR_READER, :attr_reader)
+  when input.scan(/attr_accessor\b/)
+    new_token(:ATTR_ACCESSOR, :attr_accessor)
   when input.scan(/instance\b/)
     new_token(:INSTANCE, :instance)
   when input.scan(/class\b/)

data/lib/steep/type_construction.rb

@@ -1984,46 +1984,56 @@ module Steep
 
     def validate_method_definitions(node, module_name)
       signature = checker.builder.signatures.find_class_or_module(module_name.name)
+      expected_instance_method_names = Set.new()
+      expected_module_method_names = Set.new
 
       signature.members.each do |member|
-        if member.is_a?(AST::Signature::Members::Method)
+        case member
+        when AST::Signature::Members::Method
           if member.instance_method?
-            case
-            when module_context.defined_instance_methods.include?(member.name)
-              # ok
-            when annotations.dynamics[member.name]&.instance_method?
-              # ok
-            else
-              typing.add_error Errors::MethodDefinitionMissing.new(node: node,
-                                                                   module_name: module_name.name,
-                                                                   kind: :instance,
-                                                                   missing_method: member.name)
-            end
+            expected_instance_method_names << member.name
           end
-
           if member.module_method?
-            case
-            when module_context.defined_module_methods.include?(member.name)
-              # ok
-            when annotations.dynamics[member.name]&.module_method?
-              # ok
-            else
-              typing.add_error Errors::MethodDefinitionMissing.new(node: node,
-                                                                   module_name: module_name.name,
-                                                                   kind: :module,
-                                                                   missing_method: member.name)
-            end
+            expected_module_method_names << member.name
           end
+        when AST::Signature::Members::Attr
+          expected_instance_method_names << member.name
+          expected_instance_method_names << "#{member.name}=".to_sym if member.accessor?
         end
       end
 
-      annotations.dynamics.each do |method_name, annotation|
-        method_signature = signature.members.find {|sig| sig.is_a?(AST::Signature::Members::Method) && sig.name == method_name }
+      expected_instance_method_names.each do |method_name|
+        case
+        when module_context.defined_instance_methods.include?(method_name)
+          # ok
+        when annotations.dynamics[method_name]&.instance_method?
+          # ok
+        else
+          typing.add_error Errors::MethodDefinitionMissing.new(node: node,
+                                                               module_name: module_name.name,
+                                                               kind: :instance,
+                                                               missing_method: method_name)
+        end
+      end
+      expected_module_method_names.each do |method_name|
+        case
+        when module_context.defined_module_methods.include?(method_name)
+          # ok
+        when annotations.dynamics[method_name]&.module_method?
+          # ok
+        else
+          typing.add_error Errors::MethodDefinitionMissing.new(node: node,
+                                                               module_name: module_name.name,
+                                                               kind: :module,
+                                                               missing_method: method_name)
+        end
+      end
 
+      annotations.dynamics.each do |method_name, annotation|
         case
-        when annotation.module_method? && method_signature&.module_method?
+        when annotation.module_method? && expected_module_method_names.member?(method_name)
           # ok
-        when annotation.instance_method? && method_signature&.instance_method?
+        when annotation.instance_method? && expected_instance_method_names.member?(method_name)
           # ok
         else
           typing.add_error Errors::UnexpectedDynamicMethod.new(node: node,

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-28 00:00:00.000000000 Z
+date: 2018-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,6 +132,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -277,7 +278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Gradual Typing for Ruby