traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tweak query interface

Browse source 
* Rename TSQueryContext -> TSQueryCursor
* Remove the permanent association between the cursor and its query. The 
cursor can now be used again for a different query.
This commit is contained in:
Max Brunsfeld 2019-09-11 14:44:49 -07:00
parent c8c75782e3
commit c71de5bd81
9 changed files with 142 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cli/src/main.rs
View file

@ -1,9 +1,8 @@
use clap::{App, AppSettings, Arg, SubCommand};
use error::Error;
use std::io::Read;
use std::path::Path;
use std::process::exit;
use std::{env, fs, io, u64};
use std::{env, fs, u64};
use tree_sitter::Language;
use tree_sitter_cli::{
config, error, generate, highlight, loader, logger, parse, query, test, wasm, web_ui,

6
cli/src/query.rs
View file

@ -2,7 +2,7 @@ use super::error::{Error, Result};
use std::fs;
use std::io::{self, Write};
use std::path::Path;
use tree_sitter::{Language, Parser, Query};
use tree_sitter::{Language, Parser, Query, QueryCursor};
pub fn query_files_at_paths(
language: Language,
@ -18,7 +18,7 @@ pub fn query_files_at_paths(
let query = Query::new(language, &query_source)
.map_err(|e| Error::new(format!("Query compilation failed: {:?}", e)))?;
let query_context = query.context();
let mut query_cursor = QueryCursor::new();
let mut parser = Parser::new();
parser.set_language(language).map_err(|e| e.to_string())?;
@ -32,7 +32,7 @@ pub fn query_files_at_paths(
let tree = parser.parse(&source_code, None).unwrap();
for mat in query_context.exec(tree.root_node()) {
for mat in query_cursor.exec(&query, tree.root_node()) {
writeln!(&mut stdout, " pattern: {}", mat.pattern_index())?;
for (capture_id, node) in mat.captures() {
writeln!(

42
cli/src/tests/query_test.rs
View file

@ -1,6 +1,6 @@
use super::helpers::allocations;
use super::helpers::fixtures::get_language;
use tree_sitter::{Parser, Query, QueryError, QueryMatch};
use tree_sitter::{Parser, Query, QueryCursor, QueryError, QueryMatch};
#[test]
fn test_query_errors_on_invalid_syntax() {
@ -77,8 +77,8 @@ fn test_query_exec_with_simple_pattern() {
parser.set_language(language).unwrap();
let tree = parser.parse(source, None).unwrap();
let context = query.context();
let matches = context.exec(tree.root_node());
let mut cursor = QueryCursor::new();
let matches = cursor.exec(&query, tree.root_node());
assert_eq!(
collect_matches(matches, &query, source),
@ -117,8 +117,8 @@ fn test_query_exec_with_multiple_matches_same_root() {
let mut parser = Parser::new();
parser.set_language(language).unwrap();
let tree = parser.parse(source, None).unwrap();
let context = query.context();
let matches = context.exec(tree.root_node());
let mut cursor = QueryCursor::new();
let matches = cursor.exec(&query, tree.root_node());
assert_eq!(
collect_matches(matches, &query, source),
@ -164,8 +164,8 @@ fn test_query_exec_multiple_patterns_different_roots() {
let mut parser = Parser::new();
parser.set_language(language).unwrap();
let tree = parser.parse(source, None).unwrap();
let context = query.context();
let matches = context.exec(tree.root_node());
let mut cursor = QueryCursor::new();
let matches = cursor.exec(&query, tree.root_node());
assert_eq!(
collect_matches(matches, &query, source),
@ -206,8 +206,8 @@ fn test_query_exec_multiple_patterns_same_root() {
let mut parser = Parser::new();
parser.set_language(language).unwrap();
let tree = parser.parse(source, None).unwrap();
let context = query.context();
let matches = context.exec(tree.root_node());
let mut cursor = QueryCursor::new();
let matches = cursor.exec(&query, tree.root_node());
assert_eq!(
collect_matches(matches, &query, source),
@ -243,8 +243,8 @@ fn test_query_exec_nested_matches_without_fields() {
let mut parser = Parser::new();
parser.set_language(language).unwrap();
let tree = parser.parse(source, None).unwrap();
let context = query.context();
let matches = context.exec(tree.root_node());
let mut cursor = QueryCursor::new();
let matches = cursor.exec(&query, tree.root_node());
assert_eq!(
collect_matches(matches, &query, source),
@ -269,8 +269,8 @@ fn test_query_exec_many_matches() {
let mut parser = Parser::new();
parser.set_language(language).unwrap();
let tree = parser.parse(&source, None).unwrap();
let context = query.context();
let matches = context.exec(tree.root_node());
let mut cursor = QueryCursor::new();
let matches = cursor.exec(&query, tree.root_node());
assert_eq!(
collect_matches(matches, &query, source.as_str()),
@ -298,8 +298,8 @@ fn test_query_exec_too_many_match_permutations_to_track() {
let mut parser = Parser::new();
parser.set_language(language).unwrap();
let tree = parser.parse(&source, None).unwrap();
let context = query.context();
let matches = context.exec(tree.root_node());
let mut cursor = QueryCursor::new();
let matches = cursor.exec(&query, tree.root_node());
// For this pathological query, some match permutations will be dropped.
// Just check that a subset of the results are returned, and crash or
@ -329,8 +329,8 @@ fn test_query_exec_with_anonymous_tokens() {
let mut parser = Parser::new();
parser.set_language(language).unwrap();
let tree = parser.parse(&source, None).unwrap();
let context = query.context();
let matches = context.exec(tree.root_node());
let mut cursor = QueryCursor::new();
let matches = cursor.exec(&query, tree.root_node());
assert_eq!(
collect_matches(matches, &query, source),
@ -354,8 +354,8 @@ fn test_query_exec_within_byte_range() {
parser.set_language(language).unwrap();
let tree = parser.parse(&source, None).unwrap();
let mut context = query.context();
let matches = context.set_byte_range(5, 15).exec(tree.root_node());
let mut cursor = QueryCursor::new();
let matches = cursor.set_byte_range(5, 15).exec(&query, tree.root_node());
assert_eq!(
collect_matches(matches, &query, source),
@ -420,8 +420,8 @@ fn test_query_comments() {
let mut parser = Parser::new();
parser.set_language(language).unwrap();
let tree = parser.parse(source, None).unwrap();
let context = query.context();
let matches = context.exec(tree.root_node());
let mut cursor = QueryCursor::new();
let matches = cursor.exec(&query, tree.root_node());
assert_eq!(
collect_matches(matches, &query, source),
&[(0, vec![("fn-name", "one")]),],