uniname(s) *is* implemented on JVM, psch++

rakudo · Apr 23, 2015 · 45c479a · 45c479a
1 parent 4f54891
commit 45c479a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/src/core/Str.pm b/src/core/Str.pm
@@ -1869,9 +1869,14 @@ sub TRANSPOSE-ONE(Str \string, Str \original, Str \final) {
 
 # These probably belong in a separate unicodey file
 
+proto sub uniname(|) {*}
+multi sub uniname(Str $str) { uniname($str.ord) }
+multi sub uniname(Int $code) { nqp::getuniname($code) }
+
+proto sub uninames(|) {*}
+multi sub uninames(Str $str) { $str.comb.map:{uniname($_.ord)}; }
+
 #?if jvm
-multi sub uniname(|)      { die 'uniname NYI on jvm backend' }
-multi sub uninames(|)     { die 'uniname NYI on jvm backend' }
 multi sub unival(|)       { die 'unival NYI on jvm backend' }
 multi sub univals(|)      { die 'univals NYI on jvm backend' }
 multi sub uniprop(|)      { die 'uniprop NYI on jvm backend' }
@@ -1891,13 +1896,6 @@ sub PVALCODE($prop,$pvalname) {
     %pvalcode{$prop ~ $pvalname} //= nqp::unipvalcode($prop, $pvalname);
 }
 
-proto sub uniname(|) {*}
-multi sub uniname(Str $str) { uniname($str.ord) }
-multi sub uniname(Int $code) { nqp::getuniname($code) }
-
-proto sub uninames(|) {*}
-multi sub uninames(Str $str) { $str.comb.map:{uniname($_.ord)}; }
-
 proto sub uniprop(|) {*}
 multi sub uniprop(Str $str, |c) { uniprop($str.ord, |c) }
 multi sub uniprop(Int $code, Stringy $propname = "GeneralCategory") {

diff --git a/t/spectest.data b/t/spectest.data
@@ -662,7 +662,7 @@ S15-normalization/nfkd-8.t      # moar stress
 S15-normalization/nfkd-9.t      # moar stress
 S15-normalization/nfkd-sanity.t # moar
 S15-string-types/Str.t
-S15-unicode-information/uniname.t           # moar
+S15-unicode-information/uniname.t
 S15-unicode-information/unimatch-general.t	# moar
 S15-unicode-information/unival.t	        # moar
 S16-filehandles/chmod.t