yard2steep 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bb70f71599de19c3366d88dcafff7a50180c9358f2c331467158b3a711865cb
-  data.tar.gz: 7efcad232269e58c28f8cab663b10936eaa6c58fc5d8548426cfc8e768c21199
+  metadata.gz: 6288038fd78f492af6aa413b15c40ac3c6f3ada8068e56a3cf4ec252cfccec1d
+  data.tar.gz: 9fb5f345434b127bd61f96f1081874b8157698a8f7eaf5a8e6779ff891480642
 SHA512:
-  metadata.gz: 934d8b340f06399d2990f96330c01eeece9db711a2dbfc7aebfb7e43355145b3dee1f4594081cdcd193f2211fe8200d9f2f4878346ab1879b9bb4dcffcf9783b
-  data.tar.gz: b674c6de151346cc48015d1b166c4c2059f1fd5967a4dbd94a1e14db05206876b78abea19921d236962cd272d37ac16e993533b6c8b1cac2253a6bd554fe2894
+  metadata.gz: 478577c07127351b4080ccbcf48f87656b65cafd6481ebd188bf3d110d26fc04da2513d520d6e99182981bbb84450ebab1c9651ce14569dd6ca3c1941684afaa
+  data.tar.gz: 8146d573e9f52dbac2309df6651c7b39733f3e5a6d267ec279985a6ec6459866bc61f84e4c4061aa75257444443a03eabbb91c192aadeae13ad62c8307bb02b6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yard2steep (0.1.2)
+    yard2steep (0.1.3)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -2,7 +2,7 @@
 
 Generate [steep](https://github.com/soutaro/steep) type definition file from yard annotation.
 
-:warning: **This is highly experimental project. Current version is 0.1.1.**
+:warning: **This is highly experimental project. Current version is 0.1.2.**
 
 ## Installation
 

data/example/sample1/lib/example1.rb

@@ -31,7 +31,17 @@ class MyClass
     end
   end
 
-  CONSTANT = "This is constant".freeze
+  CONSTANT   = "This is constant"
+  CONSTANT2  = /this is re/
+  CONSTANT3  = :symbol_value
+  CONSTANT4  = 1..2
+  CONSTANT5  = 34
+  CONSTANT6  = 2.34
+  CONSTANT7  = [1, 2]
+  CONSTANT8  = { a: 3 }
+  CONSTANT9  = true
+  CONSTANT10 = false
+  CONSTANT11 = nil
 
   # This for should not be used.
   # @return [String]

data/example/sample1/sig/example1.rbi

@@ -19,7 +19,17 @@ class MyClass
   def present?: (any) -> any
   def mysum: (any) { (any) -> any } -> any
 end
-MyClass::CONSTANT: any
+MyClass::CONSTANT: String
+MyClass::CONSTANT2: Regexp
+MyClass::CONSTANT3: Symbol
+MyClass::CONSTANT4: Range<any>
+MyClass::CONSTANT5: Integer
+MyClass::CONSTANT6: Float
+MyClass::CONSTANT7: Array<any>
+MyClass::CONSTANT8: Hash<any, any>
+MyClass::CONSTANT9: bool
+MyClass::CONSTANT10: bool
+MyClass::CONSTANT11: nil
 module MyClass::InnerClass
   def double: (source: Integer) -> Integer
 end

data/lib/yard2steep/ast/constant_node.rb

@@ -1,15 +1,17 @@
 module Yard2steep
   module AST
     class ConstantNode
-      # @dynamic name, klass
-      attr_reader :name, :klass
+      # @dynamic name, klass, v_type
+      attr_reader :name, :klass, :v_type
 
       # @param [String] name
       # @param [String] klass
-      def initialize(name:, klass:)
+      # @param [String] v_type
+      def initialize(name:, klass:, v_type:)
         Util.assert! { name.is_a?(String) }
-        @name  = name
-        @klass = klass
+        @name   = name
+        @klass  = klass
+        @v_type = v_type
       end
 
       # @return [String]

data/lib/yard2steep/comments.rb

@@ -0,0 +1,131 @@
+require 'yard2steep/type'
+
+module Yard2steep
+  class Comments
+    S_RE = /[\s\t]*/
+    TYPE_WITH_PAREN_RE = /
+      \[
+      (
+        [^\]]
+        *
+      )
+      \]
+    /x
+    COMMENT_RE = /^
+      \#
+      #{S_RE}
+      @(?:param|return)
+      #{S_RE}
+      #{TYPE_WITH_PAREN_RE}
+    /x
+    PARAM_RE  = /
+      \#
+      #{S_RE}
+      @param
+      #{S_RE}
+      #{TYPE_WITH_PAREN_RE}
+      #{S_RE}
+      (\w+)
+    /x
+    RETURN_RE = /
+      \#
+      #{S_RE}
+      @return
+      #{S_RE}
+      #{TYPE_WITH_PAREN_RE}
+    /x
+
+    # @param [String] text
+    def initialize(text)
+      @comments_map = extract(text)
+    end
+
+    # @param [Integer] m_loc represents location of method definition
+    # @return [Array(Hash { String => String }, String)]
+    def parse_from(m_loc)
+      Util.assert! { m_loc >= 0 }
+      reset_context!
+
+      l = m_loc - 1
+      while l >= 0
+        comment = @comments_map[l]
+        break unless comment  # nil when no more comment exist
+
+        parse_comment!(comment)
+        l -= 1
+      end
+
+      [@p_types, @r_type]
+    end
+
+  private
+
+    # @return [void]
+    def reset_context!
+      @p_types = {}
+      @r_type  = nil
+    end
+
+    # @param [String] text
+    # @return [Hash{ String => String }]
+    def extract(text)
+      # NOTE: `Ripper.lex` returns array of array such as
+      # [
+      #   [[1, 0], :on_comment, "# @param [Array] contents\n", EXPR_BEG],
+      #   ...
+      # ]
+      r = {}
+      Ripper.lex(text).each do |t|
+        # Check token type
+        type = t[1]
+        next if type != :on_comment
+        # Check comment body
+        comment = t[2]
+        next unless comment.match?(COMMENT_RE)
+
+        line = t[0][0]
+        r[line] = comment
+      end
+
+      r
+    end
+
+    # @param [String] comment
+    # @return [void]
+    def parse_comment!(comment)
+      return if try_param_comment(comment)
+      return if try_return_comment(comment)
+      raise "Must not reach here!"
+    end
+
+    # @param [String] comment
+    # @return [bool]
+    def try_param_comment(comment)
+      m = comment.match(PARAM_RE)
+      return false unless m
+
+      type = normalize_type(m[1])
+      name = m[2]
+      @p_types[name] = type
+
+      true
+    end
+
+    # @param [String] comment
+    # @return [bool]
+    def try_return_comment(comment)
+      m = comment.match(RETURN_RE)
+      return false unless m
+
+      @r_type = normalize_type(m[1])
+
+      true
+    end
+
+    # @param [String] type
+    # @return [String]
+    def normalize_type(type)
+      Type.translate(type)
+    end
+  end
+end

