sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove parent node now we have next sibling

pull/25/head
Wilfred Hughes 2021-06-29 00:09:11 +07:00
parent b7cc38b457
commit 3a4e179b79
3 changed files with 2 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/parse.rs
Unescape Escape View File

@ -1,6 +1,6 @@
use crate::lines::NewlinePositions;
use crate::positions::SingleLineSpan;
use crate::tree_diff::{set_parents, AtomKind, Node};
use crate::tree_diff::{AtomKind, Node};
use regex::Regex;
use rust_embed::RustEmbed;
use std::fs;
@ -161,9 +161,6 @@ pub fn parse_lines<'a>(arena: &'a Arena<Node<'a>>, s: &str) -> Vec<&'a Node<'a>>
pub fn parse<'a>(arena: &'a Arena<Node<'a>>, s: &str, lang: &Language) -> Vec<&'a Node<'a>> {
let nl_pos = NewlinePositions::from(s);
let nodes = parse_from(arena, s, &nl_pos, lang, &mut ParseState::new());
for node in &nodes {
set_parents(node);
}
nodes
}
@ -831,7 +828,6 @@ mod tests {
let expected_rhs = vec![
Atom {
next: Cell::new(None),
parent: Cell::new(None),
position: vec![SingleLineSpan {
line: 0.into(),
start_col: 0,
@ -843,7 +839,6 @@ mod tests {
},
Atom {
next: Cell::new(None),
parent: Cell::new(None),
position: vec![SingleLineSpan {
line: 0.into(),
start_col: 2,
@ -869,7 +864,6 @@ mod tests {
let expected_rhs = vec![
Atom {
next: Cell::new(None),
parent: Cell::new(None),
position: vec![SingleLineSpan {
line: 0.into(),
start_col: 0,
@ -881,7 +875,6 @@ mod tests {
},
Atom {
next: Cell::new(None),
parent: Cell::new(None),
position: vec![SingleLineSpan {
line: 0.into(),
start_col: 2,
@ -893,7 +886,6 @@ mod tests {
},
Atom {
next: Cell::new(None),
parent: Cell::new(None),
position: vec![SingleLineSpan {
line: 0.into(),
start_col: 4,
@ -919,7 +911,6 @@ mod tests {
let expected_lhs = vec![
Atom {
next: Cell::new(None),
parent: Cell::new(None),
position: vec![SingleLineSpan {
line: 0.into(),
start_col: 0,
@ -931,7 +922,6 @@ mod tests {
},
Atom {
next: Cell::new(None),
parent: Cell::new(None),
position: vec![SingleLineSpan {
line: 0.into(),
start_col: 2,
@ -947,7 +937,6 @@ mod tests {
let expected_rhs = vec![
Atom {
next: Cell::new(None),
parent: Cell::new(None),
position: vec![SingleLineSpan {
line: 0.into(),
start_col: 0,
@ -959,7 +948,6 @@ mod tests {
},
Atom {
next: Cell::new(None),
parent: Cell::new(None),
position: vec![SingleLineSpan {
line: 0.into(),
start_col: 2,
@ -985,7 +973,6 @@ mod tests {
let expected_rhs = vec![
Atom {
next: Cell::new(None),
parent: Cell::new(None),
position: vec![SingleLineSpan {
line: 0.into(),
start_col: 0,
@ -997,7 +984,6 @@ mod tests {
},
Atom {
next: Cell::new(None),
parent: Cell::new(None),
position: vec![SingleLineSpan {
line: 0.into(),
start_col: 2,
@ -1027,7 +1013,6 @@ mod tests {
let expected_rhs: Vec<&Node> = vec![arena.alloc(List {
next: Cell::new(None),
parent: Cell::new(None),
change: Cell::new(Some(Unchanged(lhs[0]))),
open_position: vec![SingleLineSpan {
line: 0.into(),
@ -1044,7 +1029,6 @@ mod tests {
children: vec![
arena.alloc(Atom {
next: Cell::new(None),
parent: Cell::new(None),
position: vec![SingleLineSpan {
line: 0.into(),
start_col: 1,
@ -1056,7 +1040,6 @@ mod tests {
}),
arena.alloc(Atom {
next: Cell::new(None),
parent: Cell::new(None),
position: vec![SingleLineSpan {
line: 0.into(),
start_col: 3,
@ -1088,7 +1071,6 @@ mod tests {
let expected_rhs: Vec<&Node> = vec![arena.alloc(List {
next: Cell::new(None),
parent: Cell::new(None),
change: Cell::new(Some(Unchanged(lhs[0]))),
open_position: vec![SingleLineSpan {
line: 0.into(),
@ -1104,7 +1086,6 @@ mod tests {
close_delimiter: "]".into(),
children: vec![arena.alloc(Atom {
next: Cell::new(None),
parent: Cell::new(None),
position: vec![SingleLineSpan {
line: 0.into(),
start_col: 1,
@ -1137,7 +1118,6 @@ mod tests {
let expected_rhs: Vec<&Node> = vec![
arena.alloc(List {
next: Cell::new(None),
parent: Cell::new(None),
open_delimiter: "[".into(),
open_position: vec![SingleLineSpan {
line: 0.into(),
@ -1153,7 +1133,6 @@ mod tests {
change: Cell::new(Some(Unchanged(lhs[0]))),
children: vec![arena.alloc(List {
next: Cell::new(None),
parent: Cell::new(None),
change: Cell::new(Some(Moved)),
open_delimiter: "[".into(),
open_position: vec![SingleLineSpan {
@ -1169,7 +1148,6 @@ mod tests {
close_delimiter: "]".into(),
children: vec![arena.alloc(Atom {
next: Cell::new(None),
parent: Cell::new(None),
position: vec![SingleLineSpan {
line: 0.into(),
start_col: 2,
@ -1185,7 +1163,6 @@ mod tests {
}),
arena.alloc(Atom {
next: Cell::new(None),
parent: Cell::new(None),
position: vec![SingleLineSpan {
line: 0.into(),
start_col: 6,
@ -1217,7 +1194,6 @@ mod tests {
let expected_rhs: Vec<&Node> = vec![
arena.alloc(Atom {
next: Cell::new(None),
parent: Cell::new(None),
position: vec![SingleLineSpan {
line: 0.into(),
start_col: 0,
@ -1229,7 +1205,6 @@ mod tests {
}),
arena.alloc(List {
next: Cell::new(None),
parent: Cell::new(None),
open_delimiter: "[".into(),
open_position: vec![SingleLineSpan {
line: 0.into(),
@ -1245,7 +1220,6 @@ mod tests {
change: Cell::new(Some(Novel)),
children: vec![arena.alloc(List {
next: Cell::new(None),
parent: Cell::new(None),
change: Cell::new(Some(Moved)),
open_position: vec![SingleLineSpan {
line: 0.into(),
@ -1261,7 +1235,6 @@ mod tests {
close_delimiter: "]".into(),
children: vec![arena.alloc(Atom {
next: Cell::new(None),
parent: Cell::new(None),
position: vec![SingleLineSpan {
line: 0.into(),
start_col: 4,

37
src/tree_diff.rs
Unescape Escape View File

@ -46,7 +46,6 @@ pub enum AtomKind {
#[derive(Debug)]
pub enum Node<'a> {
List {
parent: Cell<Option<&'a Node<'a>>>,
next: Cell<Option<&'a Node<'a>>>,
change: Cell<Option<ChangeKind<'a>>>,
open_position: Vec<SingleLineSpan>,
@ -57,7 +56,6 @@ pub enum Node<'a> {
num_descendants: usize,
},
Atom {
parent: Cell<Option<&'a Node<'a>>>,
next: Cell<Option<&'a Node<'a>>>,
change: Cell<Option<ChangeKind<'a>>>,
position: Vec<SingleLineSpan>,
@ -87,7 +85,6 @@ impl<'a> Node<'a> {
}
arena.alloc(List {
parent: Cell::new(None),
next: Cell::new(None),
change: Cell::new(None),
open_position,
@ -107,7 +104,6 @@ impl<'a> Node<'a> {
kind: AtomKind,
) -> &'a mut Node<'a> {
arena.alloc(Atom {
parent: Cell::new(None),
next: Cell::new(None),
position,
content: content.into(),
@ -116,13 +112,6 @@ impl<'a> Node<'a> {
})
}
pub fn get_parent(&self) -> Option<&'a Node<'a>> {
match self {
List { parent, .. } => parent.get(),
Atom { parent, .. } => parent.get(),
}
}
pub fn get_next(&self) -> Option<&'a Node<'a>> {
match self {
List { next, .. } => next.get(),
@ -171,34 +160,13 @@ impl<'a> Node<'a> {
}
}
pub fn set_parents<'a>(node: &'a Node<'a>) {
set_parents_(node, None);
}
fn set_parents_<'a>(node: &'a Node<'a>, new_parent: Option<&'a Node<'a>>) {
match node {
List {
parent, children, ..
} => {
parent.set(new_parent);
for child in children {
set_parents_(child, Some(node));
}
}
Atom { .. } => {}
}
}
pub fn set_next<'a>(node: &'a Node<'a>) {
set_next_(node, None);
}
fn set_next_<'a>(node: &'a Node<'a>, new_next: Option<&'a Node<'a>>) {
match node {
List {
next, children, ..
} => {
List { next, children, .. } => {
next.set(new_next);
for (i, child) in children.iter().enumerate() {
let child_next = match children.get(i + 1) {
@ -743,7 +711,6 @@ mod tests {
#[test]
fn test_prev_opposite_pos_first_node() {
let nodes = &[&Atom {
parent: Cell::new(None),
next: Cell::new(None),
change: Cell::new(Some(Novel)),
position: vec![SingleLineSpan {
@ -770,7 +737,6 @@ mod tests {
assert_eq!(
Atom {
next: Cell::new(None),
parent: Cell::new(None),
change: Cell::new(Some(Novel)),
position: vec![SingleLineSpan {
line: 1.into(),
@ -782,7 +748,6 @@ mod tests {
},
Atom {
next: Cell::new(None),
parent: Cell::new(None),
change: Cell::new(None),
position: vec![SingleLineSpan {
line: 10.into(),

2
src/ucs.rs
Unescape Escape View File

@ -285,7 +285,6 @@ mod tests {
let lhs = arena.alloc(Atom {
next: Cell::new(None),
parent: Cell::new(None),
position: vec![SingleLineSpan {
line: 0.into(),
start_col: 0,
@ -299,7 +298,6 @@ mod tests {
// Same as LHS, but with a different position.
let rhs = arena.alloc(Atom {
next: Cell::new(None),
parent: Cell::new(None),
position: vec![SingleLineSpan {
line: 1.into(),
start_col: 2,