refactor

Author: myfreess

matching/matching.mbt

@@ -93,14 +93,16 @@ fn match_expr_placeholder(
   if pattern.kind != Expr_Ident {
     return None
   }
-  guard expr_ident_name(pattern) is Some(name) else { return None }
+  guard pattern.normalized_expr_identifier_name() is Some(name) else {
+    return None
+  }
   if is_ignore_placeholder(name) {
     Some(true)
   } else if is_special_expr_metavar(compiled, name) ||
     contains_name(compiled.expr_metavars, name) {
     Some(bind_value(bindings, name, candidate))
   } else if contains_name(compiled.identifier_metavars, name) {
-    match normalize_expr(candidate) {
+    match candidate.normalized_expr_identifier_name() {
       Some(candidate_name) =>
         Some(
           bind_value(bindings, name, string_binding(candidate_name, candidate)),
@@ -127,13 +129,15 @@ fn match_pattern_placeholder(
   if pattern.kind != Pattern_Var {
     return None
   }
-  guard pattern_var_name(pattern) is Some(name) else { return None }
+  guard pattern.normalized_pattern_identifier_name() is Some(name) else {
+    return None
+  }
   if parse_pattern_metavar_name(name) is Some(meta_name) {
     Some(bind_value(bindings, meta_name, candidate))
   } else if is_ignore_placeholder(name) {
     Some(true)
   } else if contains_name(compiled.identifier_metavars, name) {
-    match normalize_pattern(candidate) {
+    match candidate.normalized_pattern_identifier_name() {
       Some(candidate_name) =>
         Some(
           bind_value(bindings, name, string_binding(candidate_name, candidate)),
@@ -239,7 +243,7 @@ fn match_long_ident(
       guard leaf_string_child(pattern, "value") is Some(pattern_name) else {
         return false
       }
-      guard normalized_long_ident(candidate) is Some(candidate_name) else {
+      guard candidate.normalized_long_ident() is Some(candidate_name) else {
         return false
       }
       match_identifier_name(
@@ -262,7 +266,7 @@ fn match_long_ident(
       guard leaf_string_child(candidate, "id") is Some(candidate_id) else {
         return false
       }
-      guard normalized_long_ident(candidate) is Some(bound_candidate) else {
+      guard candidate.normalized_long_ident() is Some(bound_candidate) else {
         return false
       }
       pattern_pkg == candidate_pkg &&
@@ -284,7 +288,7 @@ fn match_binder(
   if candidate.kind != Binder {
     return false
   }
-  match (binder_name(pattern), binder_name(candidate)) {
+  match (pattern.normalized_binder_name(), candidate.normalized_binder_name()) {
     (Some(pattern_name), Some(candidate_name)) =>
       match_identifier_name(
         pattern_name, candidate_name, candidate_name, candidate, compiled, bindings,
@@ -303,7 +307,7 @@ fn match_label(
   if candidate.kind != Label {
     return false
   }
-  match (label_name(pattern), label_name(candidate)) {
+  match (pattern.normalized_label_name(), candidate.normalized_label_name()) {
     (Some(pattern_name), Some(candidate_name)) =>
       match_identifier_name(
         pattern_name, candidate_name, candidate_name, candidate, compiled, bindings,
@@ -525,25 +529,6 @@ fn leaf_bool_child(node : @untyped_ast.Node, name : String) -> Bool? {
   }
 }
 
-///|
-fn first_child(node : @untyped_ast.Node) -> @untyped_ast.Node? {
-  if node.children.length() == 0 {
-    None
-  } else {
-    let (_, value) = node.children[0]
-    Some(value)
-  }
-}
-
-///|
-fn expr_ident_name(node : @untyped_ast.Node) -> String? {
-  if child(node, "id") is Some(var_node) {
-    normalize_var(var_node)
-  } else {
-    None
-  }
-}
-
 ///|
 fn expr_constant(node : @untyped_ast.Node) -> @untyped_ast.Node? {
   if node.kind == Expr_Constant {
@@ -562,77 +547,6 @@ fn pattern_constant(node : @untyped_ast.Node) -> @untyped_ast.Node? {
   }
 }
 
-///|
-fn pattern_var_name(node : @untyped_ast.Node) -> String? {
-  if first_child(node) is Some(binder) {
-    binder_name(binder)
-  } else {
-    None
-  }
-}
-
-///|
-fn normalize_expr(node : @untyped_ast.Node) -> String? {
-  if node.kind == Expr_Ident {
-    expr_ident_name(node)
-  } else {
-    None
-  }
-}
-
-///|
-fn normalize_pattern(node : @untyped_ast.Node) -> String? {
-  if node.kind == Pattern_Var {
-    pattern_var_name(node)
-  } else {
-    None
-  }
-}
-
-///|
-fn normalize_var(node : @untyped_ast.Node) -> String? {
-  if node.kind == Var {
-    if child(node, "name") is Some(name) {
-      normalized_long_ident(name)
-    } else {
-      None
-    }
-  } else {
-    None
-  }
-}
-
-///|
-fn normalized_long_ident(node : @untyped_ast.Node) -> String? {
-  match node.kind {
-    LongIdent_Ident => leaf_string_child(node, "value")
-    LongIdent_Dot =>
-      match (leaf_string_child(node, "pkg"), leaf_string_child(node, "id")) {
-        (Some(pkg), Some(id)) => Some("@\{pkg}.\{id}")
-        _ => None
-      }
-    _ => None
-  }
-}
-
-///|
-fn binder_name(node : @untyped_ast.Node) -> String? {
-  if node.kind == Binder {
-    leaf_string_child(node, "name")
-  } else {
-    None
-  }
-}
-
-///|
-fn label_name(node : @untyped_ast.Node) -> String? {
-  if node.kind == Label {
-    leaf_string_child(node, "name")
-  } else {
-    None
-  }
-}
-
 ///|
 fn constructor_name(node : @untyped_ast.Node) -> String? {
   guard child(node, "name") is Some(name_node) else { return None }
@@ -677,7 +591,7 @@ fn normalized_constructor(constr : @untyped_ast.Node) -> String {
 ///|
 fn normalized_type_name(type_name : @untyped_ast.Node) -> String {
   let name = if child(type_name, "name") is Some(long_ident) {
-    normalized_long_ident(long_ident).unwrap_or("")
+    long_ident.normalized_long_ident().unwrap_or("")
   } else {
     ""
   }

rule/apply/ast_bucket.mbt

@@ -109,7 +109,7 @@ fn compiled_pattern_root_key(
 ) -> @untyped_ast.NodeKind? {
   let compiled = pattern.compiled
   if compiled.ast.kind == Expr_Ident {
-    if ast_bucket_expr_ident_name(compiled.ast) is Some(name) {
+    if compiled.ast.normalized_expr_identifier_name() is Some(name) {
       if compiled_root_ident_key(compiled, name) is Some(key) {
         key
       } else {
@@ -206,58 +206,6 @@ fn keyed_patterns_for_key(
   None
 }
 
-///|
-fn ast_bucket_child(
-  node : @untyped_ast.Node,
-  name : String,
-) -> @untyped_ast.Node? {
-  for entry in node.children {
-    let (child_name, value) = entry
-    if child_name == Some(name) {
-      return Some(value)
-    }
-  }
-  None
-}
-
-///|
-fn ast_bucket_leaf_string(node : @untyped_ast.Node) -> String? {
-  match node.kind {
-    Leaf(PString(value)) => Some(value)
-    _ => None
-  }
-}
-
-///|
-fn ast_bucket_expr_ident_name(node : @untyped_ast.Node) -> String? {
-  guard ast_bucket_child(node, "id") is Some(var_node) else { return None }
-  guard ast_bucket_child(var_node, "name") is Some(long_ident) else {
-    return None
-  }
-  match long_ident.kind {
-    LongIdent_Ident =>
-      if ast_bucket_child(long_ident, "value") is Some(value) {
-        ast_bucket_leaf_string(value)
-      } else {
-        None
-      }
-    LongIdent_Dot =>
-      match
-        (
-          ast_bucket_child(long_ident, "pkg"),
-          ast_bucket_child(long_ident, "id"),
-        ) {
-        (Some(pkg), Some(id)) =>
-          match (ast_bucket_leaf_string(pkg), ast_bucket_leaf_string(id)) {
-            (Some(pkg), Some(id)) => Some("@\{pkg}.\{id}")
-            _ => None
-          }
-        _ => None
-      }
-    _ => None
-  }
-}
-
 ///|
 // Merges two already-sorted buckets without reordering pattern priority.
 fn merge_indexed_patterns(

rule/prefilter/prefilter.mbt

@@ -166,7 +166,7 @@ fn collect_node_literals(
 ) -> Unit {
   match node.kind {
     Var =>
-      if prefilter_normalize_var(node) is Some(name) {
+      if node.normalized_var_name() is Some(name) {
         if !is_filter_placeholder(name, compiled) {
           push_literal(literals, name)
         }
@@ -286,24 +286,6 @@ fn prefilter_first_leaf_bool(node : @untyped_ast.Node) -> Bool? {
   }
 }
 
-///|
-fn prefilter_normalize_var(node : @untyped_ast.Node) -> String? {
-  guard prefilter_child(node, "name") is Some(long_ident) else { return None }
-  match long_ident.kind {
-    LongIdent_Ident => prefilter_leaf_string_child(long_ident, "value")
-    LongIdent_Dot =>
-      match
-        (
-          prefilter_leaf_string_child(long_ident, "pkg"),
-          prefilter_leaf_string_child(long_ident, "id"),
-        ) {
-        (Some(pkg), Some(id)) => Some("@\{pkg}.\{id}")
-        _ => None
-      }
-    _ => None
-  }
-}
-
 ///|
 fn is_filter_placeholder(
   name : String,

untyped_ast/normalize.mbt

@@ -0,0 +1,87 @@
+///|
+pub fn Node::normalized_long_ident(self : Node) -> String? {
+  match self.kind {
+    LongIdent_Ident => normalize_leaf_string_child(self, "value")
+    LongIdent_Dot =>
+      match
+        (
+          normalize_leaf_string_child(self, "pkg"),
+          normalize_leaf_string_child(self, "id"),
+        ) {
+        (Some(pkg), Some(id)) => Some("@\{pkg}.\{id}")
+        _ => None
+      }
+    _ => None
+  }
+}
+
+///|
+pub fn Node::normalized_var_name(self : Node) -> String? {
+  guard self.kind == Var else { return None }
+  guard normalize_child(self, "name") is Some(name) else { return None }
+  name.normalized_long_ident()
+}
+
+///|
+pub fn Node::normalized_binder_name(self : Node) -> String? {
+  guard self.kind == Binder else { return None }
+  normalize_leaf_string_child(self, "name")
+}
+
+///|
+pub fn Node::normalized_label_name(self : Node) -> String? {
+  guard self.kind == Label else { return None }
+  normalize_leaf_string_child(self, "name")
+}
+
+///|
+pub fn Node::normalized_expr_identifier_name(self : Node) -> String? {
+  guard self.kind == Expr_Ident else { return None }
+  guard normalize_child(self, "id") is Some(var_node) else { return None }
+  var_node.normalized_var_name()
+}
+
+///|
+pub fn Node::normalized_pattern_identifier_name(self : Node) -> String? {
+  guard self.kind == Pattern_Var else { return None }
+  guard normalize_first_child(self) is Some(binder) else { return None }
+  binder.normalized_binder_name()
+}
+
+///|
+fn normalize_child(node : Node, name : String) -> Node? {
+  for entry in node.children {
+    let (child_name, value) = entry
+    if child_name == Some(name) {
+      return Some(value)
+    }
+  }
+  None
+}
+
+///|
+fn normalize_leaf_string(node : Node) -> String? {
+  match node.kind {
+    Leaf(PString(value)) => Some(value)
+    _ => None
+  }
+}
+
+///|
+fn normalize_leaf_string_child(node : Node, name : String) -> String? {
+  if normalize_child(node, name) is Some(value) {
+    normalize_leaf_string(value)
+  } else {
+    None
+  }
+}
+
+///|
+fn normalize_first_child(node : Node) -> Node? {
+  if node.children.length() == 0 {
+    None
+  } else {
+    let (_, value) = node.children[0]
+    Some(value)
+  }
+}

untyped_ast/pkg.generated.mbti

@@ -32,6 +32,12 @@ pub(all) struct Node {
   children : FixedArray[(String?, Node)]
 } derive(@debug.Debug)
 pub fn Node::contains_unshadowed(Self, id~ : String) -> Bool
+pub fn Node::normalized_binder_name(Self) -> String?
+pub fn Node::normalized_expr_identifier_name(Self) -> String?
+pub fn Node::normalized_label_name(Self) -> String?
+pub fn Node::normalized_long_ident(Self) -> String?
+pub fn Node::normalized_pattern_identifier_name(Self) -> String?
+pub fn Node::normalized_var_name(Self) -> String?
 pub fn Node::to_json(Self) -> Json
 pub impl ToJson for Node