revert some changes back to master which came in through a conflict merge from PR

Author: mkristian

src/main/java/org/jruby/ext/openssl/BN.java

@@ -43,6 +43,7 @@
 import org.jruby.anno.JRubyMethod;
 import org.jruby.exceptions.RaiseException;
 import org.jruby.runtime.Arity;
+import org.jruby.runtime.ClassIndex;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
@@ -247,32 +248,21 @@ public IRubyObject to_bn() {
     public IRubyObject coerce(IRubyObject other) {
         final Ruby runtime = getRuntime();
         IRubyObject self;
-//        switch (other.getMetaClass().index) {
-//        case ClassIndex.STRING:
-//            self = runtime.newString(value.toString());
-//            break;
-//        case ClassIndex.FIXNUM:
-//        case ClassIndex.BIGNUM:
-//            // FIXME: s/b faster way to convert than going through RubyString
-//            self = RubyNumeric.str2inum(runtime, runtime.newString(value.toString()), 10, true);
-//            break;
-//        default:
-//            if (other instanceof BN) {
-//                self = this;
-//            } else {
-//                throw runtime.newTypeError("Don't know how to coerce");
-//            }
-        if ( other instanceof RubyString ) {
-            self = runtime.newString(value.toString());
-        }
-        else if ( other instanceof RubyInteger ) {
-            self = to_i();
-        }
-        else if ( other instanceof BN ) {
-            self = this;
-        }
-        else {
-            throw runtime.newTypeError("don't know how to coerce to " + other.getMetaClass().getName());
+    	switch (other.getMetaClass().index) {
+        	case ClassIndex.STRING:
+                    self = runtime.newString(value.toString());
+        	    break;
+        	case ClassIndex.FIXNUM:
+        	case ClassIndex.BIGNUM:
+        	    // FIXME: s/b faster way to convert than going through RubyString
+        	    self = RubyNumeric.str2inum(runtime, runtime.newString(value.toString()), 10, true);
+        	    break;
+        	default:
+        	    if (other instanceof BN) {
+        	        self = this;
+        	    } else {
+        	        throw runtime.newTypeError("Don't know how to coerce");
+        	    }
         }
         return runtime.newArray(other, self);
     }
@@ -376,43 +366,27 @@ public IRubyObject bn_exp(final ThreadContext context, IRubyObject other) {
         // exponent even approaching Integer.MAX_VALUE would be silly big, and
         // the value would take a very, very long time to calculate.)
         // we'll check for values < 0 (illegal) while we're at it
-//        int exp;
-//        switch(other.getMetaClass().index) {
-//        case ClassIndex.FIXNUM: {
-//            long val = ((RubyFixnum)other).getLongValue();
-//            if (val >= 0 && val <= Integer.MAX_VALUE) {
-//                exp = (int)val;
-//                break;
-//            }
-//        }
-//        case ClassIndex.BIGNUM:
-//            // Bignum is inherently too big
-//            throw newBNError(getRuntime(), "invalid exponent");
-//        default: {
-//            if (!(other instanceof BN)) {
-//                throw getRuntime().newTypeError("Cannot convert into OpenSSL::BN");
-        int exp = -1;
-
-        if ( other instanceof RubyInteger ) {
-            long val = ((RubyInteger) other).getLongValue();
-            if ( val >= 0 && val <= Integer.MAX_VALUE ) {
-                exp = (int) val;
-            }
-            else if ( other instanceof RubyBignum ) { // inherently too big
-                throw newBNError(context.runtime, "invalid exponent");
-            }
-        }
-
-        if ( exp == -1 ) {
-            if ( ! (other instanceof BN) ) {
-                throw context.runtime.newTypeError("Cannot convert into " + other.getMetaClass().getName());
-            }
-            BigInteger val = ((BN) other).value;
-            if (val.compareTo(BigInteger.ZERO) < 0 || val.compareTo(MAX_INT) > 0) {
-                throw newBNError(context.runtime, "invalid exponent");
-            }
-            exp = val.intValue();
-        }
+        int exp;
+    	switch(other.getMetaClass().index) {
+    	case ClassIndex.FIXNUM:
+    	    long val = ((RubyFixnum)other).getLongValue();
+    	    if (val >= 0 && val <= Integer.MAX_VALUE) {
+    		exp = (int)val;
+    		break;
+    	    }
+    	case ClassIndex.BIGNUM:
+    	    // Bignum is inherently too big
+    	    throw newBNError(getRuntime(), "invalid exponent");
+    	default:
+    	    if (!(other instanceof BN)) {
+    	        throw getRuntime().newTypeError("Cannot convert into OpenSSL::BN");
+    	    }
+    	}
+	    BigInteger val = ((BN) other).value;
+	    if (val.compareTo(BigInteger.ZERO) < 0 || val.compareTo(MAX_INT) > 0) {
+		throw newBNError(context.runtime, "invalid exponent");
+	    }
+	    exp = val.intValue();
 
         try {
             return newBN(context.runtime, value.pow(exp));
@@ -822,27 +796,17 @@ public static RaiseException newBNError(Ruby runtime, String message) {
         return new RaiseException(runtime, runtime.getModule("OpenSSL").getClass("BNError"), message, true);
     }
 
-//    public static BigInteger getBigInteger(IRubyObject arg) {
-//        if (arg.isNil()) return null;
-//        switch(arg.getMetaClass().index) {
-//        case ClassIndex.FIXNUM:
-//        case ClassIndex.BIGNUM:
-//            return new BigInteger(arg.toString());
-//        default:
-//            if (arg instanceof BN) {
-//                return ((BN)arg).value;
-//            }
-//            throw arg.getRuntime().newTypeError("Cannot convert into OpenSSL::BN");
-    public static BigInteger getBigInteger(final IRubyObject arg) {
-        if ( arg.isNil() ) return null;
-
-        if ( arg instanceof RubyInteger ) {
-            return ((RubyInteger) arg).getBigIntegerValue();
-        }
-
-        if ( arg instanceof BN ) return ((BN) arg).value;
-
-        throw arg.getRuntime().newTypeError("Cannot convert into OpenSSL::BN");
+    public static BigInteger getBigInteger(IRubyObject arg) {
+	if (arg.isNil()) return null;
+	switch(arg.getMetaClass().index) {
+    	case ClassIndex.FIXNUM:
+    	case ClassIndex.BIGNUM:
+    	    return new BigInteger(arg.toString());
+    	default:
+    	    if (arg instanceof BN) {
+    		return ((BN)arg).value;
+    	    }
+    	    throw arg.getRuntime().newTypeError("Cannot convert into OpenSSL::BN");
+    	}
     }
-
 }