data/lib/yard2steep/gen.rb

@@ -94,7 +94,7 @@ module Yard2steep
     def gen_c!(c_node, off:)
       Util.assert! { c_node.is_a?(AST::ConstantNode) }
       # NOTE: Use any as constant type.
-      emit! "#{c_node.long_name}: any\n", off: off
+      emit! "#{c_node.long_name}: #{c_node.v_type}\n", off: off
     end
 
     # @param [AST::MethodNode] m_node

data/lib/yard2steep/parser.rb

@@ -1,44 +1,11 @@
 require 'ripper'
 
-require 'yard2steep/type'
+require 'yard2steep/comments'
 require 'yard2steep/ast'
 require 'yard2steep/util'
 
 module Yard2steep
   class Parser
-    S_RE = /[\s\t]*/
-    TYPE_WITH_PAREN_RE = /
-      \[
-      (
-        [^\]]
-        *
-      )
-      \]
-    /x
-    COMMENT_RE = /^
-      \#
-      #{S_RE}
-      @(?:param|return)
-      #{S_RE}
-      #{TYPE_WITH_PAREN_RE}
-    /x
-    PARAM_RE  = /
-      \#
-      #{S_RE}
-      @param
-      #{S_RE}
-      #{TYPE_WITH_PAREN_RE}
-      #{S_RE}
-      (\w+)
-    /x
-    RETURN_RE = /
-      \#
-      #{S_RE}
-      @return
-      #{S_RE}
-      #{TYPE_WITH_PAREN_RE}
-    /x
-
     ANY_TYPE = 'any'
     ANY_BLOCK_TYPE = '{ (any) -> any }'
 
@@ -48,8 +15,6 @@ module Yard2steep
 
       # NOTE: set at parse
       @file = nil
-
-      @comments_map = {}
     end
 
     # @param [String] file
@@ -62,7 +27,7 @@ module Yard2steep
       @file = file
       debug_print!("Start parsing: #{file}")
 
-      @comments_map = extract_comments(text)
+      @comments = Comments.new(text)
 
       main = AST::ClassNode.create_main
       @ast = main
@@ -181,7 +146,7 @@ module Yard2steep
     # @return [void]
     def parse_method_impl(m_name, m_loc, params)
       within_context do
-        extract_p_types!(m_loc)
+        @p_types, @r_type = @comments.parse_from(m_loc)
 
         p_list = parse_params(params)
 
@@ -197,54 +162,6 @@ module Yard2steep
       end
     end
 
-    # @param [Integer] m_loc represents location of method definition
-    # @return [void]
-    def extract_p_types!(m_loc)
-      Util.assert! { m_loc >= 0 }
-      l = m_loc - 1
-      while l >= 0
-        comment = @comments_map[l]
-        break unless comment  # nil when no more comment exist
-
-        parse_comment!(comment)
-        l -= 1
-      end
-    end
-
-    # @param [String] comment
-    # @return [void]
-    def parse_comment!(comment)
-      return if try_param_comment(comment)
-      return if try_return_comment(comment)
-      raise "Must not reach here!"
-    end
-
-    # @param [String] comment
-    # @return [bool]
-    def try_param_comment(comment)
-      m = comment.match(PARAM_RE)
-      return false unless m
-
-      p = AST::PTypeNode.new(
-        p_type: normalize_type(m[1]),
-        p_name: m[2],
-        kind:   AST::PTypeNode::KIND[:normal],
-      )
-      @p_types[p.p_name] = p
-
-      true
-    end
-
-    # @param [String] comment
-    # @return [bool]
-    def try_return_comment(comment)
-      m = comment.match(RETURN_RE)
-      return false unless m
-
-      @r_type = normalize_type(m[1])
-
-      true
-    end
 
     # @param [Array] r_ast
     # @return [Array<AST::PNode>]
@@ -504,12 +421,74 @@ module Yard2steep
       }
       var_type = r_ast[1][1][0]
       if var_type == :@const
