yard2steep 0.1.1 → 0.1.2

data/lib/yard2steep/type/parser.rb

@@ -1,13 +1,13 @@
 module Yard2steep
   class Type
     class Parser
-      # @param [Array<String>]
+      # @param [Array<String>] tokens
       # @return [Array<TypeBase>]
       def self.parse(tokens)
         Parser.new(tokens).parse
       end
 
-      # @param [Array<String>]
+      # @param [Array<String>] tokens
       def initialize(tokens)
         @tokens = tokens
         @types  = []
@@ -100,6 +100,7 @@ module Yard2steep
         end
       end
 
+      # @return [HashType]
       def parse_hash
         debug_print!("parse_hash, peek: #{peek}")
 
@@ -107,8 +108,11 @@ module Yard2steep
         when '{'
           expect!('{')
           key = parse_multiple_types('=')
+          Util.assert! { key.size > 0 }
+
           expect!('>')
           val = parse_multiple_types('}')
+          Util.assert! { val.size > 0 }
           HashType.new(
             key: key,
             val: val,

data/lib/yard2steep/type.rb

@@ -4,7 +4,7 @@ require 'yard2steep/type/parser'
 
 module Yard2steep
   class Type
-    # @param [Strng]
+    # @param [String] text
     # @return [String]
     def self.translate(text)
       Type.new(text).translate
@@ -15,6 +15,7 @@ module Yard2steep
       @text = text
     end
 
+    # @return [String]
     def translate
       tokens = tokens(@text)
       ast = Parser.parse(tokens)
@@ -31,9 +32,14 @@ module Yard2steep
     def tokens(str)
       r = []
       s = StringScanner.new(str)
-      while !s.eos?
+      while true
         s.scan(S_RE)
-        r.push(s.scan(TOKENS))
+        break if s.eos?
+        if t = s.scan(TOKENS)
+          r.push(t)
+        else
+          raise "token must exist!"
+        end
       end
       r
     end

data/lib/yard2steep/util.rb

@@ -2,10 +2,18 @@ module Yard2steep
   module Util
     class AssertError < RuntimeError; end
 
-    # @param [{ () -> any }]
     # @return [void]
     def self.assert!(&block)
       raise AssertError.new("Assertion failed!") if !block.call
+    rescue AssertError => e
+      # NOTE: Enable when debug option is true
+      # print e
+      # code = <<-CODE
+      #   require 'pry'
+      #   binding.pry
+      # CODE
+      # eval(code, block.binding)
+      raise e
     end
   end
 end

data/lib/yard2steep/version.rb

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

data/sig/steep-scaffold/td.rbi

@@ -4,59 +4,46 @@ end
 class Yard2steep::Parser
   @debug: any
   @file: any
+  @comments_map: any
   @ast: any
-  @stack: any
-  @state: any
   @current_class: any
-  @p_types: any
   @r_type: any
-  @m_name: any
-  def initialize: () -> any
+  @p_types: any
+  def initialize: () -> Hash<any, any>
   def parse: (any, any, ?debug: bool) -> any
-  def reset_method_context!: () -> any
-  def parse_line: (any) -> any
-  def try_parse_comment: (any) -> bool
-  def try_parse_param_or_return: (any) -> void
-  def try_parse_end: (any) -> bool
-  def try_parse_postfix_if: (any) -> any
-  def try_parse_begin_end: (any) -> bool
-  def try_parse_class: (any) -> bool
-  def try_parse_constant: (any) -> bool
-  def try_parse_singleton_class: (any) -> bool
-  def try_parse_param: (any) -> bool
-  def try_parse_return: (any) -> bool
-  def try_parse_method: (any) -> bool
-  def try_parse_method_with_no_action: (any) -> bool
-  def parse_method_params: (any) -> any
-  def try_parse_attr: (any) -> bool
-  def push_state!: (any) -> any
-  def pop_state!: () -> void
-  def stack_is_empty?: () -> any
+  def parse_program: (any) -> any
+  def parse_stmts: (any) -> any
+  def parse_stmt: (any) -> any
+  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
+  def within_context: () -> any
+  def parse_class_or_module: (any) -> any
+  def parse_bodystmt: (any) -> any
+  def parse_assign: (any) -> void
+  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 debug_print!: (any, ?offset: Integer) -> void
+  def block_type_node: (any) -> any
   def normalize_type: (any) -> any
 end
 
 Yard2steep::Parser::S_RE: Regexp
-Yard2steep::Parser::S_P_RE: Regexp
-Yard2steep::Parser::PRE_RE: Regexp
-Yard2steep::Parser::POST_RE: Regexp
-Yard2steep::Parser::CLASS_RE: Regexp
-Yard2steep::Parser::MODULE_RE: Regexp
-Yard2steep::Parser::S_CLASS_RE: Regexp
-Yard2steep::Parser::END_RE: Regexp
-Yard2steep::Parser::CONSTANT_ASSIGN_RE: Regexp
-Yard2steep::Parser::POSTFIX_IF_RE: Regexp
-Yard2steep::Parser::BEGIN_END_RE: Regexp
-Yard2steep::Parser::COMMENT_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::PAREN_RE: Regexp
-Yard2steep::Parser::ARGS_RE: Regexp
-Yard2steep::Parser::METHOD_RE: Regexp
-Yard2steep::Parser::ATTR_RE: Regexp
-Yard2steep::Parser::STATES: Hash<any, any>
 Yard2steep::Parser::ANY_TYPE: String
 Yard2steep::Parser::ANY_BLOCK_TYPE: String
 class Yard2steep::CLI
@@ -140,7 +127,7 @@ end
 Yard2steep::Type::S_RE: Regexp
 Yard2steep::Type::TOKENS: Regexp
 module Yard2steep::Util
-  def self.assert!: { () -> any } -> void
+  def self.assert!: () -> any
 end
 
 class Yard2steep::Util::AssertError

data/sig/yard2steep/yard2steep/parser.rbi

@@ -1,48 +1,37 @@
 class Yard2steep::Parser
   def initialize: -> any
   def parse: (String, String, ?debug: bool) -> AST::ClassNode
-  def reset_method_context!: -> void
-  def parse_line: (String) -> void
-  def try_parse_comment: (String) -> bool
-  def try_parse_param_or_return: (String) -> bool
-  def try_parse_end: (String) -> bool
-  def try_parse_postfix_if: (String) -> bool
-  def try_parse_begin_end: (String) -> bool
-  def try_parse_class: (String) -> bool
-  def try_parse_constant: (String) -> bool
-  def try_parse_singleton_class: (String) -> bool
-  def try_parse_param: (String) -> bool
-  def try_parse_return: (String) -> bool
-  def try_parse_method: (String) -> bool
-  def try_parse_method_with_no_action: (String) -> bool
-  def parse_method_params: (String) -> Array<AST::PNode>
-  def try_parse_attr: (String) -> bool
-  def push_state!: (String) -> void
-  def pop_state!: -> void
-  def stack_is_empty?: -> bool
+  def parse_program: (String) -> void
+  def parse_stmts: (Array<any>) -> void
+  def parse_stmt: (Array<any>) -> void
+  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>
+  def within_context: { (any) -> any } -> void
+  def parse_class_or_module: (Array<any>) -> void
+  def parse_bodystmt: (Array<any>) -> void
+  def parse_assign: (Array<any>) -> void
+  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 debug_print!: (String, ?offset: Integer) -> void
+  def block_type_node: (String) -> AST::PTypeNode
   def normalize_type: (String) -> String
 end
 Yard2steep::Parser::S_RE: any
-Yard2steep::Parser::S_P_RE: any
-Yard2steep::Parser::PRE_RE: any
-Yard2steep::Parser::POST_RE: any
-Yard2steep::Parser::CLASS_RE: any
-Yard2steep::Parser::MODULE_RE: any
-Yard2steep::Parser::S_CLASS_RE: any
-Yard2steep::Parser::END_RE: any
-Yard2steep::Parser::CONSTANT_ASSIGN_RE: any
-Yard2steep::Parser::POSTFIX_IF_RE: any
-Yard2steep::Parser::BEGIN_END_RE: any
-Yard2steep::Parser::COMMENT_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::PAREN_RE: any
-Yard2steep::Parser::ARGS_RE: any
-Yard2steep::Parser::METHOD_RE: any
-Yard2steep::Parser::ATTR_RE: any
-Yard2steep::Parser::STATES: any
 Yard2steep::Parser::ANY_TYPE: any
 Yard2steep::Parser::ANY_BLOCK_TYPE: any

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

@@ -1,12 +1,12 @@
 class Yard2steep::Type::Parser
-  def self.parse: (any) -> Array<TypeBase>
-  def initialize: (any) -> any
+  def self.parse: (Array<String>) -> Array<TypeBase>
+  def initialize: (Array<String>) -> any
   def parse: -> any
   def parse_type: -> TypeBase
   def parse_normal_type: (String) -> NormalType
   def parse_multiple_types: (String) -> Array<TypeBase>
   def parse_array: -> ArrayType
-  def parse_hash: -> any
+  def parse_hash: -> HashType
   def expect!: (String) -> any
   def get: -> any
   def peek: -> any

data/sig/yard2steep/yard2steep/type.rbi

@@ -1,7 +1,7 @@
 class Yard2steep::Type
-  def self.translate: (any) -> String
+  def self.translate: (String) -> String
   def initialize: (String) -> any
-  def translate: -> any
+  def translate: -> String
   def tokens: (String) -> Array<String>
 end
 Yard2steep::Type::S_RE: any

data/yard2steep.gemspec

@@ -25,5 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.2"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "pry-doc"
   spec.add_development_dependency "steep", "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yard2steep
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nao Minami
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-28 00:00:00.000000000 Z
+date: 2018-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-doc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: steep
   requirement: !ruby/object:Gem::Requirement