[Truffle] Fixed translating procs with required keyword arguments.

jruby · May 8, 2015 · 3462a65 · eregon · May 9, 2015 · nirvdrum
1 parent 7dd17d2
commit 3462a65
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/spec/truffle/truffle.mspec b/spec/truffle/truffle.mspec
@@ -51,10 +51,7 @@ class MSpecScript
     # "^spec/ruby/core/string/gsub_spec.rb",
 
     # require etc, linux only spec
-    "^spec/ruby/core/io/advise_spec.rb",
-
-    # Problem parsing required kwargs in Proc#parameters
-    "^spec/ruby/core/proc/parameters_spec.rb"
+    "^spec/ruby/core/io/advise_spec.rb"
   ]
 
   core += [

diff --git a/truffle/src/main/java/org/jruby/truffle/translator/LoadArgumentsTranslator.java b/truffle/src/main/java/org/jruby/truffle/translator/LoadArgumentsTranslator.java
@@ -192,7 +192,13 @@ public RubyNode visitKeywordArgNode(org.jruby.ast.KeywordArgNode node) {
 
             if (dAsgnNode.getValueNode() == null) {
                 defaultValue = new NilLiteralNode(context, sourceSection);
-            } else {
+            } else if (dAsgnNode.getValueNode() instanceof RequiredKeywordArgumentValueNode) {
+                /*
+                 * This isn't a true default value - it's a marker to say there isn't one. This actually makes sense;
+                 * the semantic action of executing this node is to report an error, and we do the same thing.
+                 */
+                defaultValue = new MissingKeywordArgumentNode(context, sourceSection, name);
+            }else {
                 defaultValue = dAsgnNode.getValueNode().accept(this);
             }
         } else {