jtor-stdlib 0.1.1-java → 0.1.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30f6a9eaeea71b4b9ed16ebf62ea7c995ed5b6f0
-  data.tar.gz: 510159c2e64ef1cbc76635a7fba3c204bc143361
+  metadata.gz: 23edc4304941a8c8b28d4ed49943f1c381c092cf
+  data.tar.gz: 17f06f61a48310cc6cf8944451d844b7b736d550
 SHA512:
-  metadata.gz: 32fc80c2e1a9cd631845d8104e33d15b8360b60e36cee35ffca6f6b687116dc26f5736d242bf0120e577199465cd31361279de43ec24c2e35234634fdb970292
-  data.tar.gz: d187b0b8837f0e94729d9f2c61fd4495c99c65a504d442c283a4b66b4de9c331e58410dcd60de054ac2e62bc7683ea0f12e75a667612c2d9b6cd456b08f3e329
+  metadata.gz: dabbfe23ec0faceb3a6ec3d6a9920a9bdd8fc323b0d2f04484241ca89138673376f7ac7b402480ee5dab002260cbaf152d31dbcc7819a84639f001277dc8f617
+  data.tar.gz: 54e182ce43ee02084b0a73f8b00eba09bf64657a46a8d6019d80d5d7aff7113590bcd8c21222bf522eac3f5b823fab52d6a58a43dc1646f77b4d563b189aaf85

data/lib/jtor-stdlib.rb

@@ -2,5 +2,6 @@ warn 'Loading jtor-stdlib in a non-JRuby interpreter' unless defined? JRUBY_VERS
 
 require 'java'
 
+require 'jtor-stdlib/superobject'
 require 'jtor-stdlib/base'
 require 'jtor-stdlib/jtor_import'

data/lib/jtor-stdlib/base.rb

@@ -1,42 +1,81 @@
 module Jtor
   module StdLib
     module Base
-      @@_lookup = {}
-
-      # Method overloading is not a ruby thing, so we implement a pseudo-lookup
-      # mechanism for method based on the type/count of their args
-      def add_java_method(name, param_types, &block)
-        add_method_to_lookup(name, param_types, &block)
-        unless method_defined?(name)
-          define_method(name) { |*args| self.class.lookup(name, *args) }
-        end
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      def sup
+        @_sup ||= SuperObject.new(self)
       end
 
-      def lookup(name, *args)
-        if @@_lookup[name]
-          @@_lookup[name].each do |param_types, method|
-            # NOTE: This is an oversimplification of the way Java determines
-            # which method to invoke. I may work further into this later (see
-            # http://docs.oracle.com/javase/specs/jls/se7/html/jls-15.html#jls-15.12)
-            next unless params_match(param_types, args)
-            return method.call(*args)
+      module ClassMethods
+        def _lookup_table
+          @_lookup_table ||= {}
+        end
+
+        def _constructor_calls
+          @_constructor_calls ||= {}
+        end
+
+        # Method overloading is not a ruby thing, so we implement a pseudo-lookup
+        # mechanism for method based on the type/count of their args
+        def add_java_method(name, param_types, &block)
+          previously_defined = _lookup_table[name]
+          add_method_to_lookup(name, param_types, &block)
+          return if previously_defined
+          define_method(name) do |*args|
+            instance_exec(*args, &self.class.lookup(name, *args))
           end
         end
-        method_missing(name, *args)
-      end
 
-      def params_match(types, values)
-        # TODO: Handle var args (...)
-        types.each_with_index do |type, index|
-          value = values[index]
-          return false unless value.is_a?(type) || value.to_java.is_a?(type)
+        def add_java_constructor(param_types, constructor_call = nil, &block)
+          add_method_to_lookup(:initialize, param_types, &block)
+          previously_defined = _constructor_calls.any?
+          _constructor_calls[param_types] = constructor_call
+          return if previously_defined
+          define_method(:initialize) do |*args|
+            method, constructor_call = self.class.lookup(:initialize, *args)
+            # I really tried to avoid using eval fellows, but JRuby is very fixed
+            # on `super` being called here first than anything, and it wouldn't
+            # accept a `proc` calling `initialize` on `sup`, so this will have
+            # to do for now.
+            eval(constructor_call) #if constructor_call
+            instance_exec(*args, &method)
+          end
+        end
+
+        def lookup(name, *args)
+          if _lookup_table[name]
+            _lookup_table[name].each do |param_types, method|
+              # NOTE: This is an oversimplification of the way Java determines
+              # which method to invoke. I may work further into this later (see
+              # http://docs.oracle.com/javase/specs/jls/se7/html/jls-15.html#jls-15.12)
+              next unless params_match(param_types, args)
+              return (if (constructor_call = _constructor_calls[param_types])
+                [method, constructor_call]
+              else
+                method
+              end)
+            end
+          end
+          method_missing(name, *args)
         end
-        true
-      end
 
-      def add_method_to_lookup(name, param_types, &block)
-        @@_lookup[name] ||= {}
-        @@_lookup[name][param_types] = block
+        def params_match(types, values)
+          # TODO: Handle var args (...)
+          return false if types.size != values.size
+          types.each_with_index do |type, index|
+            value = values[index]
+            return false unless value.is_a?(type) || value.to_java.is_a?(type)
+          end
+          true
+        end
+
+        def add_method_to_lookup(name, param_types, &block)
+          _lookup_table[name] ||= {}
+          _lookup_table[name][param_types] = block
+        end
       end
     end
   end

data/lib/jtor-stdlib/superobject.rb

@@ -0,0 +1,18 @@
+module Jtor
+  module StdLib
+    class SuperObject
+      def initialize(obj)
+        @obj = obj
+      end
+
+      def method_missing(symbol, *args, &block)
+        superclass = @obj.class.superclass
+        if superclass < Base # If it's a Jtor class
+          superclass.lookup(@obj, symbol, *args)
+        else # All other classes (from http://stackoverflow.com/a/1251199)
+          superclass.instance_method(symbol).bind(@obj).call(*args, &block)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jtor-stdlib
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: java
 authors:
 - Alejandro Rodríguez
@@ -19,6 +19,7 @@ files:
 - lib/jtor-stdlib.rb
 - lib/jtor-stdlib/base.rb
 - lib/jtor-stdlib/jtor_import.rb
+- lib/jtor-stdlib/superobject.rb
 homepage: https://gitlab.com/eReGeBe/jtor-stdlib
 licenses:
 - MIT