First stab at char indexing of NFG strings.

git-svn-id: https://svn.parrot.org/parrot/branches/strings@36070 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
ashgti · Jan 27, 2009 · 3c3c626 · 3c3c626
1 parent 4164b5b
commit 3c3c626
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/pseudocode/ParrotEncoding/ParrotNative.pm b/pseudocode/ParrotEncoding/ParrotNative.pm
@@ -42,7 +42,20 @@ class ParrotEncoding::ParrotNative {
         # graphemes and graphemes are composed of multiple characters - 
         # this could be improved with caching later but we will 
         # do it the slow stupid way for now 
-        ...
+        my $i = $index;
+        my $grapheme_index = 0;
+        my $c;
+        while ($i >= 0) {
+            my $g = self.grapheme_at_index($str, $grapheme_index++);
+            #say "i is "~$i~" and grapheme is "~$g.perl;
+            for (@( $g )) {
+                #say " Char is "~$_~" and i is "~$i;
+                return $_ if $i == 0;
+                $i--;
+            }
+        }
+        Parrot_debug_string($str);
+        die "char_at_index walked off the end of the string";
     }
 
     method grapheme_at_index($str, $index) {

diff --git a/pseudocode/ParrotString.pm b/pseudocode/ParrotString.pm
@@ -124,8 +124,11 @@ sub Parrot_string_byte_equal($one, $two) {
 sub Parrot_string_character_equal($one, $two) {
     my $l = Parrot_string_length($one);
     return 0 if $l != Parrot_string_length($two);
-    for (0.. $l-1) {
+    for (0.. $l-1) -> $char {
-        return 0 if Parrot_string_index($one, $_) != Parrot_string_index($two, $_);
+        my $savechar = 0 + $char; # Work around rakudo weirdness
+        my $a = Parrot_string_index($one, $char);
+        my $b = Parrot_string_index($two, $savechar);
+        return 0 if $a != $b;
     }
     return 1;
 }