squash_java 1.0.0 → 1.0.1

data/lib/squash/java/namespace.rb

@@ -221,7 +221,7 @@ class Squash::Java::Namespace
 
   def method(klass, name)
     matches = name.match(METHOD_REGEX) or raise "Invalid method name #{name.inspect}"
-    return_type = type(matches[1])
+    return_type = argument(matches[1])
     method_name = matches[2]
     args        = matches[3].split(/,\s*/).map { |arg| argument(arg) }
     args = [] if matches[3].empty?
@@ -259,9 +259,9 @@ class Squash::Java::Namespace
   #   {Squash::Java::Method Method}.
 
   def argument(type_descriptor)
-    array     = type_descriptor[-2..-1] == '[]'
-    type_name = type_descriptor.sub(/\[\]$/, '')
-    Squash::Java::Argument.new type(type_name), array
+    dimensionality = type_descriptor.scan(/\[\]/).size
+    type_name      = type_descriptor.gsub(/\[\]/, '')
+    Squash::Java::Argument.new type(type_name), dimensionality
   end
 
   # Creates a new Argument for a given type descriptor, which can be fully or
@@ -276,11 +276,11 @@ class Squash::Java::Namespace
   #   {Squash::Java::Method Method}, or `nil` if the type is not recognized.
 
   def obfuscated_argument(type_descriptor)
-    array     = type_descriptor[-2..-1] == '[]'
-    type_name = type_descriptor.sub(/\[\]$/, '')
-    type      = obfuscated_type(type_name)
+    dimensionality = type_descriptor.scan(/\[\]/).size
+    type_name      = type_descriptor.gsub(/\[\]/, '')
+    type           = obfuscated_type(type_name)
     return nil unless type
-    Squash::Java::Argument.new type, array
+    Squash::Java::Argument.new type, dimensionality
   end
 end
 
@@ -510,7 +510,7 @@ class Squash::Java::Method
 
   def full_name
     args = arguments.map { |type| type.to_s }.join(', ')
-    "#{return_type.full_name} #{name}(#{args})"
+    "#{return_type.to_s} #{name}(#{args})"
   end
 
   # @private
@@ -524,26 +524,25 @@ class Squash::Java::Argument
   # @return [Squash::Java::Type] The argument type.
   attr_reader :type
 
-  # @return [true, false] `true` if the argument is an array, false if it is a
-  #   scalar.
-  attr_reader :array
-  alias array? array
+  # @return [Fixnum] The number of dimensions for vector values. A type of
+  #   `int[][]` has a dimensionality of 2. Scalars have a dimensionality of 0.
+  attr_reader :dimensionality
 
   # @private
-  def initialize(type, array=false)
-    @type  = type
-    @array = array
+  def initialize(type, dimensionality=0)
+    @type           = type
+    @dimensionality = dimensionality
   end
 
   # @private
   def ==(other)
     other.kind_of?(Squash::Java::Argument) &&
         type == other.type &&
-        array? == other.array?
+        dimensionality == other.dimensionality
   end
 
   # @return [String] The type's full name, with "[]" appended for arrays.
-  def to_s() "#{type.full_name}#{'[]' if array?}" end
+  def to_s() "#{type.full_name}#{'[]'*dimensionality}" end
 
   # @private
   def inspect() "#<#{self.class} #{to_s}>" end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: squash_java
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Tim Morgan
@@ -15,10 +15,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-07 00:00:00 Z
+date: 2013-01-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -28,11 +27,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  name: json
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  name: json
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -42,11 +41,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  name: squash_uploader
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  name: squash_uploader
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -56,11 +55,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  name: rspec
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -70,11 +69,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  name: yard
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  name: yard
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -84,11 +83,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  name: redcarpet
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  name: redcarpet
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -98,9 +97,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  name: jeweler
   version_requirements: *id006
+  name: jeweler
+  prerelease: false
+  type: :development
 description: This gem includes a library that imports yGuard or ProGuard rename logs, and a binary that uploads the data to Squash.
 email: tim@squareup.com
 executables: