bitclust-dev 0.5.4 → 0.5.5

data/tools/bc-checkparams.rb

@@ -2,6 +2,7 @@
 
 require 'optparse'
 require 'pathname'
+require 'set'
 
 bindir = Pathname.new(__FILE__).realpath.dirname
 $LOAD_PATH.unshift((bindir + '../lib').realpath)
@@ -60,14 +61,16 @@ module BitClust
     end
 
     def method_entry_chunk
+      method_signatures = []
       @f.while_match(/\A---/) do |line|
-        method_signature line
+        method_signatures << method_signature(line)
       end
       props = {}
       @f.while_match(/\A:/) do |line|
         k, v = line.sub(/\A:/, '').split(':', 2)
         props[k.strip] = v.strip
       end
+      params = Set.new
       while @f.next?
         case @f.peek
         when /\A===+/
@@ -93,7 +96,9 @@ module BitClust
         when /@see/
           see
         when /\A@[a-z]/
-          method_info
+          method_info.each do |param|
+            params << param
+          end
         else
           if @f.peek.strip.empty?
             @f.gets
@@ -102,6 +107,7 @@ module BitClust
           end
         end
       end
+      check_parameters(method_signatures, params)
     end
 
     def headline(line)
@@ -200,27 +206,20 @@ module BitClust
         @f.ungets(header)
         case cmd
         when '@param', '@arg'
-          name = header.slice!(/\A\s*\w+/n) || '?'
-          params << name
+          name = header.slice!(/\A\s*\w+/) || '?'
+          params << name.strip
         when '@raise'
           # nop
         when '@return'
           # nop
+        when '@todo'
+          # nop
         else
           $stderr.puts "[UNKNOWN_META_INFO] #{cmd}"
         end
         dd_without_p
       end
-      # check parameters
-      params.map(&:strip).each{|param|
-        unless @sig.params.split(',').map(&:strip).any?{|v|
-            param == v.tr('*', '').gsub(/\s*=\s*.+/, '')
-          }
-          $stderr.puts "#{@f.lineno}: #{@sig.friendly_string}"
-          $stderr.puts params.inspect
-          $stderr.puts @sig.params.inspect
-        end
-      }
+      params
     rescue
       $stderr.puts "#{@f.lineno}: #{@sig.friendly_string}"
       $stderr.puts params.inspect
@@ -240,6 +239,33 @@ module BitClust
     def method_signature(sig_line)
       @sig = MethodSignature.parse(sig_line)
     end
+
+    private
+
+    def check_parameters(method_signatures, params)
+      params_in_signature = extract_params(method_signatures)
+      unless params_in_signature == params
+        puts "#{@f.lineno}:"
+        method_signatures.each do |signature|
+          puts signature.friendly_string
+          puts "signature: #{signature.params}"
+        end
+        puts "@params: #{params.to_a.join(", ")}"
+        puts "-" * 72
+      end
+    end
+
+    def extract_params(method_signatures)
+      method_signatures.map do |signature|
+        next unless signature.params
+        signature.params.split(",").map do |param|
+          param = param.tr("*&", "")
+          param = param.gsub(/\=.*/, "")
+          param = param.gsub(/.*:/, "")
+          param.strip
+        end
+      end.compact.flatten.to_set
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitclust-dev
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2012-09-15 00:00:00.000000000 Z
+date: 2013-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitclust-core
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -53,43 +53,43 @@ description: ! 'Rurema is a Japanese ruby documentation project, and
 email:
 - ''
 executables:
-- bc-tohtmlpackage.rb
+- bc-tochm.rb
 - bc-methods.rb
-- bc-classes.rb
-- statrefm.rb
 - bc-checkparams.rb
-- bc-rdoc.rb
-- gencatalog.rb
-- check-signature.rb
-- bc-tochm.rb
-- bc-preproc.rb
 - bc-ancestors.rb
-- forall-ruby.rb
-- stattodo.rb
 - bc-list.rb
-- update-database.rb
-- bc-convert.rb
+- stattodo.rb
+- statrefm.rb
+- bc-classes.rb
 - bc-tohtml.rb
+- forall-ruby.rb
+- gencatalog.rb
+- bc-convert.rb
+- bc-rdoc.rb
+- bc-preproc.rb
+- update-database.rb
+- bc-tohtmlpackage.rb
+- check-signature.rb
 extensions: []
 extra_rdoc_files: []
 files:
-- tools/bc-tohtmlpackage.rb
+- tools/bc-tochm.rb
 - tools/bc-methods.rb
-- tools/bc-classes.rb
-- tools/statrefm.rb
 - tools/bc-checkparams.rb
-- tools/bc-rdoc.rb
-- tools/gencatalog.rb
-- tools/check-signature.rb
-- tools/bc-tochm.rb
-- tools/bc-preproc.rb
 - tools/bc-ancestors.rb
-- tools/forall-ruby.rb
-- tools/stattodo.rb
 - tools/bc-list.rb
-- tools/update-database.rb
-- tools/bc-convert.rb
+- tools/stattodo.rb
+- tools/statrefm.rb
+- tools/bc-classes.rb
 - tools/bc-tohtml.rb
+- tools/forall-ruby.rb
+- tools/gencatalog.rb
+- tools/bc-convert.rb
+- tools/bc-rdoc.rb
+- tools/bc-preproc.rb
+- tools/update-database.rb
+- tools/bc-tohtmlpackage.rb
+- tools/check-signature.rb
 - lib/bitclust.rb
 homepage: http://doc.ruby-lang.org/ja/
 licenses: []
@@ -103,15 +103,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -439247444481969180
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -439247444481969180
 requirements: []
 rubyforge_project: ''
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: BitClust is a rurema document processor.