Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-11-14 17:07:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move the Option out of ParsedSourceRef, and use Arc instead of Rc

Browse source 
Two small fixes:

1. ParsedSourceRef, if present, should not be None; express that in the type.
2. ParsedSourceRef is intended to be shareable across threads; make it so.
This commit is contained in:
ridiculousfish 2023-07-02 17:46:04 -07:00
parent a996c8c7dd
commit 2ec482e94a
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
fish-rust/src/parse_tree.rs
View file

@ -1,7 +1,7 @@
//! Programmatic representation of fish code.
use std::pin::Pin;
use std::rc::Rc;
use std::sync::Arc;
use crate::ast::Ast;
use crate::parse_constants::{
@ -112,7 +112,7 @@ impl ParsedSource {
}
}
pub type ParsedSourceRef = Option<Rc<ParsedSource>>;
pub type ParsedSourceRef = Arc<ParsedSource>;
/// Return a shared pointer to ParsedSource, or null on failure.
/// If parse_flag_continue_after_error is not set, this will return null on any error.
@ -120,16 +120,16 @@ pub fn parse_source(
src: WString,
flags: ParseTreeFlags,
errors: Option<&mut ParseErrorList>,
) -> ParsedSourceRef {
) -> Option<ParsedSourceRef> {
let ast = Ast::parse(&src, flags, errors);
if ast.errored() && !flags.contains(ParseTreeFlags::CONTINUE_AFTER_ERROR) {
None
} else {
Some(Rc::new(ParsedSource::new(src, ast)))
Some(Arc::new(ParsedSource::new(src, ast)))
}
}
struct ParsedSourceRefFFI(pub ParsedSourceRef);
struct ParsedSourceRefFFI(pub Option<ParsedSourceRef>);
#[cxx::bridge]
mod parse_tree_ffi {
@ -160,13 +160,15 @@ impl ParsedSourceRefFFI {
self.0.is_some()
}
}
fn empty_parsed_source_ref() -> Box<ParsedSourceRefFFI> {
Box::new(ParsedSourceRefFFI(None))
}
fn new_parsed_source_ref(src: &CxxWString, ast: Pin<&mut Ast>) -> Box<ParsedSourceRefFFI> {
let mut stolen_ast = Ast::default();
std::mem::swap(&mut stolen_ast, ast.get_mut());
Box::new(ParsedSourceRefFFI(Some(Rc::new(ParsedSource::new(
Box::new(ParsedSourceRefFFI(Some(Arc::new(ParsedSource::new(
src.from_ffi(),
stolen_ast,
)))))