jruby · Dec 12, 2015 · Dec 19, 2015 · Dec 19, 2015 · Dec 19, 2015 · Dec 19, 2015
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@
 *.versionsBackup
 *.zip
 *~
+*.tokens
 
 .DS_Store
 .debug.properties

diff --git a/spec/truffle/tags/core/string/modulo_tags.txt b/spec/truffle/tags/core/string/modulo_tags.txt
@@ -80,3 +80,4 @@ fails:String#% behaves as if calling Kernel#Float for %g arguments, when the pas
 fails:String#% behaves as if calling Kernel#Float for %g arguments, when the passed argument is hexadecimal string
 fails:String#% behaves as if calling Kernel#Float for %G arguments, when the passed argument does not respond to #to_ary
 fails:String#% behaves as if calling Kernel#Float for %G arguments, when the passed argument is hexadecimal string
+fails:String#% when format string contains %<> formats should raise ArgumentError if no hash given
diff --git a/truffle/src/main/antlr4/org/jruby/truffle/format/parser/PrintfLexer.g4 b/truffle/src/main/antlr4/org/jruby/truffle/format/parser/PrintfLexer.g4
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 1.0
+ * GNU General Public License version 2
+ * GNU Lesser General Public License version 2.1
+ */
+lexer grammar PrintfLexer;
+
+FORMAT  : '%' -> mode(FORMAT_MODE);
+LITERAL : (~'%')* ;
+
+mode FORMAT_MODE;
+
+ANGLE_KEY   : '<' .*? '>' ;
+ZERO        : '0' ;
+NUMBER      : [1-9] [0-9]* ;
+SPACE       : ' ' ;
+PLUS        : '+' ;
+MINUS       : '-' ;
+STAR        : '*' ;
+DOLLAR      : '$' ;
+DOT         : '.' ;
+CURLEY_KEY  : '{' .*? '}' -> mode(DEFAULT_MODE) ;
+TYPE        : [bBdiouxXeEfgGaAcps] -> mode(DEFAULT_MODE) ;
+ESCAPED     : '%' -> mode(DEFAULT_MODE) ;
diff --git a/truffle/src/main/antlr4/org/jruby/truffle/format/parser/PrintfParser.g4 b/truffle/src/main/antlr4/org/jruby/truffle/format/parser/PrintfParser.g4
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 1.0
+ * GNU General Public License version 2
+ * GNU Lesser General Public License version 2.1
+ */
+parser grammar PrintfParser;
+
+options { tokenVocab=PrintfLexer; }
+
+sequence : (FORMAT directive | literal)* ;
+
+directive : CURLEY_KEY                 # string
+          | ESCAPED                    # escaped
+          | ANGLE_KEY?
+            flag*
+            width=NUMBER?
+            (DOT precision=NUMBER)?
+            TYPE                       # format ;
+
+flag : SPACE
+     | ZERO
+     | PLUS
+     | MINUS
+     | STAR
+     | NUMBER DOLLAR ;
+
+literal : LITERAL ;
diff --git a/truffle/src/main/java/org/jruby/truffle/format/nodes/format/FormatFloatNode.java b/truffle/src/main/java/org/jruby/truffle/format/nodes/format/FormatFloatNode.java
@@ -14,7 +14,7 @@
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.Specialization;
 import org.jruby.truffle.format.nodes.PackNode;
-import org.jruby.truffle.format.parser.FormatDirective;
+import org.jruby.truffle.format.parser.PrintfTreeBuilder;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.core.StringOperations;
 import org.jruby.util.ByteList;
@@ -68,12 +68,12 @@ public ByteList format(double value) {
 
             if (Double.isInfinite(value)) {
 
-                if (spacePadding != FormatDirective.DEFAULT) {
+                if (spacePadding != PrintfTreeBuilder.DEFAULT) {
                     builder.append(" ");
                     builder.append(spacePadding + 5);
                 }
 
-                if (zeroPadding != FormatDirective.DEFAULT && zeroPadding != 0) {
+                if (zeroPadding != PrintfTreeBuilder.DEFAULT && zeroPadding != 0) {
                     builder.append("0");
                     builder.append(zeroPadding + 5);
                 }
@@ -86,20 +86,20 @@ public ByteList format(double value) {
 
             } else {
 
-                if (spacePadding != FormatDirective.DEFAULT) {
+                if (spacePadding != PrintfTreeBuilder.DEFAULT) {
                     builder.append(" ");
                     builder.append(spacePadding);
 
-                    if (zeroPadding != FormatDirective.DEFAULT) {
+                    if (zeroPadding != PrintfTreeBuilder.DEFAULT) {
                         builder.append(".");
                         builder.append(zeroPadding);
                     }
-                } else if (zeroPadding != FormatDirective.DEFAULT && zeroPadding != 0) {
+                } else if (zeroPadding != PrintfTreeBuilder.DEFAULT && zeroPadding != 0) {
                     builder.append("0");
                     builder.append(zeroPadding);
                 }
 
-                if (precision != FormatDirective.DEFAULT) {
+                if (precision != PrintfTreeBuilder.DEFAULT) {
                     builder.append(".");
                     builder.append(precision);
                 }

diff --git a/truffle/src/main/java/org/jruby/truffle/format/nodes/format/FormatIntegerNode.java b/truffle/src/main/java/org/jruby/truffle/format/nodes/format/FormatIntegerNode.java
@@ -16,7 +16,7 @@
 import com.oracle.truffle.api.object.DynamicObject;
 
 import org.jruby.truffle.format.nodes.PackNode;
-import org.jruby.truffle.format.parser.FormatDirective;
+import org.jruby.truffle.format.parser.PrintfTreeBuilder;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.layouts.Layouts;
 import org.jruby.util.ByteList;
@@ -94,15 +94,15 @@ protected ByteList doFormat(Object value, int spacePadding, int zeroPadding) {
 
         builder.append("%");
 
-        if (spacePadding != FormatDirective.DEFAULT) {
+        if (spacePadding != PrintfTreeBuilder.DEFAULT) {
             builder.append(" ");
             builder.append(spacePadding);
 
-            if (zeroPadding != FormatDirective.DEFAULT) {
+            if (zeroPadding != PrintfTreeBuilder.DEFAULT) {
                 builder.append(".");
                 builder.append(zeroPadding);
             }
-        } else if (zeroPadding != FormatDirective.DEFAULT) {
+        } else if (zeroPadding != PrintfTreeBuilder.DEFAULT) {
             builder.append("0");
             builder.append(zeroPadding);
         }

diff --git a/truffle/src/main/java/org/jruby/truffle/format/parser/FormatDirective.java b/truffle/src/main/java/org/jruby/truffle/format/parser/FormatDirective.java