Skip to content

Commit

Permalink
[refactor] less confusing proxy class/module local variable name
Browse files Browse the repository at this point in the history
  • Loading branch information
@kares
kares committed May 18, 2018
1 parent b02bb2c commit ab086b7
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 60 deletions.
59 changes: 29 additions & 30 deletions core/src/main/java/org/jruby/javasupport/ext/JavaLang.java
View file
Expand Up @@ -80,10 +80,10 @@ public static void define(final Ruby runtime) {
@JRubyModule(name = "Java::JavaLang::Iterable", include = "Enumerable")
public static class Iterable {

static RubyModule define(final Ruby runtime, final RubyModule Iterable) {
Iterable.includeModule( runtime.getEnumerable() ); // include Enumerable
Iterable.defineAnnotatedMethods(Iterable.class);
return Iterable;
static RubyModule define(final Ruby runtime, final RubyModule proxy) {
proxy.includeModule( runtime.getEnumerable() ); // include Enumerable
proxy.defineAnnotatedMethods(Iterable.class);
return proxy;
}

@JRubyMethod
Expand Down Expand Up @@ -177,10 +177,10 @@ public static IRubyObject count(final ThreadContext context, final IRubyObject s
@JRubyClass(name = "Java::JavaLang::Comparable", include = "Comparable")
public static class Comparable {

static RubyModule define(final Ruby runtime, final RubyModule Comparable) {
Comparable.includeModule( runtime.getComparable() ); // include Comparable
Comparable.defineAnnotatedMethods(Comparable.class);
return Comparable;
static RubyModule define(final Ruby runtime, final RubyModule proxy) {
proxy.includeModule( runtime.getComparable() ); // include Comparable
proxy.defineAnnotatedMethods(Comparable.class);
return proxy;
}

@JRubyMethod(name = "<=>")
Expand All @@ -205,9 +205,9 @@ public static IRubyObject cmp(final ThreadContext context, final IRubyObject sel
@JRubyClass(name = "Java::JavaLang::Throwable")
public static class Throwable {

static RubyModule define(final Ruby runtime, final RubyClass Throwable) {
Throwable.defineAnnotatedMethods(Throwable.class);
return Throwable;
static RubyModule define(final Ruby runtime, final RubyClass proxy) {
proxy.defineAnnotatedMethods(Throwable.class);
return proxy;
}

@JRubyMethod // stackTrace => backtrace
Expand Down Expand Up @@ -273,9 +273,9 @@ private static boolean checkNativeException(IRubyObject self, IRubyObject other)
@JRubyModule(name = "Java::JavaLang::Runnable")
public static class Runnable {

static RubyModule define(final Ruby runtime, final RubyModule Runnable) {
Runnable.defineAnnotatedMethods(Runnable.class);
return Runnable;
static RubyModule define(final Ruby runtime, final RubyModule proxy) {
proxy.defineAnnotatedMethods(Runnable.class);
return proxy;
}

@JRubyMethod
Expand Down Expand Up @@ -321,13 +321,13 @@ protected final IRubyObject doYield(ThreadContext context, Block block, IRubyObj
@JRubyClass(name = "Java::JavaLang::Number")
public static class Number {

static RubyClass define(final Ruby runtime, final RubyClass Number) {
Number.defineAnnotatedMethods(Number.class);
static RubyClass define(final Ruby runtime, final RubyClass proxy) {
proxy.defineAnnotatedMethods(Number.class);

Number.defineAlias("to_int", "longValue");
Number.defineAlias("to_f", "doubleValue");
proxy.defineAlias("to_int", "longValue");
proxy.defineAlias("to_f", "doubleValue");

return Number;
return proxy;
}

@JRubyMethod(name = "to_f")
Expand Down Expand Up @@ -405,10 +405,9 @@ public static IRubyObject coerce(final ThreadContext context, final IRubyObject
@JRubyClass(name = "Java::JavaLang::Character")
public static class Character {

static RubyClass define(final Ruby runtime, final RubyClass Character) {
System.out.println("defining Character extensions: proxy-class: " + Character);
Character.defineAnnotatedMethods(Character.class);
return (RubyClass) Character;
static RubyClass define(final Ruby runtime, final RubyClass proxy) {
proxy.defineAnnotatedMethods(Character.class);
return proxy;
}

@JRubyMethod(name = "java_identifier_start?", meta = true)
Expand Down Expand Up @@ -438,10 +437,10 @@ public static IRubyObject to_i(final ThreadContext context, final IRubyObject se
@JRubyClass(name = "Java::JavaLang::Class")
public static class Class {

static RubyClass define(final Ruby runtime, final RubyClass Class) {
Class.includeModule( runtime.getComparable() ); // include Comparable
Class.defineAnnotatedMethods(Class.class);
return (RubyClass) Class;
static RubyClass define(final Ruby runtime, final RubyClass proxy) {
proxy.includeModule( runtime.getComparable() ); // include Comparable
proxy.defineAnnotatedMethods(Class.class);
return proxy;
}

@JRubyMethod(name = "ruby_class")
Expand Down Expand Up @@ -599,9 +598,9 @@ public static IRubyObject static_p(final IRubyObject self) {
@JRubyClass(name = "Java::JavaLang::ClassLoader")
public static class ClassLoader {

static RubyModule define(final Ruby runtime, final RubyClass ClassLoader) {
ClassLoader.defineAnnotatedMethods(ClassLoader.class);
return ClassLoader;
static RubyModule define(final Ruby runtime, final RubyClass proxy) {
proxy.defineAnnotatedMethods(ClassLoader.class);
return proxy;
}

@JRubyMethod
Expand Down
18 changes: 9 additions & 9 deletions core/src/main/java/org/jruby/javasupport/ext/JavaLangReflect.java
View file
Expand Up @@ -57,9 +57,9 @@ public static void define(final Ruby runtime) {
@JRubyClass(name = "Java::JavaLangReflect::Constructor")
public static class Constructor {

static RubyClass define(final Ruby runtime, final RubyClass Constructor) {
Constructor.defineAnnotatedMethods(Constructor.class);
return (RubyClass) Constructor;
static RubyClass define(final Ruby runtime, final RubyClass proxy) {
proxy.defineAnnotatedMethods(Constructor.class);
return proxy;
}

@JRubyMethod
Expand Down Expand Up @@ -118,9 +118,9 @@ public static IRubyObject static_p(final IRubyObject self) {
@JRubyClass(name = "Java::JavaLangReflect::Method")
public static class Method {

static RubyClass define(final Ruby runtime, final RubyClass Method) {
Method.defineAnnotatedMethods(Method.class);
return (RubyClass) Method;
static RubyClass define(final Ruby runtime, final RubyClass proxy) {
proxy.defineAnnotatedMethods(Method.class);
return proxy;
}

@JRubyMethod
Expand Down Expand Up @@ -198,9 +198,9 @@ public static IRubyObject static_p(final IRubyObject self) {
@JRubyClass(name = "Java::JavaLangReflect::Field")
public static class Field {

static RubyClass define(final Ruby runtime, final RubyClass Field) {
Field.defineAnnotatedMethods(Field.class);
return (RubyClass) Field;
static RubyClass define(final Ruby runtime, final RubyClass proxy) {
proxy.defineAnnotatedMethods(Field.class);
return proxy;
}

@JRubyMethod // alias value_type name
Expand Down
30 changes: 15 additions & 15 deletions core/src/main/java/org/jruby/javasupport/ext/JavaUtil.java
View file
Expand Up @@ -69,10 +69,10 @@ public static void define(final Ruby runtime) {
@JRubyModule(name = "Java::JavaUtil::Enumeration", include = "Enumerable")
public static class Enumeration {

static RubyModule define(final Ruby runtime, final RubyModule Enumeration) {
Enumeration.includeModule( runtime.getEnumerable() ); // include Enumerable
Enumeration.defineAnnotatedMethods(Enumeration.class);
return Enumeration;
static RubyModule define(final Ruby runtime, final RubyModule proxy) {
proxy.includeModule( runtime.getEnumerable() ); // include Enumerable
proxy.defineAnnotatedMethods(Enumeration.class);
return proxy;
}

@JRubyMethod
Expand All @@ -91,10 +91,10 @@ public static IRubyObject each(final ThreadContext context, final IRubyObject se
@JRubyModule(name = "Java::JavaUtil::Iterator", include = "Enumerable")
public static class Iterator {

static RubyModule define(final Ruby runtime, final RubyModule Iterator) {
Iterator.includeModule( runtime.getEnumerable() ); // include Enumerable
Iterator.defineAnnotatedMethods(Iterator.class);
return Iterator;
static RubyModule define(final Ruby runtime, final RubyModule proxy) {
proxy.includeModule( runtime.getEnumerable() ); // include Enumerable
proxy.defineAnnotatedMethods(Iterator.class);
return proxy;
}

@JRubyMethod
Expand All @@ -113,10 +113,10 @@ public static IRubyObject each(final ThreadContext context, final IRubyObject se
@JRubyModule(name = "Java::JavaUtil::Collection", include = "Enumerable")
public static class Collection {

static RubyModule define(final Ruby runtime, final RubyModule Collection) {
Collection.includeModule( runtime.getEnumerable() ); // include Enumerable
Collection.defineAnnotatedMethods(Collection.class);
return Collection;
static RubyModule define(final Ruby runtime, final RubyModule proxy) {
proxy.includeModule( runtime.getEnumerable() ); // include Enumerable
proxy.defineAnnotatedMethods(Collection.class);
return proxy;
}

@JRubyMethod(name = { "length", "size" })
Expand Down Expand Up @@ -256,9 +256,9 @@ public static IRubyObject join(final ThreadContext context, final IRubyObject se
@JRubyModule(name = "Java::JavaUtil::List")
public static class List {

static RubyModule define(final Ruby runtime, final RubyModule List) {
List.defineAnnotatedMethods(List.class);
return List;
static RubyModule define(final Ruby runtime, final RubyModule proxy) {
proxy.defineAnnotatedMethods(List.class);
return proxy;
}

@JRubyMethod(name = "[]") // act safe on indexes compared to get(idx) throwing IndexOutOfBoundsException
Expand Down
12 changes: 6 additions & 6 deletions core/src/main/java/org/jruby/javasupport/ext/JavaUtilRegex.java
View file
Expand Up @@ -52,9 +52,9 @@ public static void define(final Ruby runtime) {
@JRubyClass(name = "Java::JavaUtilRegex::Pattern")
public static class Pattern {

static RubyClass define(final Ruby runtime, final RubyClass Pattern) {
Pattern.defineAnnotatedMethods(Pattern.class);
return Pattern;
static RubyClass define(final Ruby runtime, final RubyClass proxy) {
proxy.defineAnnotatedMethods(Pattern.class);
return proxy;
}

@JRubyMethod(name = "=~", required = 1)
Expand Down Expand Up @@ -94,9 +94,9 @@ private static java.util.regex.Matcher matcher(final IRubyObject self, final IRu
@JRubyClass(name = "Java::JavaUtilRegex::Matcher")
public static class Matcher {

static RubyClass define(final Ruby runtime, final RubyClass Matcher) {
Matcher.defineAnnotatedMethods(Matcher.class);
return (RubyClass) Matcher;
static RubyClass define(final Ruby runtime, final RubyClass proxy) {
proxy.defineAnnotatedMethods(Matcher.class);
return (RubyClass) proxy;
}

@JRubyMethod
Expand Down

0 comments on commit ab086b7

Please sign in to comment.