Change Actions.nqp to use getstrfromname on MoarVM

Use getstrfromname instead of getcodepointfromname so we can retrieve grapheme clusters and not just single codepoints.
Raku · Jan 11, 2017 · 31b2b51 · 31b2b51
1 parent 3f7c360
commit 31b2b51
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/HLL/Actions.nqp b/src/HLL/Actions.nqp
@@ -203,11 +203,19 @@ class HLL::Actions {
     }
 
     method charname($/) {
-        my $codepoint := $<integer>
-                         ?? $<integer>.made
+#?if !moar
+        my $codepoint := ?? $<integer>.made
                          !! nqp::codepointfromname(~$/);
-        $/.CURSOR.panic("Unrecognized character name $/") if $codepoint < 0;
+                         $/.CURSOR.panic("Unrecognized character name $/") if $codepoint < 0;
         make nqp::chr($codepoint);
+#?endif
+#?if moar
+        my $codepoint := $<integer>
+                         ?? nqp::chr($<integer>.made)
+                         !! nqp::getstrfromname(~$/);
+        $/.CURSOR.panic("Unrecognized character name $/") if $codepoint eq '';
+        make $codepoint;
+#?endif
     }
 
     method charnames($/) {