-        # TODO(south37) Check the value node to predict the type of the const.
-        c = AST::ConstantNode.new(
-          name:  r_ast[1][1][1],
-          klass: @current_class,
-        )
-        @current_class.append_constant(c)
+        parse_assign_constant(name: r_ast[1][1][1], v_ast: r_ast[2])
+      end
+    end
+
+    # @param [String] name
+    # @param [Array] v_ast
+    # @return [void]
+    def parse_assign_constant(name:, v_ast:)
+      c = AST::ConstantNode.new(
+        name:   name,
+        klass:  @current_class,
+        v_type: type_of(v_ast),
+      )
+      @current_class.append_constant(c)
+    end
+
+    # @param [Array] r_ast
+    # @return [String]
+    def type_of(r_ast)
+      # NOTE: r_ast is array such as
+      #
+      # String example:
+      # [:string_literal,
+      #   [:string_content,
+      #     [:@tstring_content, "String...", [34, 15]]
+      #   ]
+      # ]
+      #
+      # Regexp example:
+      # [:regexp_literal,
+      #   [
+      #     [:@tstring_content, "this is re", [35, 15]]
+      #   ],
+      #   [:@regexp_end, "/", [35, 25]]
+      # ]
+      #
+      # nil example:
+      # [:var_ref, [:@kw, "nil", [40, 14]]]
+
+      case r_ast[0]
+      when :string_literal
+        'String'
+      when :regexp_literal
+        'Regexp'
+      when :symbol_literal
+        'Symbol'
+      when :dot2
+        'Range<any>'
+      when :@int
+        'Integer'
+      when :@float
+        'Float'
+      when :array
+        'Array<any>'  # TODO(south37): check type of element
+      when :hash
+        'Hash<any, any>'  # TODO(south37): check type of element
+      when :var_ref
+        Util.assert! { r_ast[1].is_a?(Array) && r_ast[1][0] == :@kw }
+        case r_ast[1][1]
+        when 'true', 'false'
+          'bool'
+        when 'nil'
+          'nil'
+        else
+          'any'
+        end
+      else
+        'any'
       end
     end
 
@@ -657,30 +636,6 @@ module Yard2steep
       end
     end
 
-    # @param [String] text
-    # @return [Hash{ String => String }]
-    def extract_comments(text)
-      # NOTE: `Ripper.lex` returns array of array such as
-      # [
-      #   [[1, 0], :on_comment, "# @param [Array] contents\n", EXPR_BEG],
-      #   ...
-      # ]
-      r = {}
-      Ripper.lex(text).each do |t|
-        # Check token type
-        type = t[1]
-        next if type != :on_comment
-        # Check comment body
-        comment = t[2]
-        next unless comment.match?(COMMENT_RE)
-
-        line = t[0][0]
-        r[line] = comment
-      end
-
-      r
-    end
-
     ##
     # Helper
 
@@ -694,35 +649,32 @@ module Yard2steep
     # @return [AST::PTypeNode]
     def type_node(p)
       if @p_types[p]
-        @p_types[p]
+        type = @p_types[p]
       else
-        AST::PTypeNode.new(
-          p_type: ANY_TYPE,
-          p_name: p,
-          kind:   AST::PTypeNode::KIND[:normal],
-        )
+        type = ANY_TYPE
       end
+
+      AST::PTypeNode.new(
+        p_type: type,
+        p_name: p,
+        kind:   AST::PTypeNode::KIND[:normal],
+      )
     end
 
     # @param [String] p
     # @return [AST::PTypeNode]
     def block_type_node(p)
       if @p_types[p]
-        @p_types[p]
+        type = @p_types[p]
       else
-        AST::PTypeNode.new(
-          p_type: ANY_BLOCK_TYPE,
-          p_name: p,
-          kind:   AST::PTypeNode::KIND[:block],
-        )
+        type = ANY_BLOCK_TYPE
       end
-    end
 
-    # @param [String] type
-    # @return [String]
-    def normalize_type(type)
-      debug_print! type
-      Type.translate(type)
+      AST::PTypeNode.new(
+        p_type: type,
+        p_name: p,
+        kind:   AST::PTypeNode::KIND[:block],
+      )
     end
   end
 end

data/lib/yard2steep/type/ast.rb

@@ -1,14 +1,13 @@
 module Yard2steep
   class Type
     class TypeBase
