From ff93ad62bd6cb00365c5b4cabf5be07b6eb37b69 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 29 Dec 2016 09:26:45 +0000
Subject: [PATCH] rational.c: fix for mathn

* rational.c (read_num, read_rat_nos): dispatch by the type of numerator, for
  mathn.  [ruby-core:78893] [Bug #13084]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57232 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 rational.c         | 27 ++++++++++++++++++++++-----
 test/test_mathn.rb |  9 +++++++++
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/rational.c b/rational.c
index a7d7daf892..1bbea4fc72 100644
--- a/rational.c
+++ b/rational.c
@@ -2358,11 +2358,22 @@ read_num(const char **s, int numsign, int strict,
 	    exp = rb_int_uminus(exp);
     }
 
-    if (numsign == '-')
-	*num = rb_rational_uminus(*num);
+    if (numsign == '-') {
+	if (RB_TYPE_P(*num, T_RATIONAL)) {
+	    *num = rb_rational_uminus(*num);
+	}
+	else {
+	    *num = rb_int_uminus(*num);
+	}
+    }
     if (!NIL_P(exp)) {
 	VALUE l = f_expt10(exp);
-	*num = nurat_mul(*num, l);
+	if (RB_TYPE_P(*num, T_RATIONAL)) {
+	    *num = nurat_mul(*num, l);
+	}
+	else {
+	    *num = rb_int_mul(*num, l);
+	}
     }
     return 1;
 }
@@ -2388,8 +2399,14 @@ read_rat_nos(const char **s, int sign, int strict,
 	(*s)++;
 	if (!read_den(s, strict, &den))
 	    return 0;
-	if (!(FIXNUM_P(den) && FIX2LONG(den) == 1))
-	    *num = nurat_div(*num, den);
+	if (!(FIXNUM_P(den) && FIX2LONG(den) == 1)) {
+	    if (RB_TYPE_P(*num, T_RATIONAL)) {
+		*num = nurat_div(*num, den);
+	    }
+	    else {
+		*num = rb_int_div(*num, den);
+	    }
+	}
     }
     return 1;
 }
diff --git a/test/test_mathn.rb b/test/test_mathn.rb
index 00130eadf1..b50a09e4df 100644
--- a/test/test_mathn.rb
+++ b/test/test_mathn.rb
@@ -180,4 +180,13 @@ class TestMathn < Test::Unit::TestCase
       assert_equal((-13/5), (-13/5).round(2, half: :down))
     EOS
   end
+
+  def test_rational
+    assert_separately(%w[-rmathn], "#{<<-"begin;"}\n#{<<-"end;"}", ignore_stderr: true)
+    begin;
+      assert_equal(-5, "-5".to_r)
+      assert_equal(1, "5/5".to_r)
+      assert_equal(5, "5e0".to_r)
+    end;
+  end
 end