From 5769a65fbce0fb3c91f0ce299c7184f1a81789a5 Mon Sep 17 00:00:00 2001
From: usev6 <use_v6@aglaz.de>
Date: Sun, 2 Oct 2016 22:36:20 +0200
Subject: [PATCH] Fix handling of QAST::Want on JVM

The fix is to look only at those alternatives that have
the selector for the context we are in (I|N|S|v).

I've mainly copied the code from
src/vm/moar/QAST/QASTCompilerMAST.nqp (which works
just fine).
---
 src/vm/jvm/QAST/Compiler.nqp | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/vm/jvm/QAST/Compiler.nqp b/src/vm/jvm/QAST/Compiler.nqp
index 43017937bf..e0b81693c3 100644
--- a/src/vm/jvm/QAST/Compiler.nqp
+++ b/src/vm/jvm/QAST/Compiler.nqp
@@ -3363,16 +3363,22 @@ class QAST::CompilerJAST {
             {*}
         }
     }
-    
-    my %want_char := nqp::hash($RT_INT, 'I', $RT_NUM, 'N', $RT_STR, 'S');
+
     sub want($node, $type) {
-        my @possibles := nqp::clone($node.list);
-        my $best := @possibles.shift;
-        my $char := %want_char{$type};
-        for @possibles -> $sel, $ast {
-            if nqp::chars($char) == 0 || nqp::index($sel, $char) >= 0 {
-                $best := $ast;
-            }
+        my @possibles := $node.list;
+        my $best      := nqp::atpos(@possibles, 0);
+        my $char := $type == $RT_INT  ?? 'I' !!
+                    $type == $RT_NUM  ?? 'N' !!
+                    $type == $RT_STR  ?? 'S' !!
+                                         'v';
+        my int $i := 1;
+        my int $n := nqp::elems(@possibles);
+        while $i < $n {
+            if nqp::index(nqp::atpos(@possibles, $i), $char) >= 0 {
+                $best := nqp::atpos(@possibles, $i + 1);
+                last;
+            }
+            $i := $i + 2;
         }
         $best
     }