-      # @param [Array<TypeBase>] types
-      # @return [String]
-      def self.union2s(types)
-        types.map { |t| t.to_s }.uniq.join(' | ')
+      def to_s
+        raise "Must be implemented in child class"
       end
     end
 
     class AnyType < TypeBase
+      # @return [String]
       def to_s
         'any'
       end
@@ -26,26 +25,40 @@ module Yard2steep
     end
 
     class ArrayType < TypeBase
-      # @param [Array<TypeBase>] type
+      # @param [TypeBase] type
       def initialize(type:)
         @type = type
       end
 
+      # @return [String]
       def to_s
-        "Array<#{TypeBase.union2s(@type)}>"
+        "Array<#{@type}>"
       end
     end
 
     class HashType < TypeBase
-      # @param [Array<TypeBase>] key
-      # @param [Array<TypeBase>] val
+      # @param [TypeBase] key
+      # @param [TypeBase] val
       def initialize(key:, val:)
         @key = key
         @val = val
       end
 
+      # @return [String]
+      def to_s
+        "Hash<#{@key}, #{@val}>"
+      end
+    end
+
+    class UnionType < TypeBase
+      def initialize(types:)
+        Util.assert! { types.size > 0 }
+        @types = types
+      end
+
+      # @return [String]
       def to_s
-        "Hash<#{TypeBase.union2s(@key)}, #{TypeBase.union2s(@val)}>"
+        @types.map { |t| t.to_s }.uniq.join(' | ')
       end
     end
   end

data/lib/yard2steep/type/parser.rb

@@ -25,7 +25,7 @@ module Yard2steep
           @types.push(parse_type)
         end
 
-        @types
+        UnionType.new(types: @types)
       end
 
     private
@@ -69,7 +69,7 @@ module Yard2steep
         r.push(parse_type)
 
         while t = peek
-          break if t != ','
+          break unless t == ','
           expect!(',')
           r.push(parse_type)
         end
@@ -85,19 +85,19 @@ module Yard2steep
         case peek
         when '<'
           expect!('<')
