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

tags: Always return non-null pointers from C APIs

Browse source
This commit is contained in:
Max Brunsfeld 2020-03-25 12:20:02 -07:00
parent 783c087aec
commit 9dde6c44ed
1 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tags/src/c_lib.rs
View file

@ -3,7 +3,7 @@ use std::collections::HashMap;
use std::ffi::CStr;
use std::process::abort;
use std::sync::atomic::AtomicUsize;
use std::{fmt, ptr, slice, str};
use std::{fmt, slice, str};
use tree_sitter::Language;
#[repr(C)]
@ -187,8 +187,8 @@ pub extern "C" fn ts_tagger_tag(
pub extern "C" fn ts_tags_buffer_new() -> *mut TSTagsBuffer {
Box::into_raw(Box::new(TSTagsBuffer {
context: TagsContext::new(),
tags: Vec::new(),
docs: Vec::new(),
tags: Vec::with_capacity(64),
docs: Vec::with_capacity(64),
}))
}
@ -200,11 +200,7 @@ pub extern "C" fn ts_tags_buffer_delete(this: *mut TSTagsBuffer) {
#[no_mangle]
pub extern "C" fn ts_tags_buffer_tags(this: *const TSTagsBuffer) -> *const TSTag {
let buffer = unwrap_ptr(this);
if buffer.tags.is_empty() {
ptr::null()
} else {
buffer.tags.as_ptr()
}
buffer.tags.as_ptr()
}
#[no_mangle]
@ -216,11 +212,7 @@ pub extern "C" fn ts_tags_buffer_tags_len(this: *const TSTagsBuffer) -> u32 {
#[no_mangle]
pub extern "C" fn ts_tags_buffer_docs(this: *const TSTagsBuffer) -> *const i8 {
let buffer = unwrap_ptr(this);
if buffer.docs.is_empty() {
ptr::null()
} else {
buffer.docs.as_ptr() as *const i8
}
buffer.docs.as_ptr() as *const i8
}
#[no_mangle]