Beginnings of a Rope data structure for strings.

This will be used to hold the text of an individual line, for better
long-line handling.

src/buffer/mod.rs

@@ -12,6 +12,7 @@ use self::undo_stack::Operation::*;
 use string_utils::{is_line_ending, grapheme_count};
 
 pub mod line;
+mod rope;
 mod node;
 mod undo_stack;
 
@@ -28,6 +29,7 @@ pub struct Buffer {
 }
 
 
+
 impl Buffer {
     pub fn new() -> Buffer {
         Buffer {

src/string_utils.rs

@@ -1,6 +1,9 @@
 #![allow(dead_code)]
 //! Misc helpful utility functions for TextBuffer related stuff.
 
+use std::iter::repeat;
+
+
 pub fn is_line_ending(text: &str) -> bool {
     match text {
         "\u{000D}\u{000A}"
@@ -16,10 +19,10 @@ pub fn is_line_ending(text: &str) -> bool {
     }
 }
 
-pub fn newline_count(text: &str) -> usize {
+pub fn line_ending_count(text: &str) -> usize {
     let mut count = 0;
-    for c in text.chars() {
+    for g in text.graphemes(true) {
-        if c == '\n' {
+        if is_line_ending(g) {
             count += 1;
         }
     }
@@ -42,18 +45,18 @@ pub fn grapheme_count(text: &str) -> usize {
     return count;
 }
 
-pub fn char_and_newline_count(text: &str) -> (usize, usize) {
+pub fn grapheme_and_line_ending_count(text: &str) -> (usize, usize) {
-    let mut char_count = 0;
+    let mut grapheme_count = 0;
-    let mut newline_count = 0;
+    let mut line_ending_count = 0;
     
-    for c in text.chars() {
+    for g in text.graphemes(true) {
-        char_count += 1;
+        grapheme_count += 1;
-        if c == '\n' {
+        if is_line_ending(g) {
-            newline_count += 1;
+            line_ending_count += 1;
         }
     }
     
-    return (char_count, newline_count);
+    return (grapheme_count, line_ending_count);
 }
 
 pub fn char_pos_to_byte_pos(text: &str, pos: usize) -> usize {
@@ -88,4 +91,90 @@ pub fn grapheme_pos_to_byte_pos(text: &str, pos: usize) -> usize {
     }
     
     panic!("grapheme_pos_to_byte_pos(): grapheme position off the end of the string.");
+}
+
+/// Inserts the given text into the given string at the given grapheme index.
+pub fn insert_text_at_grapheme_index(s: &mut String, text: &str, pos: usize) {
+    // Find insertion position in bytes
+    let byte_pos = grapheme_pos_to_byte_pos(s.as_slice(), pos);
+    
+    // Get byte vec of string
+    let byte_vec = unsafe { s.as_mut_vec() };
+    
+    // Grow data size        
+    byte_vec.extend(repeat(0).take(text.len()));
+    
+    // Move old bytes forward
+    // TODO: use copy_memory()...?
+    let mut from = byte_vec.len() - text.len();
+    let mut to = byte_vec.len();
+    while from > byte_pos {
+        from -= 1;
+        to -= 1;
+        
+        byte_vec[to] = byte_vec[from];
+    }
+    
+    // Copy new bytes in
+    // TODO: use copy_memory()
+    let mut i = byte_pos;
+    for g in text.graphemes(true) {
+        
+        for b in g.bytes() {
+            byte_vec[i] = b;
+            i += 1
+        }
+    }
+}
+
+/// Removes the text between the given grapheme indices in the given string.
+pub fn remove_text_between_grapheme_indices(s: &mut String, pos_a: usize, pos_b: usize) {
+    // Bounds checks
+    assert!(pos_a <= pos_b, "remove_text_between_grapheme_indices(): pos_a must be less than or equal to pos_b.");
+    
+    if pos_a == pos_b {
+        return;
+    }
+    
+    // Find removal positions in bytes
+    // TODO: get both of these in a single pass
+    let byte_pos_a = grapheme_pos_to_byte_pos(s.as_slice(), pos_a);
+    let byte_pos_b = grapheme_pos_to_byte_pos(s.as_slice(), pos_b);
+    
+    // Get byte vec of string
+    let byte_vec = unsafe { s.as_mut_vec() };
+    
+    // Move bytes to fill in the gap left by the removed bytes
+    let mut from = byte_pos_b;
+    let mut to = byte_pos_a;
+    while from < byte_vec.len() {
+        byte_vec[to] = byte_vec[from];
+        
+        from += 1;
+        to += 1;
+    }
+    
+    // Remove data from the end
+    let final_text_size = byte_vec.len() + byte_pos_a - byte_pos_b;
+    byte_vec.truncate(final_text_size);
+}
+
+/// Splits a string into two strings at the grapheme index given.
+/// The first section of the split is stored in the original string,
+/// while the second section of the split is returned as a new string.
+pub fn split_string_at_grapheme_index(s1: &mut String, pos: usize) -> String {
+    let mut s2 = String::new();
+    
+    // Code block to contain the borrow of s2
+    {
+        let byte_pos = grapheme_pos_to_byte_pos(s1.as_slice(), pos);
+        
+        let byte_vec_1 = unsafe { s1.as_mut_vec() };
+        let byte_vec_2 = unsafe { s2.as_mut_vec() };
+        
+        byte_vec_2.push_all(&byte_vec_1[byte_pos..]);
+        byte_vec_1.truncate(byte_pos);
+    }
+    
+    return s2;
 }