-          ArrayType.new(
-            type: parse_multiple_types('>')
+          type = UnionType.new(
+            types: parse_multiple_types('>')
           )
         when '('
           expect!('(')
-          ArrayType.new(
-            type: parse_multiple_types(')')
+          type = UnionType.new(
+            types: parse_multiple_types(')')
           )
         else
-          ArrayType.new(
-            type: [AnyType.new]
-          )
+          type = AnyType.new
         end
+
+        ArrayType.new(type: type)
       end
 
       # @return [HashType]
@@ -107,20 +107,18 @@ module Yard2steep
         case peek
         when '{'
           expect!('{')
-          key = parse_multiple_types('=')
-          Util.assert! { key.size > 0 }
-
+          key = UnionType.new(types: parse_multiple_types('='))
           expect!('>')
-          val = parse_multiple_types('}')
-          Util.assert! { val.size > 0 }
+          val = UnionType.new(types: parse_multiple_types('}'))
+
           HashType.new(
             key: key,
             val: val,
           )
         else
           HashType.new(
-            key: [AnyType.new],
-            val: [AnyType.new],
+            key: AnyType.new,
+            val: AnyType.new,
           )
         end
       end
@@ -131,15 +129,18 @@ module Yard2steep
         Util.assert! { t == token }
       end
 
+      # @return [String]
       def get
         @tokens.shift
       end
 
+      # @return [String]
       def peek
         @tokens[0]
       end
 
       # @param [String] message
+      # @return [void]
       def debug_print!(message)
         # TODO(south37) Add flag
         # print message

data/lib/yard2steep/type.rb

@@ -19,7 +19,7 @@ module Yard2steep
     def translate
       tokens = tokens(@text)
       ast = Parser.parse(tokens)
-      TypeBase.union2s(ast)
+      ast.to_s
     end
 
     S_RE = /[\s\t]*/

data/lib/yard2steep/version.rb

@@ -1,3 +1,3 @@
 module Yard2steep
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/sig/steep-scaffold/td.rbi

@@ -1,15 +1,34 @@
+class Yard2steep::Comments
+  @comments_map: any
+  @p_types: any
+  @r_type: any
+  def initialize: (any) -> any
+  def parse_from: (any) -> Array<any>
+  def reset_context!: () -> any
+  def extract: (any) -> any
+  def parse_comment!: (any) -> any
+  def try_param_comment: (any) -> bool
+  def try_return_comment: (any) -> bool
+  def normalize_type: (any) -> any
+end
+
+Yard2steep::Comments::S_RE: Regexp
+Yard2steep::Comments::TYPE_WITH_PAREN_RE: Regexp
+Yard2steep::Comments::COMMENT_RE: Regexp
+Yard2steep::Comments::PARAM_RE: Regexp
+Yard2steep::Comments::RETURN_RE: Regexp
 module Yard2steep::AST
 end
 
 class Yard2steep::Parser
   @debug: any
   @file: any
-  @comments_map: any
+  @comments: any
   @ast: any
   @current_class: any
-  @r_type: any
   @p_types: any
-  def initialize: () -> Hash<any, any>
+  @r_type: any
+  def initialize: () -> any
   def parse: (any, any, ?debug: bool) -> any
   def parse_program: (any) -> any
   def parse_stmts: (any) -> any
@@ -17,10 +36,6 @@ class Yard2steep::Parser
   def parse_defs: (any) -> any
   def parse_def: (any) -> any
   def parse_method_impl: (any, any, any) -> any
-  def extract_p_types!: (any) -> void
-  def parse_comment!: (any) -> any
-  def try_param_comment: (any) -> bool
-  def try_return_comment: (any) -> bool
   def parse_params: (any) -> any
   def parse_paren_params: (any) -> any
   def parse_no_paren_params: (any) -> any
@@ -28,22 +43,17 @@ class Yard2steep::Parser
   def parse_class_or_module: (any) -> any
   def parse_bodystmt: (any) -> any
   def parse_assign: (any) -> void
+  def parse_assign_constant: (name: any, v_ast: any) -> any
+  def type_of: (any) -> String
   def parse_command: (any) -> void
   def parse_command_args_add_block: (any) -> any
   def parse_method_add_arg: (any) -> void
   def parse_attr_reader: (any) -> any
-  def extract_comments: (any) -> any
   def debug_print!: (any) -> void
   def type_node: (any) -> any
   def block_type_node: (any) -> any
-  def normalize_type: (any) -> any
 end
 
-Yard2steep::Parser::S_RE: Regexp
-Yard2steep::Parser::TYPE_WITH_PAREN_RE: Regexp
-Yard2steep::Parser::COMMENT_RE: Regexp
-Yard2steep::Parser::PARAM_RE: Regexp
-Yard2steep::Parser::RETURN_RE: Regexp
 Yard2steep::Parser::ANY_TYPE: String
 Yard2steep::Parser::ANY_BLOCK_TYPE: String
 class Yard2steep::CLI
@@ -73,7 +83,7 @@ class Yard2steep::Engine
 end
 
 class Yard2steep::Type::TypeBase
-  def self.union2s: (any) -> any
+  def to_s: () -> any
 end
 
 class Yard2steep::Type::AnyType
@@ -99,6 +109,12 @@ class Yard2steep::Type::HashType
   def to_s: () -> String
 end
 
+class Yard2steep::Type::UnionType
+  @types: any
+  def initialize: (types: any) -> any
+  def to_s: () -> any
+end
+
 class Yard2steep::Type::Parser
   @tokens: any
   @types: any
@@ -167,7 +183,8 @@ Yard2steep::AST::ClassNode::KIND: Array<any>
 class Yard2steep::AST::ConstantNode
   @name: any
   @klass: any
-  def initialize: (name: any, klass: any) -> any
+  @v_type: any
+  def initialize: (name: any, klass: any, v_type: any) -> any
   def long_name: () -> String
 end
 

data/sig/yard2steep/yard2steep/ast/class_node.rbi

@@ -26,4 +26,4 @@ class Yard2steep::AST::ClassNode
   def to_s: -> String
   def inspect: -> String
 end
-Yard2steep::AST::ClassNode::KIND: any
+Yard2steep::AST::ClassNode::KIND: Array<any>

data/sig/yard2steep/yard2steep/ast/constant_node.rbi

@@ -1,8 +1,10 @@
 class Yard2steep::AST::ConstantNode
   @name: any
   @klass: any
+  @v_type: any
   def name: -> any
   def klass: -> any
-  def initialize: (name: String, klass: String) -> any
+  def v_type: -> any
+  def initialize: (name: String, klass: String, v_type: String) -> any
   def long_name: -> String
 end

data/sig/yard2steep/yard2steep/ast/p_node.rbi

@@ -5,4 +5,4 @@ class Yard2steep::AST::PNode
   def style: -> any
   def initialize: (type_node: AST::PTypeNode, style: String) -> any
 end
-Yard2steep::AST::PNode::STYLE: any
+Yard2steep::AST::PNode::STYLE: Hash<any, any>

data/sig/yard2steep/yard2steep/ast/p_type_node.rbi

@@ -7,4 +7,4 @@ class Yard2steep::AST::PTypeNode
   def kind: -> any
   def initialize: (p_type: String, p_name: String, kind: String) -> any
 end
-Yard2steep::AST::PTypeNode::KIND: any
+Yard2steep::AST::PTypeNode::KIND: Hash<any, any>

data/sig/yard2steep/yard2steep/comments.rbi

@@ -0,0 +1,15 @@
+class Yard2steep::Comments
+  def initialize: (String) -> any
+  def parse_from: (Integer) -> Array<Hash<String, String> | String>
+  def reset_context!: -> void
+  def extract: (String) -> Hash<String, String>
+  def parse_comment!: (String) -> void
+  def try_param_comment: (String) -> bool
+  def try_return_comment: (String) -> bool
+  def normalize_type: (String) -> String
+end
+Yard2steep::Comments::S_RE: Regexp
+Yard2steep::Comments::TYPE_WITH_PAREN_RE: Regexp
+Yard2steep::Comments::COMMENT_RE: Regexp
+Yard2steep::Comments::PARAM_RE: Regexp
+Yard2steep::Comments::RETURN_RE: Regexp

data/sig/yard2steep/yard2steep/parser.rbi

@@ -7,10 +7,6 @@ class Yard2steep::Parser
   def parse_defs: (Array<any>) -> void
   def parse_def: (Array<any>) -> void
   def parse_method_impl: (String, Integer, Array<any>) -> void
-  def extract_p_types!: (Integer) -> void
-  def parse_comment!: (String) -> void
-  def try_param_comment: (String) -> bool
-  def try_return_comment: (String) -> bool
   def parse_params: (Array<any>) -> Array<AST::PNode>
   def parse_paren_params: (Array<any>) -> Array<AST::PNode>
   def parse_no_paren_params: (Array<any>) -> Array<AST::PNode>
@@ -18,20 +14,15 @@ class Yard2steep::Parser
   def parse_class_or_module: (Array<any>) -> void
   def parse_bodystmt: (Array<any>) -> void
   def parse_assign: (Array<any>) -> void
+  def parse_assign_constant: (name: String, v_ast: Array<any>) -> void
+  def type_of: (Array<any>) -> String
   def parse_command: (Array<any>) -> void
   def parse_command_args_add_block: (Array<any>) -> Array<String>
   def parse_method_add_arg: (Array<any>) -> void
   def parse_attr_reader: (any) -> void
-  def extract_comments: (String) -> Hash<String, String>
   def debug_print!: (String) -> void
   def type_node: (String) -> AST::PTypeNode
   def block_type_node: (String) -> AST::PTypeNode
-  def normalize_type: (String) -> String
 end
-Yard2steep::Parser::S_RE: any
-Yard2steep::Parser::TYPE_WITH_PAREN_RE: any
-Yard2steep::Parser::COMMENT_RE: any
-Yard2steep::Parser::PARAM_RE: any
-Yard2steep::Parser::RETURN_RE: any
-Yard2steep::Parser::ANY_TYPE: any
-Yard2steep::Parser::ANY_BLOCK_TYPE: any
+Yard2steep::Parser::ANY_TYPE: String
+Yard2steep::Parser::ANY_BLOCK_TYPE: String

data/sig/yard2steep/yard2steep/type/ast.rbi

@@ -1,18 +1,22 @@
 class Yard2steep::Type::TypeBase
-  def self.union2s: (Array<TypeBase>) -> String
+  def to_s: -> any
 end
 class Yard2steep::Type::AnyType <: Yard2steep::Type::TypeBase
-  def to_s: -> any
+  def to_s: -> String
 end
 class Yard2steep::Type::NormalType <: Yard2steep::Type::TypeBase
   def initialize: (type: String) -> any
   def to_s: -> any
 end
 class Yard2steep::Type::ArrayType <: Yard2steep::Type::TypeBase
-  def initialize: (type: Array<TypeBase>) -> any
-  def to_s: -> any
+  def initialize: (type: TypeBase) -> any
+  def to_s: -> String
 end
 class Yard2steep::Type::HashType <: Yard2steep::Type::TypeBase
-  def initialize: (key: Array<TypeBase>, val: Array<TypeBase>) -> any
-  def to_s: -> any
+  def initialize: (key: TypeBase, val: TypeBase) -> any
+  def to_s: -> String
+end
+class Yard2steep::Type::UnionType <: Yard2steep::Type::TypeBase
+  def initialize: (types: any) -> any
+  def to_s: -> String
 end

data/sig/yard2steep/yard2steep/type/parser.rbi

@@ -8,7 +8,7 @@ class Yard2steep::Type::Parser
   def parse_array: -> ArrayType
   def parse_hash: -> HashType
   def expect!: (String) -> any
-  def get: -> any
-  def peek: -> any
-  def debug_print!: (String) -> any
+  def get: -> String
+  def peek: -> String
+  def debug_print!: (String) -> void
 end

data/sig/yard2steep/yard2steep/type.rbi

@@ -4,5 +4,5 @@ class Yard2steep::Type
   def translate: -> String
   def tokens: (String) -> Array<String>
 end
-Yard2steep::Type::S_RE: any
-Yard2steep::Type::TOKENS: any
+Yard2steep::Type::S_RE: Regexp
+Yard2steep::Type::TOKENS: Regexp

data/sig/yard2steep/yard2steep/version.rbi

@@ -1 +1 @@
-Yard2steep::VERSION: any
+Yard2steep::VERSION: String

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yard2steep
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Nao Minami
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-08 00:00:00.000000000 Z
+date: 2018-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,6 +129,7 @@ files:
 - lib/yard2steep/ast/p_type_node.rb
 - lib/yard2steep/cli.rb
 - lib/yard2steep/cli/option.rb
+- lib/yard2steep/comments.rb
 - lib/yard2steep/engine.rb
 - lib/yard2steep/gen.rb
 - lib/yard2steep/parser.rb
@@ -148,6 +149,7 @@ files:
 - sig/yard2steep/yard2steep/ast/p_type_node.rbi
 - sig/yard2steep/yard2steep/cli.rbi
 - sig/yard2steep/yard2steep/cli/option.rbi
+- sig/yard2steep/yard2steep/comments.rbi
 - sig/yard2steep/yard2steep/engine.rbi
 - sig/yard2steep/yard2steep/gen.rbi
 - sig/yard2steep/yard2steep/parser.rbi