rename API

Author: myfreess

query/cstyle_simple_forloop_test.mbt

@@ -18,25 +18,25 @@ test "query can emulate cstyle forward simple forloop patterns-not by iterating
     #|for $(counter:id) = $(start:exp); $(counter:id) < $(limit:exp); $(counter:id) = $(counter:id) + 1 {
     #|  $(body:exp)
     #|}
-  let matches = ExprQuery::ExprQuery(pattern).matches_all(
+  let captures = ExprQuery::ExprQuery(pattern).captures(
     source_name="sample.mbt",
     source,
   )
-  assert_eq(matches.length(), 3)
-  let filtered : Array[Map[String, @untyped_ast.Node]] = []
-  for captures in matches {
-    if captures.get("counter") is Some(counter_node) &&
+  assert_eq(captures.length(), 3)
+  let filtered_capture_maps : Array[Map[String, @untyped_ast.Node]] = []
+  for capture in captures {
+    if capture.get("counter") is Some(counter_node) &&
       counter_node.kind is Leaf(PString(counter_name)) &&
-      captures.get("body") is Some(body) {
+      capture.get("body") is Some(body) {
       // unused variable in for loop body
       if !body.contains_unshadowed(id=counter_name) {
-        filtered.push(captures)
+        filtered_capture_maps.push(capture)
       }
     }
   }
-  assert_eq(filtered.length(), 2)
+  assert_eq(filtered_capture_maps.length(), 2)
   debug_inspect(
-    filtered[0].get("counter").unwrap(),
+    filtered_capture_maps[0].get("counter").unwrap(),
     content=(
       #|{
       #|  kind: Leaf(PString("i")),
@@ -49,7 +49,7 @@ test "query can emulate cstyle forward simple forloop patterns-not by iterating
     ),
   )
   debug_inspect(
-    filtered[1].get("counter").unwrap(),
+    filtered_capture_maps[1].get("counter").unwrap(),
     content=(
       #|{
       #|  kind: Leaf(PString("k")),

query/pkg.generated.mbti

@@ -12,7 +12,7 @@ import {
 // Types and methods
 type ExprQuery
 pub fn ExprQuery::ExprQuery(String) -> Self raise
-pub fn ExprQuery::matches_all(Self, source_name~ : String, String) -> ArrayView[Map[String, @untyped_ast.Node]] raise
+pub fn ExprQuery::captures(Self, source_name~ : String, String) -> ArrayView[Map[String, @untyped_ast.Node]] raise
 
 // Type aliases
 

query/query.mbt

@@ -35,7 +35,7 @@ pub fn ExprQuery::ExprQuery(pattern : String) -> ExprQuery raise {
 }
 
 ///|
-pub fn ExprQuery::matches_all(
+pub fn ExprQuery::captures(
   self : ExprQuery,
   source_name~ : String,
   source : String,

query/query_test.mbt

@@ -42,7 +42,7 @@ test "query matches simple expression and returns empty capture map" {
     #|  target()
     #|}
     #|
-  let matches = query.matches_all(source_name="sample.mbt", source)
+  let matches = query.captures(source_name="sample.mbt", source)
   assert_eq(matches.length(), 1)
   assert_eq(matches[0].length(), 0)
 }
@@ -56,7 +56,7 @@ test "query captures one repeated expression and rejects non-repeated candidates
     #|  make() + other()
     #|}
     #|
-  let matches = query.matches_all(source_name="sample.mbt", source)
+  let matches = query.captures(source_name="sample.mbt", source)
   assert_eq(matches.length(), 1)
   guard matches[0].get("value") is Some(value) else {
     fail("expected value capture")
@@ -72,7 +72,7 @@ test "query captures identifiers and constants by metavar name" {
     #|  sink(@math.abs)
     #|}
     #|
-  let id_matches = id_query.matches_all(source_name="sample.mbt", id_source)
+  let id_matches = id_query.captures(source_name="sample.mbt", id_source)
   assert_eq(id_matches.length(), 1)
   guard id_matches[0].get("callee") is Some(callee) else {
     fail("expected callee capture")
@@ -89,7 +89,7 @@ test "query captures identifiers and constants by metavar name" {
     #|  sink(42)
     #|}
     #|
-  let const_matches = const_query.matches_all(
+  let const_matches = const_query.captures(
     source_name="sample.mbt",
     const_source,
   )
@@ -118,7 +118,7 @@ test "query prefilter skips irrelevant invalid source" {
     #|  this is not valid MoonBit
     #|}
     #|
-  let matches = query.matches_all(source_name="bad.mbt", source)
+  let matches = query.captures(source_name="bad.mbt", source)
   assert_eq(matches.length(), 0)
 }
 
@@ -130,7 +130,7 @@ test "query raises parse error when relevant source is invalid" {
     #|  target(
     #|}
     #|
-  try query.matches_all(source_name="bad.mbt", source) catch {
+  try query.captures(source_name="bad.mbt", source) catch {
     err => inspect("\{to_repr(err)}".contains("parse"), content="true")
   } noraise {
     _ => fail("expected parse error")