Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(merge): Cover remaining cases in ordered merge. #7

Merged
merged 3 commits into from
Oct 28, 2023
Merged

feat(merge): Cover remaining cases in ordered merge. #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf8520a
feat(merge): Cover case in which we're adding in a parent
jpedroh Oct 28, 2023
c8a2d8f
feat: Add handling of mutual deletion of nodes in both parents
jpedroh Oct 28, 2023
c86742d
refactor: Simplify entrypoint
jpedroh Oct 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
148 changes: 17 additions & 131 deletions bin/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,3 @@
use matching::ordered_tree_matching;
use merge::merge;
use model::CSTNode;
use parsing::ParserConfiguration;

// fn run_semi_structured_merge_on_revisions<'a>(
// language: model::Language,
// base: &'a str,
// left: &'a str,
// right: &'a str,
// ) -> Result<CSTNode<'a>, &'static str> {
// let parser_configuration = ParserConfiguration::from_language(language);

// let base_tree = parsing::parse_string(base, &parser_configuration)?;
// let left_tree = parsing::parse_string(left, &parser_configuration)?;
// let right_tree = parsing::parse_string(right, &parser_configuration)?;

// let matchings_left_base = ordered_tree_matching(&left_tree, &base_tree);
// let matchings_right_base = ordered_tree_matching(&right_tree, &base_tree);
// let matchings_left_right = ordered_tree_matching(&left_tree, &right_tree);

// Ok(merge(
// &base_tree.clone(),
// &left_tree.clone(),
// &right_tree.clone(),
// &matchings_left_base.clone(),
// &matchings_right_base.clone(),
// &matchings_left_right.clone(),
// ))
// }

fn main() {
let base = r#"
public static interface HelloWorld {
Expand All @@ -38,115 +7,32 @@ fn main() {
let left = r#"
public static interface HelloWorld {
void sayHello(String name);
void sayBye(String name);
}
"#;
let right = r#"
public static interface HelloWorld {
void killAllHumans();
void sayHello(String name);
}
"#;

// let result = run_semi_structured_merge_on_revisions(model::Language::Java, base, left, right);

// println!("{:#?}", pretty_print(result.unwrap()))
}

pub fn pretty_print(node: CSTNode) -> String {
match node {
CSTNode::Terminal { value, .. } => value,
CSTNode::NonTerminal { children, .. } => {
children.iter().fold(String::new(), |acc, current| {
let mut result = acc.to_owned();
result.push_str(" ");
result.push_str(&pretty_print(current.clone()));
result
})
}
CSTNode::Conflict { .. } => "Conflict found".into(),
}
}

// #[cfg(test)]
// mod tests {
// use model::language::Language;
// use model::CSTNode;
// use parsing::ParserConfiguration;

// use crate::run_semi_structured_merge_on_revisions;
let parser_configuration = parsing::ParserConfiguration::from_language(model::Language::Java);

// fn parse_java_string(contents: &str) -> CSTNode {
// parsing::parse_string(contents, ParserConfiguration::from_language(model::Language::Java)).unwrap()
// }
let base_tree = parsing::parse_string(base, &parser_configuration).unwrap();
let left_tree = parsing::parse_string(left, &parser_configuration).unwrap();
let right_tree = parsing::parse_string(right, &parser_configuration).unwrap();

// #[test]
// fn it_merges_three_java_revisions_that_are_equal() {
// let code = r#"
// public static interface HelloWorld {
// void sayHello(String name);
// void sayBye(String name);
// }
// "#;
let matchings_left_base = matching::ordered_tree_matching(&left_tree, &base_tree);
let matchings_right_base = matching::ordered_tree_matching(&right_tree, &base_tree);
let matchings_left_right = matching::ordered_tree_matching(&left_tree, &right_tree);

// let result =
// run_semi_structured_merge_on_revisions(model::Language::Java, code, code, code);
let result = merge::merge(
&base_tree,
&left_tree,
&right_tree,
&matchings_left_base,
&matchings_right_base,
&matchings_left_right,
);

// assert_eq!(parse_java_string(code), result.unwrap())
// }

// #[test]
// fn it_merges_three_java_revisions_that_adds_the_same_node() {
// let base = r#"
// public static interface HelloWorld {
// void sayBye(String name);
// }
// "#;

// let parents = r#"
// public static interface HelloWorld {
// void sayHello(String name);
// void sayBye(String name);
// }
// "#;

// let merge = r#"
// public static interface HelloWorld {
// void sayHello(String name);
// void sayBye(String name);
// }
// "#;

// let result =
// run_semi_structured_merge_on_revisions(model::Language::Java, base, parents, parents);

// assert_eq!(parse_java_string(merge), result.unwrap())
// }

// #[test]
// fn it_merges_three_java_revisions_that_removes_the_same_node() {
// let base = r#"
// public static interface HelloWorld {
// void sayHello(String name);
// void sayBye(String name);
// }
// "#;

// let parents = r#"
// public static interface HelloWorld {
// void sayBye(String name);
// }
// "#;

// let merge = r#"
// public static interface HelloWorld {
// void sayBye(String name);
// }
// "#;

// let result =
// run_semi_structured_merge_on_revisions(model::Language::Java, base, parents, parents);

// assert_eq!(parse_java_string(merge), result.unwrap())
// }
// }
println!("{:#?}", result)
}
Loading
Loading