refactor: Delegate unordered children declaration into language

jpedroh · Dec 6, 2023 · 2966170 · 2966170
1 parent 2e0b35e
commit 2966170
Show file tree

Hide file tree

Showing 8 changed files with 194 additions and 11 deletions.
diff --git a/matching/src/lib.rs b/matching/src/lib.rs
@@ -20,8 +20,7 @@ pub fn calculate_matchings<'a>(
             model::CSTNode::NonTerminal(non_terminal_left),
             model::CSTNode::NonTerminal(non_terminal_right),
         ) => {
-            if non_terminal_left.are_children_unordered()
-                && non_terminal_right.are_children_unordered()
+            if non_terminal_left.are_children_unordered && non_terminal_right.are_children_unordered
             {
                 unordered_tree_matching::unordered_tree_matching(left, right)
             } else {

diff --git a/matching/src/ordered_tree_matching.rs b/matching/src/ordered_tree_matching.rs
@@ -114,12 +114,14 @@ mod tests {
         });
         let left = CSTNode::NonTerminal(NonTerminal {
             kind: "kind_a",
+            are_children_unordered: false,
             start_position: Point { row: 0, column: 0 },
             end_position: Point { row: 1, column: 7 },
             children: vec![child.clone()],
         });
         let right = CSTNode::NonTerminal(NonTerminal {
             kind: "kind_a",
+            are_children_unordered: false,
             start_position: Point { row: 0, column: 0 },
             end_position: Point { row: 1, column: 7 },
             children: vec![child.clone()],
@@ -150,12 +152,14 @@ mod tests {
 
         let left = CSTNode::NonTerminal(NonTerminal {
             kind: "kind_a",
+            are_children_unordered: false,
             children: vec![left_child.clone()],
             start_position: Point { row: 1, column: 0 },
             end_position: Point { row: 0, column: 7 },
         });
         let right = CSTNode::NonTerminal(NonTerminal {
             kind: "kind_a",
+            are_children_unordered: false,
             children: vec![right_child.clone()],
             start_position: Point { row: 1, column: 0 },
             end_position: Point { row: 0, column: 7 },
@@ -186,12 +190,14 @@ mod tests {
 
         let left = CSTNode::NonTerminal(NonTerminal {
             kind: "kind_a",
+            are_children_unordered: false,
             start_position: Point { row: 0, column: 0 },
             end_position: Point { row: 0, column: 7 },
             children: vec![common_child.clone()],
         });
         let right = CSTNode::NonTerminal(NonTerminal {
             kind: "kind_a",
+            are_children_unordered: false,
             start_position: Point { row: 0, column: 0 },
             end_position: Point { row: 0, column: 7 },
             children: vec![common_child.clone(), unique_right_child],
@@ -216,12 +222,14 @@ mod tests {
 
         let left = CSTNode::NonTerminal(NonTerminal {
             kind: "kind_a",
+            are_children_unordered: false,
             start_position: Point { row: 0, column: 0 },
             end_position: Point { row: 0, column: 7 },
             children: vec![common_child.clone()],
         });
         let right = CSTNode::NonTerminal(NonTerminal {
             kind: "kind_a",
+            are_children_unordered: false,
             start_position: Point { row: 0, column: 0 },
             end_position: Point { row: 0, column: 7 },
             children: vec![common_child.clone()],
@@ -246,19 +254,22 @@ mod tests {
 
         let intermediate = CSTNode::NonTerminal(NonTerminal {
             kind: "intermediate",
+            are_children_unordered: false,
             start_position: Point { row: 0, column: 0 },
             end_position: Point { row: 0, column: 7 },
             children: vec![leaf],
         });
 
         let left = CSTNode::NonTerminal(NonTerminal {
             kind: "kind_a",
+            are_children_unordered: false,
             start_position: Point { row: 0, column: 0 },
             end_position: Point { row: 0, column: 7 },
             children: vec![intermediate.clone()],
         });
         let right = CSTNode::NonTerminal(NonTerminal {
             kind: "kind_a",
+            are_children_unordered: false,
             start_position: Point { row: 0, column: 0 },
             end_position: Point { row: 0, column: 7 },
             children: vec![intermediate.clone()],

diff --git a/merge/src/merge.rs b/merge/src/merge.rs
@@ -50,8 +50,7 @@ pub fn merge<'a>(
             CSTNode::NonTerminal(non_terminal_left),
             CSTNode::NonTerminal(non_terminal_right),
         ) => {
-            if non_terminal_left.are_children_unordered()
-                && non_terminal_right.are_children_unordered()
+            if non_terminal_left.are_children_unordered && non_terminal_right.are_children_unordered
             {
                 unordered_merge(
                     base,
@@ -242,6 +241,7 @@ mod tests {
             }),
             &CSTNode::NonTerminal(NonTerminal {
                 kind: "kind",
+                are_children_unordered: false,
                 start_position: Point { row: 0, column: 0 },
                 end_position: Point { row: 0, column: 7 },
                 children: vec![],