jruby · Oct 30, 2014 · Oct 30, 2014
diff --git a/core/src/main/java/org/jruby/ast/RationalNode.java b/core/src/main/java/org/jruby/ast/RationalNode.java
@@ -15,12 +15,14 @@
  * @author enebo
  */
 public class RationalNode extends Node {
-    long numerator;
+    private final long numerator;
+    private final long denominator;
 
-    public RationalNode(ISourcePosition position, long numerator) {
+    public RationalNode(ISourcePosition position, long numerator, long denominator) {
         super(position);
 
         this.numerator = numerator;
+        this.denominator = denominator;
     }
 
     @Override
@@ -41,4 +43,8 @@ public NodeType getNodeType() {
     public long getNumerator() {
         return numerator;
     }
+
+    public long getDenominator() {
+        return denominator;
+    }
 }
diff --git a/core/src/main/java/org/jruby/common/IRubyWarnings.java b/core/src/main/java/org/jruby/common/IRubyWarnings.java
@@ -97,7 +97,8 @@ public enum ID {
         GC_STRESS_UNIMPLEMENTED,
         GC_ENABLE_UNIMPLEMENTED,
         GC_DISABLE_UNIMPLEMENTED,
-        TRUFFLE; // TODO(CS): divide up the Truffle warnings
+        TRUFFLE,
+        RATIONAL_OUT_OF_RANGE,; // TODO(CS): divide up the Truffle warnings
 
         public String getID() {
             return name();

diff --git a/core/src/main/java/org/jruby/ir/IRBuilder.java b/core/src/main/java/org/jruby/ir/IRBuilder.java
@@ -2997,7 +2997,7 @@ public Operand buildPreExe(PreExeNode preExeNode, IRScope s) {
     }
 
     public Operand buildRational(RationalNode rationalNode, IRScope s) {
-        return new Rational(rationalNode.getNumerator());
+        return new Rational(rationalNode.getNumerator(), rationalNode.getDenominator());
     }
 
     public Operand buildRedo(Node node, IRScope s) {

diff --git a/core/src/main/java/org/jruby/ir/operands/Rational.java b/core/src/main/java/org/jruby/ir/operands/Rational.java
@@ -7,17 +7,19 @@
  * Literal Rational number.
  */
 public class Rational extends ImmutableLiteral {
-    private long numerator;
+    private final long numerator;
+    private final long denominator;
 
-    public Rational(long numerator) {
+    public Rational(long numerator, long denominator) {
         super(OperandType.RATIONAL);
 
         this.numerator = numerator;
+        this.denominator = denominator;
     }
 
     @Override
     public Object createCacheObject(ThreadContext context) {
-        return context.runtime.newRational(numerator, 1);
+        return context.runtime.newRational(numerator, denominator);
     }
 
     @Override
@@ -33,4 +35,8 @@ public void visit(IRVisitor visitor) {
     public double getNumerator() {
         return numerator;
     }
+
+    public double getDenominator() {
+        return denominator;
+    }
 }
diff --git a/core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java b/core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java
@@ -37,6 +37,7 @@
 
 import java.io.IOException;
 
+import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.HashMap;
 
@@ -136,8 +137,21 @@ public Encoding getEncoding() {
         return encoding;
     }
 
-    private int getFloatToken(String number) {
-        // FIXME: Rational support is needed here.
+    private int getFloatToken(String number, int suffix) {
+        if ((suffix & SUFFIX_R) != 0) {
+            BigDecimal bd = new BigDecimal(number);
+            BigDecimal denominator = BigDecimal.ONE.scaleByPowerOfTen(bd.scale());
+            BigDecimal numerator = bd.multiply(denominator);
+
+            try {
+                yaccValue = new RationalNode(getPosition(), numerator.longValueExact(), denominator.longValueExact());
+            } catch (ArithmeticException ae) {
+                // FIXME: Rational supports Bignum numerator and denominator
+                throw new SyntaxException(PID.RATIONAL_OUT_OF_RANGE, getPosition(), getCurrentLine(), "Rational (" + numerator + "/" + denominator + ") out of range.");
+            }
+            return Tokens.tRATIONAL;
+        }
+
         double d;
         try {
             d = SafeDoubleParser.parseDouble(number);
@@ -159,7 +173,7 @@ private FixnumNode newFixnumNode(String value, int radix) throws NumberFormatExc
     }
 
     private RationalNode newRationalNode(String value, int radix) throws NumberFormatException {
-        return new RationalNode(getPosition(), Long.parseLong(value, radix));
+        return new RationalNode(getPosition(), Long.parseLong(value, radix), 1);
     }
 
     private ComplexNode newComplexNode(Node number) {
@@ -2513,7 +2527,8 @@ private int getNumberToken(String number, boolean seen_e, boolean seen_point, in
             throw new SyntaxException(PID.TRAILING_UNDERSCORE_IN_NUMBER, getPosition(),
                     getCurrentLine(), "Trailing '_' in number.");
         } else if (isFloat) {
-            return getFloatToken(number);
+            int suffix = numberLiteralSuffix(seen_e ? SUFFIX_I : SUFFIX_ALL);
+            return getFloatToken(number, suffix);
         }
         yaccValue = getInteger(number, 10, numberLiteralSuffix(SUFFIX_ALL));
         return Tokens.tINTEGER;

diff --git a/core/src/main/java/org/jruby/lexer/yacc/SyntaxException.java b/core/src/main/java/org/jruby/lexer/yacc/SyntaxException.java
@@ -58,7 +58,8 @@ public enum PID {
         MIXED_ENCODING("MIXED_ENCODNIG"),
         NUL_IN_SYMBOL("NUL_IN_SYMBOL"),
         REGEXP_ENCODING_MISMATCH("REGEXP_ENCODING_MISMATCH"),
-        INVALID_MULTIBYTE_CHAR("INVALID_MULTIBYTE_CHAR")
+        INVALID_MULTIBYTE_CHAR("INVALID_MULTIBYTE_CHAR"),
+        RATIONAL_OUT_OF_RANGE("RATIONAL_OUT_OF_RANGE")
         ;
 
         private String id;

diff --git a/core/src/main/java/org/jruby/parser/Parser.java b/core/src/main/java/org/jruby/parser/Parser.java
@@ -122,6 +122,7 @@ public Node parse(String file, LexerSource lexerSource, DynamicScope blockScope,
             // but I am not sure which conditions leads to this...so lame message.
             throw runtime.newSyntaxError("Problem reading source: " + e);
         } catch (SyntaxException e) {
+            e.printStackTrace();
             switch (e.getPid()) {
                 case UNKNOWN_ENCODING:
                 case NOT_ASCII_COMPATIBLE:

diff --git a/core/src/main/java/org/jruby/parser/Tokens.java b/core/src/main/java/org/jruby/parser/Tokens.java
@@ -89,6 +89,7 @@ public interface Tokens {
     int tCVAR       = RubyParser.tCVAR;
     int tINTEGER    = RubyParser.tINTEGER;
     int tFLOAT      = RubyParser.tFLOAT;
+    int tRATIONAL   = RubyParser.tRATIONAL;
     int tSTRING_CONTENT     = RubyParser.tSTRING_CONTENT;
     int tSTRING_BEG = RubyParser.tSTRING_BEG;
     int tSTRING_END = RubyParser.tSTRING_END;

diff --git a/jruby/core/src/main/java/org/jruby/java/addons/ClassJavaAddons.java b/jruby/core/src/main/java/org/jruby/java/addons/ClassJavaAddons.java