yuqei/difflib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5 from nmlgc/master

Browse Source 
Make SequenceMatcher generic over all slice types
This commit is contained in:
Dima Kudosh
2018-07-22 15:36:05 +03:00
committed by GitHub
parent 1805d9a548 31ea2a244a
commit f035fb8e65
8 changed files with 477 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "difflib"
version = "0.3.1"
version = "0.4.0"
authors = ["Dima Kudosh <dimakudosh@gmail.com>"]
description = "Port of Python's difflib library to Rust."
documentation = "https://github.com/DimaKudosh/difflib/wiki"
README.md
+21 -8
View File
@@ -1,6 +1,6 @@
# Difflib [![Build Status](https://travis-ci.org/DimaKudosh/difflib.svg?branch=master)](https://travis-ci.org/DimaKudosh/difflib)
Port of Python's difflib library to Rust.
Port of Python's difflib library to Rust.
It's provide all necessary tools for comparing word sequences.
## Installation
@@ -8,7 +8,7 @@ Simply add difflib to your dependencies block in Cargo.toml
```rust
[dependencies]
difflib = "0.3.0"
difflib = "0.4.0"
```
## Documentation
@@ -21,20 +21,33 @@ extern crate difflib;
use difflib::differ::Differ;
use difflib::sequencematcher::SequenceMatcher;
fn main() {
// unified_diff
let first_text = "one two three four".split(" ").collect::<Vec<&str>>();
let second_text = "zero one tree four".split(" ").collect::<Vec<&str>>();
let diff = difflib::unified_diff(&first_text, &second_text, "Original", "Current",
"2005-01-26 23:30:50", "2010-04-02 10:20:52", 3);
let diff = difflib::unified_diff(
&first_text,
&second_text,
"Original",
"Current",
"2005-01-26 23:30:50",
"2010-04-02 10:20:52",
3,
);
for line in &diff {
println!("{:?}", line);
}
//context_diff
let diff = difflib::context_diff(&first_text, &second_text, "Original", "Current",
"2005-01-26 23:30:50", "2010-04-02 10:20:52", 3);
let diff = difflib::context_diff(
&first_text,
&second_text,
"Original",
"Current",
"2005-01-26 23:30:50",
"2010-04-02 10:20:52",
3,
);
for line in &diff {
println!("{:?}", line);
}
@@ -62,7 +75,7 @@ fn main() {
let grouped_opcodes = matcher.get_grouped_opcodes(2);
println!("{:?}", grouped_opcodes);
let ratio = matcher.ratio();
println!("{:?}", ratio);
println!("{:?}", ratio);
matcher.set_seqs("aaaaa", "aaaab");
println!("{:?}", matcher.ratio());
}
examples/example.rs
+18 -15
View File
@@ -3,30 +3,33 @@ extern crate difflib;
use difflib::differ::Differ;
use difflib::sequencematcher::SequenceMatcher;
fn main() {
// unified_diff
let first_text = "one two three four".split(" ").collect::<Vec<&str>>();
let second_text = "zero one tree four".split(" ").collect::<Vec<&str>>();
let diff = difflib::unified_diff(&first_text,
&second_text,
"Original",
"Current",
"2005-01-26 23:30:50",
"2010-04-02 10:20:52",
3);
let diff = difflib::unified_diff(
&first_text,
&second_text,
"Original",
"Current",
"2005-01-26 23:30:50",
"2010-04-02 10:20:52",
3,
);
for line in &diff {
println!("{:?}", line);
}
//context_diff
let diff = difflib::context_diff(&first_text,
&second_text,
"Original",
"Current",
"2005-01-26 23:30:50",
"2010-04-02 10:20:52",
3);
let diff = difflib::context_diff(
&first_text,
&second_text,
"Original",
"Current",
"2005-01-26 23:30:50",
"2010-04-02 10:20:52",
3,
);
for line in &diff {
println!("{:?}", line);
}
src/differ.rs
+169 -130
View File
@@ -1,11 +1,11 @@
use sequencematcher::{SequenceMatcher, Sequence};
use utils::{str_with_similar_chars, count_leading};
use sequencematcher::SequenceMatcher;
use std::cmp;
use utils::{count_leading, str_with_similar_chars};
#[derive(Default)]
pub struct Differ {
pub line_junk: Option<fn(&str) -> bool>,
pub char_junk: Option<fn(&str) -> bool>,
pub line_junk: Option<fn(&&str) -> bool>,
pub char_junk: Option<fn(&char) -> bool>,
}
impl Differ {
@@ -16,10 +16,7 @@ impl Differ {
}
}
pub fn compare<T: ?Sized + Sequence>(&self,
first_sequence: &T,
second_sequence: &T)
-> Vec<String> {
pub fn compare(&self, first_sequence: &[&str], second_sequence: &[&str]) -> Vec<String> {
let mut matcher = SequenceMatcher::new(first_sequence, second_sequence);
matcher.set_is_junk(self.line_junk);
let mut res = Vec::new();
@@ -27,12 +24,14 @@ impl Differ {
let mut gen = Vec::new();
match opcode.tag.as_ref() {
"replace" => {
gen = self.fancy_replace(first_sequence,
opcode.first_start,
opcode.first_end,
second_sequence,
opcode.second_start,
opcode.second_end)
gen = self.fancy_replace(
first_sequence,
opcode.first_start,
opcode.first_end,
second_sequence,
opcode.second_start,
opcode.second_end,
)
}
"delete" => {
gen = self.dump("-", first_sequence, opcode.first_start, opcode.first_end)
@@ -52,66 +51,71 @@ impl Differ {
res
}
fn dump<T: ?Sized + Sequence>(&self,
tag: &str,
sequence: &T,
start: usize,
end: usize)
-> Vec<String> {
fn dump(&self, tag: &str, sequence: &[&str], start: usize, end: usize) -> Vec<String> {
let mut res = Vec::new();
for i in start..end {
match sequence.at_index(i) {
Some(s) => res.push(format!("{} {}", tag, s)),
None => {}
if let Some(s) = sequence.get(i) {
res.push(format!("{} {}", tag, s))
}
}
res
}
fn plain_replace<T: ?Sized + Sequence>(&self,
first_sequence: &T,
first_start: usize,
first_end: usize,
second_sequence: &T,
second_start: usize,
second_end: usize)
-> Vec<String> {
fn plain_replace(
&self,
first_sequence: &[&str],
first_start: usize,
first_end: usize,
second_sequence: &[&str],
second_start: usize,
second_end: usize,
) -> Vec<String> {
if !(first_start < first_end && second_start < second_end) {
return Vec::new();
}
let mut first;
let second;
if second_end - second_start < first_end - first_start {
first = self.dump("+", second_sequence, second_start, second_end);
second = self.dump("-", first_sequence, first_start, first_end);
let (mut first, second) = if second_end - second_start < first_end - first_start {
(
self.dump("+", second_sequence, second_start, second_end),
self.dump("-", first_sequence, first_start, first_end),
)
} else {
first = self.dump("-", first_sequence, first_start, first_end);
second = self.dump("+", second_sequence, second_start, second_end);
}
(
self.dump("-", first_sequence, first_start, first_end),
self.dump("+", second_sequence, second_start, second_end),
)
};
for s in second {
first.push(s);
}
first
}
fn fancy_replace<T: ?Sized + Sequence>(&self,
first_sequence: &T,
first_start: usize,
first_end: usize,
second_sequence: &T,
second_start: usize,
second_end: usize)
-> Vec<String> {
fn fancy_replace(
&self,
first_sequence: &[&str],
first_start: usize,
first_end: usize,
second_sequence: &[&str],
second_start: usize,
second_end: usize,
) -> Vec<String> {
let mut res = Vec::new();
let (mut best_ratio, cutoff) = (0.74, 0.75);
let (mut best_i, mut best_j) = (0, 0);
let (mut second_sequence_str, mut first_sequence_str);
let mut eqi: Option<usize> = None;
let mut eqj: Option<usize> = None;
for j in second_start..second_end {
second_sequence_str = second_sequence.at_index(j).unwrap();
for i in first_start..first_end {
first_sequence_str = first_sequence.at_index(i).unwrap();
for (j, second_sequence_str) in second_sequence
.iter()
.enumerate()
.take(second_end)
.skip(second_start)
{
for (i, first_sequence_str) in first_sequence
.iter()
.enumerate()
.take(second_end)
.skip(second_start)
{
if first_sequence_str == second_sequence_str {
if eqi.is_none() {
eqi = Some(i);
@@ -119,7 +123,12 @@ impl Differ {
}
continue;
}
let mut cruncher = SequenceMatcher::new(first_sequence_str, second_sequence_str);
let (first_sequence_chars, second_sequence_chars) = (
first_sequence_str.chars().collect::<Vec<char>>(),
second_sequence_str.chars().collect::<Vec<char>>(),
);
let mut cruncher =
SequenceMatcher::new(&first_sequence_chars, &second_sequence_chars);
cruncher.set_is_junk(self.char_junk);
if cruncher.ratio() > best_ratio {
best_ratio = cruncher.ratio();
@@ -130,14 +139,17 @@ impl Differ {
}
if best_ratio < cutoff {
if eqi.is_none() {
res.extend(self.plain_replace(first_sequence,
first_start,
first_end,
second_sequence,
second_start,
second_end)
.iter()
.cloned());
res.extend(
self.plain_replace(
first_sequence,
first_start,
first_end,
second_sequence,
second_start,
second_end,
).iter()
.cloned(),
);
return res;
}
best_i = eqi.unwrap();
@@ -145,23 +157,30 @@ impl Differ {
} else {
eqi = None;
}
res.extend(self.fancy_helper(first_sequence,
first_start,
best_i,
second_sequence,
second_start,
best_j)
.iter()
.cloned());
let (first_element, second_element) = (first_sequence.at_index(best_i).unwrap(),
second_sequence.at_index(best_j).unwrap());
res.extend(
self.fancy_helper(
first_sequence,
first_start,
best_i,
second_sequence,
second_start,
best_j,
).iter()
.cloned(),
);
let first_element = &first_sequence[best_i];
let second_element = &second_sequence[best_j];
if eqi.is_none() {
let (mut first_tag, mut second_tag) = (String::new(), String::new());
let mut cruncher = SequenceMatcher::new(first_element, second_element);
let first_element_chars: Vec<char> = first_element.chars().collect();
let second_element_chars: Vec<char> = second_element.chars().collect();
let mut cruncher = SequenceMatcher::new(&first_element_chars, &second_element_chars);
cruncher.set_is_junk(self.char_junk);
for opcode in &cruncher.get_opcodes() {
let (first_length, second_length) = (opcode.first_end - opcode.first_start,
opcode.second_end - opcode.second_start);
let (first_length, second_length) = (
opcode.first_end - opcode.first_start,
opcode.second_end - opcode.second_start,
);
match opcode.tag.as_ref() {
"replace" => {
first_tag.push_str(&str_with_similar_chars('^', first_length));
@@ -180,42 +199,50 @@ impl Differ {
_ => {}
}
}
res.extend(self.qformat(&first_element, &second_element, &first_tag, &second_tag)
.iter()
.cloned());
res.extend(
self.qformat(&first_element, &second_element, &first_tag, &second_tag)
.iter()
.cloned(),
);
} else {
let mut s = String::from(" ");
s.push_str(&first_element);
res.push(s);
}
res.extend(self.fancy_helper(first_sequence,
best_i + 1,
first_end,
second_sequence,
best_j + 1,
second_end)
.iter()
.cloned());
res.extend(
self.fancy_helper(
first_sequence,
best_i + 1,
first_end,
second_sequence,
best_j + 1,
second_end,
).iter()
.cloned(),
);
res
}
fn fancy_helper<T: ?Sized + Sequence>(&self,
first_sequence: &T,
first_start: usize,
first_end: usize,
second_sequence: &T,
second_start: usize,
second_end: usize)
-> Vec<String> {
fn fancy_helper(
&self,
first_sequence: &[&str],
first_start: usize,
first_end: usize,
second_sequence: &[&str],
second_start: usize,
second_end: usize,
) -> Vec<String> {
let mut res = Vec::new();
if first_start < first_end {
if second_start < second_end {
res = self.fancy_replace(first_sequence,
first_start,
first_end,
second_sequence,
second_start,
second_end);
res = self.fancy_replace(
first_sequence,
first_start,
first_end,
second_sequence,
second_start,
second_end,
);
} else {
res = self.dump("-", first_sequence, first_start, first_end);
}
@@ -225,49 +252,49 @@ impl Differ {
res
}
fn qformat(&self,
first_line: &str,
second_line: &str,
first_tags: &str,
second_tags: &str)
-> Vec<String> {
fn qformat(
&self,
first_line: &str,
second_line: &str,
first_tags: &str,
second_tags: &str,
) -> Vec<String> {
let mut res = Vec::new();
let mut first_tags = first_tags;
let mut second_tags = second_tags;
let mut common = cmp::min(count_leading(first_line, '\t'),
count_leading(second_line, '\t'));
let mut common = cmp::min(
count_leading(first_line, '\t'),
count_leading(second_line, '\t'),
);
common = cmp::min(common, count_leading(first_tags.split_at(common).0, ' '));
common = cmp::min(common, count_leading(first_tags.split_at(common).0, ' '));
first_tags = first_tags.split_at(common).1.trim_right();
second_tags = second_tags.split_at(common).1.trim_right();
let mut s = String::from(format!("- {}", first_line));
let mut s = format!("- {}", first_line);
res.push(s);
if first_tags != "" {
s = String::from(format!("? {}{}\n", str_with_similar_chars('\t', common), first_tags));
s = format!("? {}{}\n", str_with_similar_chars('\t', common), first_tags);
res.push(s);
}
s = String::from(format!("+ {}", second_line));
s = format!("+ {}", second_line);
res.push(s);
if second_tags != "" {
s = String::from(format!("? {}{}\n",
str_with_similar_chars('\t', common),
second_tags));
s = format!(
"? {}{}\n",
str_with_similar_chars('\t', common),
second_tags
);
res.push(s);
}
res
}
pub fn restore(delta: &Vec<String>, which: usize) -> Vec<String> {
pub fn restore(delta: &[String], which: usize) -> Vec<String> {
if !(which == 1 || which == 2) {
panic!("Second parameter must be 1 or 2");
}
let mut res = Vec::new();
let tag;
if which == 1 {
tag = "- ".to_string();
} else {
tag = "+ ".to_string();
}
let tag = if which == 1 { "- " } else { "+ " }.to_string();
let prefixes = vec![tag, " ".to_string()];
for line in delta {
for prefix in &prefixes {
@@ -283,19 +310,31 @@ impl Differ {
#[test]
fn test_fancy_replace() {
let differ = Differ::new();
let result = differ.fancy_replace(&vec!["abcDefghiJkl\n"], 0, 1, &vec!["abcdefGhijkl\n"], 0, 1)
let result = differ
.fancy_replace(&vec!["abcDefghiJkl\n"], 0, 1, &vec!["abcdefGhijkl\n"], 0, 1)
.join("");
assert_eq!(result,
"- abcDefghiJkl\n? ^ ^ ^\n+ abcdefGhijkl\n? ^ ^ ^\n");
assert_eq!(
result,
"- abcDefghiJkl\n? ^ ^ ^\n+ abcdefGhijkl\n? ^ ^ ^\n"
);
}
#[test]
fn test_qformat() {
let differ = Differ::new();
let result = differ.qformat("\tabcDefghiJkl\n",
"\tabcdefGhijkl\n",
" ^ ^ ^ ",
" ^ ^ ^ ");
assert_eq!(result,
vec!["- \tabcDefghiJkl\n", "? \t ^ ^ ^\n", "+ \tabcdefGhijkl\n", "? \t ^ ^ ^\n"]);
let result = differ.qformat(
"\tabcDefghiJkl\n",
"\tabcdefGhijkl\n",
" ^ ^ ^ ",
" ^ ^ ^ ",
);
assert_eq!(
result,
vec![
"- \tabcDefghiJkl\n",
"? \t ^ ^ ^\n",
"+ \tabcdefGhijkl\n",
"? \t ^ ^ ^\n",
]
);
}
src/lib.rs
+62 -42
View File
@@ -1,18 +1,18 @@
pub mod sequencematcher;
pub mod differ;
pub mod sequencematcher;
mod utils;
use sequencematcher::{Sequence, SequenceMatcher};
use std::collections::HashMap;
use sequencematcher::{SequenceMatcher, Sequence};
use utils::{format_range_unified, format_range_context};
use std::fmt::Display;
use utils::{format_range_context, format_range_unified};
pub fn get_close_matches<'a>(word: &str,
possibilities: Vec<&'a str>,
n: usize,
cutoff: f32)
-> Vec<&'a str> {
pub fn get_close_matches<'a>(
word: &str,
possibilities: Vec<&'a str>,
n: usize,
cutoff: f32,
) -> Vec<&'a str> {
if !(0.0 <= cutoff && cutoff <= 1.0) {
panic!("Cutoff must be greater than 0.0 and lower than 1.0");
}
@@ -30,14 +30,15 @@ pub fn get_close_matches<'a>(word: &str,
res.iter().map(|x| x.1).collect()
}
pub fn unified_diff<T: Sequence>(first_sequence: &T,
second_sequence: &T,
from_file: &str,
to_file: &str,
from_file_date: &str,
to_file_date: &str,
n: usize)
-> Vec<String> {
pub fn unified_diff<T: Sequence + Display>(
first_sequence: &[T],
second_sequence: &[T],
from_file: &str,
to_file: &str,
from_file_date: &str,
to_file_date: &str,
n: usize,
) -> Vec<String> {
let mut res = Vec::new();
let lineterm = '\n';
let mut started = false;
@@ -53,22 +54,37 @@ pub fn unified_diff<T: Sequence>(first_sequence: &T,
let (first, last) = (group.first().unwrap(), group.last().unwrap());
let file1_range = format_range_unified(first.first_start, last.first_end);
let file2_range = format_range_unified(first.second_start, last.second_end);
res.push(format!("@@ -{} +{} @@{}", file1_range, file2_range, lineterm));
res.push(format!(
"@@ -{} +{} @@{}",
file1_range, file2_range, lineterm
));
for code in group {
if code.tag == "equal" {
for i in code.first_start..code.first_end {
res.push(format!(" {}", first_sequence.at_index(i).unwrap()));
for item in first_sequence
.iter()
.take(code.first_end)
.skip(code.first_start)
{
res.push(format!(" {}", item));
}
continue;
}
if code.tag == "replace" || code.tag == "delete" {
for i in code.first_start..code.first_end {
res.push(format!("-{}", first_sequence.at_index(i).unwrap()));
for item in first_sequence
.iter()
.take(code.first_end)
.skip(code.first_start)
{
res.push(format!("-{}", item));
}
}
if code.tag == "replace" || code.tag == "insert" {
for i in code.second_start..code.second_end {
res.push(format!("+{}", second_sequence.at_index(i).unwrap()));
for item in second_sequence
.iter()
.take(code.second_end)
.skip(code.second_start)
{
res.push(format!("+{}", item));
}
}
}
@@ -76,15 +92,15 @@ pub fn unified_diff<T: Sequence>(first_sequence: &T,
res
}
pub fn context_diff<T: Sequence>(first_sequence: &T,
second_sequence: &T,
from_file: &str,
to_file: &str,
from_file_date: &str,
to_file_date: &str,
n: usize)
-> Vec<String> {
pub fn context_diff<T: Sequence + Display>(
first_sequence: &[T],
second_sequence: &[T],
from_file: &str,
to_file: &str,
from_file_date: &str,
to_file_date: &str,
n: usize,
) -> Vec<String> {
let mut res = Vec::new();
let lineterm = '\n';
let mut prefix: HashMap<String, String> = HashMap::new();
@@ -116,10 +132,12 @@ pub fn context_diff<T: Sequence>(first_sequence: &T,
if any {
for opcode in group {
if opcode.tag != "insert" {
for i in opcode.first_start..opcode.first_end {
res.push(format!("{}{}",
prefix.get(&opcode.tag).unwrap(),
first_sequence.at_index(i).unwrap()));
for item in first_sequence
.iter()
.take(opcode.first_end)
.skip(opcode.first_start)
{
res.push(format!("{}{}", &prefix[&opcode.tag], item));
}
}
}
@@ -136,10 +154,12 @@ pub fn context_diff<T: Sequence>(first_sequence: &T,
if any {
for opcode in group {
if opcode.tag != "delete" {
for i in opcode.second_start..opcode.second_end {
res.push(format!("{}{}",
prefix.get(&opcode.tag).unwrap(),
second_sequence.at_index(i).unwrap()));
for item in second_sequence
.iter()
.take(opcode.second_end)
.skip(opcode.second_start)
{
res.push(format!("{}{}", prefix[&opcode.tag], item));
}
}
}
src/sequencematcher.rs
+145 -179
View File
@@ -1,7 +1,7 @@
use std::collections::{HashMap, HashSet};
use std::cmp::{max, min};
use std::collections::HashMap;
use std::hash::Hash;
use utils::calculate_ratio;
use std::fmt::Debug;
#[derive(Debug, Clone, Copy, PartialEq, PartialOrd, Eq, Ord)]
pub struct Match {
@@ -13,9 +13,9 @@ pub struct Match {
impl Match {
fn new(first_start: usize, second_start: usize, size: usize) -> Match {
Match {
first_start: first_start,
second_start: second_start,
size: size,
first_start,
second_start,
size,
}
}
}
@@ -30,123 +30,81 @@ pub struct Opcode {
}
impl Opcode {
fn new(tag: String,
first_start: usize,
first_end: usize,
second_start: usize,
second_end: usize)
-> Opcode {
fn new(
tag: String,
first_start: usize,
first_end: usize,
second_start: usize,
second_end: usize,
) -> Opcode {
Opcode {
tag: tag,
first_start: first_start,
first_end: first_end,
second_start: second_start,
second_end: second_end,
tag,
first_start,
first_end,
second_start,
second_end,
}
}
}
pub trait Sequence: Debug {
fn len(&self) -> usize;
fn at_index(&self, index: usize) -> Option<&str>;
}
pub trait Sequence: Eq + Hash {}
impl<T: Eq + Hash> Sequence for T {}
impl Sequence for str {
fn len(&self) -> usize {
self.len()
}
fn at_index(&self, index: usize) -> Option<&str> {
if index > self.len() {
return None;
}
unsafe { Some(self.slice_unchecked(index, index + 1)) }
}
}
impl<'a> Sequence for Vec<&'a str> {
fn len(&self) -> usize {
self.len()
}
fn at_index(&self, index: usize) -> Option<&str> {
if index < self.len() {
return Some(self[index]);
}
None
}
}
impl Sequence for String {
fn len(&self) -> usize {
self.len()
}
fn at_index(&self, index: usize) -> Option<&str> {
if index > self.len() {
return None;
}
unsafe { Some(self.slice_unchecked(index, index + 1)) }
}
}
impl<'a> Sequence for Vec<String> {
fn len(&self) -> usize {
self.len()
}
fn at_index(&self, index: usize) -> Option<&str> {
if index < self.len() {
return Some(&self[index]);
}
None
}
}
pub struct SequenceMatcher<'a, T: 'a + ?Sized + Sequence> {
first_sequence: &'a T,
second_sequence: &'a T,
pub struct SequenceMatcher<'a, T: 'a + Sequence> {
first_sequence: &'a [T],
second_sequence: &'a [T],
matching_blocks: Option<Vec<Match>>,
opcodes: Option<Vec<Opcode>>,
is_junk: Option<fn(&str) -> bool>,
second_sequence_elements: HashMap<&'a str, Vec<usize>>,
second_sequence_popular: HashSet<&'a str>,
is_junk: Option<fn(&T) -> bool>,
second_sequence_elements: HashMap<&'a T, Vec<usize>>,
}
impl<'a, T: ?Sized + Sequence> SequenceMatcher<'a, T> {
pub fn new(first_sequence: &'a T, second_sequence: &'a T) -> SequenceMatcher<'a, T> {
impl<'a, T: Sequence> SequenceMatcher<'a, T> {
pub fn new<S>(first_sequence: &'a S, second_sequence: &'a S) -> SequenceMatcher<'a, T>
where
S: AsRef<[T]> + ?Sized,
{
let mut matcher = SequenceMatcher {
first_sequence: first_sequence,
second_sequence: second_sequence,
first_sequence: first_sequence.as_ref(),
second_sequence: second_sequence.as_ref(),
matching_blocks: None,
opcodes: None,
is_junk: None,
second_sequence_elements: HashMap::new(),
second_sequence_popular: HashSet::new(),
};
matcher.set_seqs(first_sequence, second_sequence);
matcher
}
pub fn set_is_junk(&mut self, is_junk: Option<fn(&str) -> bool>) {
pub fn set_is_junk(&mut self, is_junk: Option<fn(&T) -> bool>) {
self.is_junk = is_junk;
self.set_second_seq(self.second_sequence);
self.matching_blocks = None;
self.opcodes = None;
self.chain_second_seq();
}
pub fn set_seqs(&mut self, first_sequence: &'a T, second_sequence: &'a T) {
pub fn set_seqs<S>(&mut self, first_sequence: &'a S, second_sequence: &'a S)
where
S: AsRef<[T]> + ?Sized,
{
self.set_first_seq(first_sequence);
self.set_second_seq(second_sequence);
}
pub fn set_first_seq(&mut self, sequence: &'a T) {
self.first_sequence = sequence;
pub fn set_first_seq<S>(&mut self, sequence: &'a S)
where
S: AsRef<[T]> + ?Sized,
{
self.first_sequence = sequence.as_ref();
self.matching_blocks = None;
self.opcodes = None;
}
pub fn set_second_seq(&mut self, sequence: &'a T) {
self.second_sequence = sequence;
pub fn set_second_seq<S>(&mut self, sequence: &'a S)
where
S: AsRef<[T]> + ?Sized,
{
self.second_sequence = sequence.as_ref();
self.matching_blocks = None;
self.opcodes = None;
self.chain_second_seq();
@@ -155,94 +113,88 @@ impl<'a, T: ?Sized + Sequence> SequenceMatcher<'a, T> {
fn chain_second_seq(&mut self) {
let second_sequence = self.second_sequence;
let mut second_sequence_elements = HashMap::new();
for i in 0..second_sequence.len() {
let mut counter = second_sequence_elements.entry(second_sequence.at_index(i).unwrap())
.or_insert(Vec::new());
for (i, item) in second_sequence.iter().enumerate() {
let mut counter = second_sequence_elements
.entry(item)
.or_insert_with(Vec::new);
counter.push(i);
}
if self.is_junk.is_some() {
let mut junk = Vec::new();
for element in second_sequence_elements.keys() {
if (self.is_junk.unwrap())(element) {
junk.push(element.clone());
}
}
for element in &junk {
second_sequence_elements.remove(element);
}
if let Some(junk_func) = self.is_junk {
second_sequence_elements = second_sequence_elements
.into_iter()
.filter(|&(element, _)| !junk_func(element))
.collect();
}
let mut popular = HashSet::new();
// Filter out popular elements
let len = second_sequence.len();
if len >= 200 {
let test_len = (len as f32 / 100.0).floor() as usize + 1;
for (element, indexes) in second_sequence_elements.iter() {
if indexes.len() > test_len {
popular.insert(element.clone());
}
}
for element in &popular {
second_sequence_elements.remove(element);
}
second_sequence_elements = second_sequence_elements
.into_iter()
.filter(|&(_, ref indexes)| indexes.len() > test_len)
.collect();
}
self.second_sequence_elements = second_sequence_elements;
self.second_sequence_popular = popular;
}
pub fn find_longest_match(&self,
first_start: usize,
first_end: usize,
second_start: usize,
second_end: usize)
-> Match {
pub fn find_longest_match(
&self,
first_start: usize,
first_end: usize,
second_start: usize,
second_end: usize,
) -> Match {
let first_sequence = &self.first_sequence;
let second_sequence = &self.second_sequence;
let second_sequence_elements = &self.second_sequence_elements;
let (mut best_i, mut best_j, mut best_size) = (first_start, second_start, 0);
let mut j2len: HashMap<usize, usize> = HashMap::new();
for i in first_start..first_end {
for (i, item) in first_sequence
.iter()
.enumerate()
.take(first_end)
.skip(first_start)
{
let mut new_j2len: HashMap<usize, usize> = HashMap::new();
match second_sequence_elements.get(first_sequence.at_index(i).unwrap()) {
Some(indexes) => {
for j in indexes {
let j = j.clone();
if j < second_start {
continue;
};
if j >= second_end {
break;
};
let mut size = 0;
if j > 0 {
match j2len.get(&(j - 1)) {
Some(k) => {
size = k.clone();
}
None => {}
}
}
size += 1;
new_j2len.insert(j, size);
if size > best_size {
best_i = i + 1 - size;
best_j = j + 1 - size;
best_size = size;
if let Some(indexes) = second_sequence_elements.get(item) {
for j in indexes {
let j = *j;
if j < second_start {
continue;
};
if j >= second_end {
break;
};
let mut size = 0;
if j > 0 {
if let Some(k) = j2len.get(&(j - 1)) {
size = *k;
}
}
size += 1;
new_j2len.insert(j, size);
if size > best_size {
best_i = i + 1 - size;
best_j = j + 1 - size;
best_size = size;
}
}
None => {}
}
j2len = new_j2len;
}
for _ in 0..2 {
while best_i > first_start && best_j > second_start &&
first_sequence.at_index(best_i - 1) == second_sequence.at_index(best_j - 1) {
best_i = best_i - 1;
best_j = best_j - 1;
best_size = best_size + 1;
while best_i > first_start
&& best_j > second_start
&& first_sequence.get(best_i - 1) == second_sequence.get(best_j - 1)
{
best_i -= 1;
best_j -= 1;
best_size += 1;
}
while best_i + best_size < first_end && best_j + best_size < second_end &&
first_sequence.at_index(best_i + best_size) ==
second_sequence.at_index(best_j + best_size) {
while best_i + best_size < first_end
&& best_j + best_size < second_end
&& first_sequence.get(best_i + best_size) == second_sequence.get(best_j + best_size)
{
best_size += 1;
}
}
@@ -266,10 +218,12 @@ impl<'a, T: ?Sized + Sequence> SequenceMatcher<'a, T> {
queue.push((first_start, m.first_start, second_start, m.second_start));
}
if m.first_start + m.size < first_end && m.second_start + m.size < second_end {
queue.push((m.first_start + m.size,
first_end,
m.second_start + m.size,
second_end));
queue.push((
m.first_start + m.size,
first_end,
m.second_start + m.size,
second_end,
));
}
matches.push(m);
}
@@ -319,13 +273,17 @@ impl<'a, T: ?Sized + Sequence> SequenceMatcher<'a, T> {
i = m.first_start + m.size;
j = m.second_start + m.size;
if m.size != 0 {
opcodes.push(
Opcode::new(String::from("equal"), m.first_start, i, m.second_start, j)
);
opcodes.push(Opcode::new(
String::from("equal"),
m.first_start,
i,
m.second_start,
j,
));
}
}
self.opcodes = Some(opcodes);
return self.opcodes.as_ref().unwrap().clone();
self.opcodes.as_ref().unwrap().clone()
}
pub fn get_grouped_opcodes(&mut self, n: usize) -> Vec<Vec<Opcode>> {
@@ -336,12 +294,12 @@ Opcode::new(String::from("equal"), m.first_start, i, m.second_start, j)
}
if codes.first().unwrap().tag == "equal" {
let mut opcode = codes.first_mut().unwrap();
let opcode = codes.first_mut().unwrap();
opcode.first_start = max(opcode.first_start, opcode.first_end.saturating_sub(n));
opcode.second_start = max(opcode.second_start, opcode.second_end.saturating_sub(n));
}
if codes.last().unwrap().tag == "equal" {
let mut opcode = codes.last_mut().unwrap();
let opcode = codes.last_mut().unwrap();
opcode.first_end = min(opcode.first_start + n, opcode.first_end);
opcode.second_end = min(opcode.second_start + n, opcode.second_end);
}
@@ -350,31 +308,39 @@ Opcode::new(String::from("equal"), m.first_start, i, m.second_start, j)
for code in &codes {
let (mut first_start, mut second_start) = (code.first_start, code.second_start);
if code.tag == "equal" && code.first_end - code.first_start > nn {
group.push(Opcode::new(code.tag.clone(),
code.first_start,
min(code.first_end, code.first_start + n),
code.second_start,
min(code.second_end, code.second_start + n)));
group.push(Opcode::new(
code.tag.clone(),
code.first_start,
min(code.first_end, code.first_start + n),
code.second_start,
min(code.second_end, code.second_start + n),
));
res.push(group.clone());
group.clear();
first_start = max(first_start, code.first_end.saturating_sub(n));
second_start = max(second_start, code.second_end.saturating_sub(n));
}
group.push(Opcode::new(code.tag.clone(),
first_start,
code.first_end,
second_start,
code.second_end));
group.push(Opcode::new(
code.tag.clone(),
first_start,
code.first_end,
second_start,
code.second_end,
));
}
if !group.is_empty() && !(group.len() == 1 && group.first().unwrap().tag == "equal") {
if !(group.len() == 1 && group.first().unwrap().tag == "equal") || group.is_empty() {
res.push(group.clone());
}
res
}
pub fn ratio(&mut self) -> f32 {
let matches = self.get_matching_blocks().iter().fold(0, |res, &m| res + m.size);
calculate_ratio(matches,
self.first_sequence.len() + self.second_sequence.len())
let matches = self.get_matching_blocks()
.iter()
.fold(0, |res, &m| res + m.size);
calculate_ratio(
matches,
self.first_sequence.len() + self.second_sequence.len(),
)
}
}
src/utils.rs
+2 -6
View File
@@ -2,10 +2,9 @@ pub fn calculate_ratio(matches: usize, length: usize) -> f32 {
if length != 0 {
return 2.0 * matches as f32 / length as f32;
}
return 1.0;
1.0
}
pub fn str_with_similar_chars(c: char, length: usize) -> String {
let mut s = String::new();
for _ in 0..length {
@@ -14,17 +13,15 @@ pub fn str_with_similar_chars(c: char, length: usize) -> String {
s
}
pub fn count_leading(line: &str, c: char) -> usize {
let (mut i, n) = (0, line.len());
let line: Vec<char> = line.chars().collect();
while (i < n) && line[i] == c {
i += 1;
}
return i;
i
}
pub fn format_range_unified(start: usize, end: usize) -> String {
let mut beginning = start + 1;
let length = end - start;
@@ -37,7 +34,6 @@ pub fn format_range_unified(start: usize, end: usize) -> String {
format!("{},{}", beginning, length)
}
pub fn format_range_context(start: usize, end: usize) -> String {
let mut beginning = start + 1;
let length = end - start;
tests/tests.rs
+59 -30
View File
@@ -1,7 +1,7 @@
extern crate difflib;
use difflib::sequencematcher::{SequenceMatcher, Match, Opcode};
use difflib::differ::Differ;
use difflib::sequencematcher::{Match, Opcode, SequenceMatcher};
#[test]
fn test_longest_match() {
@@ -97,12 +97,14 @@ fn test_differ_compare() {
let second_text = vec!["ore\n", "tree\n", "emu\n"];
let differ = Differ::new();
let result = differ.compare(&first_text, &second_text).join("");
assert_eq!(result,
"- one\n? ^\n+ ore\n? ^\n- two\n- three\n? -\n+ tree\n+ emu\n");
assert_eq!(
result,
"- one\n? ^\n+ ore\n? ^\n- two\n- three\n? -\n+ tree\n+ emu\n"
);
}
fn is_junk_char(ch: &str) -> bool {
if ch == " " || ch == "\t" {
fn is_junk_char(ch: &char) -> bool {
if *ch == ' ' || *ch == '\t' {
return true;
}
false
@@ -115,8 +117,10 @@ fn test_differ_compare_with_func() {
let mut differ = Differ::new();
differ.char_junk = Some(is_junk_char);
let result = differ.compare(&first_text, &second_text).join("");
assert_eq!(result,
"- one\n? ^\n+ ore\n? ^\n- two\n- three\n? -\n+ tree\n+ emu\n");
assert_eq!(
result,
"- one\n? ^\n+ ore\n? ^\n- two\n- three\n? -\n+ tree\n+ emu\n"
);
}
#[test]
@@ -133,33 +137,58 @@ fn test_differ_restore() {
fn test_unified_diff() {
let first_text = "one two three four".split(" ").collect::<Vec<&str>>();
let second_text = "zero one tree four".split(" ").collect::<Vec<&str>>();
let result = difflib::unified_diff(&first_text,
&second_text,
"Original",
"Current",
"2005-01-26 23:30:50",
"2010-04-02 10:20:52",
3)
.join("");
assert_eq!(result,
"--- Original\t2005-01-26 23:30:50\n+++ Current\t2010-04-02 10:20:52\n@@ -1,4 \
+1,4 @@\n+zero one-two-three+tree four");
let result = difflib::unified_diff(
&first_text,
&second_text,
"Original",
"Current",
"2005-01-26 23:30:50",
"2010-04-02 10:20:52",
3,
).join("");
assert_eq!(
result,
"--- Original\t2005-01-26 23:30:50\n+++ Current\t2010-04-02 10:20:52\n@@ -1,4 \
+1,4 @@\n+zero one-two-three+tree four"
);
}
#[test]
fn test_context_diff() {
let first_text = "one two three four".split(" ").collect::<Vec<&str>>();
let second_text = "zero one tree four".split(" ").collect::<Vec<&str>>();
let result = difflib::context_diff(&first_text,
&second_text,
"Original",
"Current",
"2005-01-26 23:30:50",
"2010-04-02 10:20:52",
3)
.join("");
assert_eq!(result,
"*** Original\t2005-01-26 23:30:50\n--- Current\t2010-04-02 \
10:20:52\n***************\n*** 1,4 ****\n one! two! three four--- 1,4 ----\n+ \
zero one! tree four");
let result = difflib::context_diff(
&first_text,
&second_text,
"Original",
"Current",
"2005-01-26 23:30:50",
"2010-04-02 10:20:52",
3,
).join("");
assert_eq!(
result,
"*** Original\t2005-01-26 23:30:50\n--- Current\t2010-04-02 \
10:20:52\n***************\n*** 1,4 ****\n one! two! three four--- 1,4 ----\n+ \
zero one! tree four"
);
}
#[test]
fn test_integer_slice() {
let s1 = vec![1, 2, 3, 4, 5];
let s2 = vec![5, 4, 3, 2, 1];
let result = SequenceMatcher::new(&s1, &s2).get_matching_blocks();
let mut expected_result = Vec::new();
expected_result.push(Match {
first_start: 0,
second_start: 4,
size: 1,
});
expected_result.push(Match {
first_start: 5,
second_start: 5,
size: 0,
});
assert_eq!(result, expected_result);
}