kjuulh/rhai
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Use indirection for doc.

Browse Source
This commit is contained in:
Stephen Chung 2023-02-21 17:14:14 +08:00
parent 129a5c6e86
commit b371c524ae
2 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/optimize.rs
View File

@ -63,7 +63,11 @@ impl Engine {
); );
#[cfg(feature = "metadata")] #[cfg(feature = "metadata")]
_new_ast.set_doc(std::mem::take(ast.doc_mut())); if let Some(doc) = ast.doc_mut() {
_new_ast.set_doc(std::mem::take(doc));
} else {
_new_ast.clear_doc();
}
_new_ast _new_ast
} }

42
src/ast/ast.rs
View File

@ -23,7 +23,7 @@ pub struct AST {
source: Option<ImmutableString>, source: Option<ImmutableString>,
/// [`AST`] documentation. /// [`AST`] documentation.
#[cfg(feature = "metadata")] #[cfg(feature = "metadata")]
doc: crate::SmartString, doc: Option<crate::SmartString>,
/// Global statements. /// Global statements.
body: StmtBlock, body: StmtBlock,
/// Script-defined functions. /// Script-defined functions.
@ -98,7 +98,7 @@ impl AST {
Self { Self {
source: None, source: None,
#[cfg(feature = "metadata")] #[cfg(feature = "metadata")]
doc: crate::SmartString::new_const(), doc: None,
body: StmtBlock::new(statements, Position::NONE, Position::NONE), body: StmtBlock::new(statements, Position::NONE, Position::NONE),
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
lib: functions.into(), lib: functions.into(),
@ -148,7 +148,7 @@ impl AST {
Self { Self {
source: None, source: None,
#[cfg(feature = "metadata")] #[cfg(feature = "metadata")]
doc: crate::SmartString::new_const(), doc: None,
body: StmtBlock::NONE, body: StmtBlock::NONE,
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
lib: crate::Module::new().into(), lib: crate::Module::new().into(),
@ -202,14 +202,14 @@ impl AST {
#[inline(always)] #[inline(always)]
#[must_use] #[must_use]
pub fn doc(&self) -> &str { pub fn doc(&self) -> &str {
&self.doc self.doc.as_ref().map(|s| s.as_str()).unwrap_or_default()
} }
/// Clear the documentation. /// Clear the documentation.
/// Exported under the `metadata` feature only. /// Exported under the `metadata` feature only.
#[cfg(feature = "metadata")] #[cfg(feature = "metadata")]
#[inline(always)] #[inline(always)]
pub fn clear_doc(&mut self) -> &mut Self { pub fn clear_doc(&mut self) -> &mut Self {
self.doc.clear(); self.doc = None;
self self
} }
/// Get a mutable reference to the documentation. /// Get a mutable reference to the documentation.
@ -219,8 +219,8 @@ impl AST {
#[inline(always)] #[inline(always)]
#[must_use] #[must_use]
#[allow(dead_code)] #[allow(dead_code)]
pub(crate) fn doc_mut(&mut self) -> &mut crate::SmartString { pub(crate) fn doc_mut(&mut self) -> Option<&mut crate::SmartString> {
&mut self.doc self.doc.as_mut()
} }
/// Set the documentation. /// Set the documentation.
/// ///
@ -228,7 +228,13 @@ impl AST {
#[cfg(feature = "metadata")] #[cfg(feature = "metadata")]
#[inline(always)] #[inline(always)]
pub(crate) fn set_doc(&mut self, doc: impl Into<crate::SmartString>) { pub(crate) fn set_doc(&mut self, doc: impl Into<crate::SmartString>) {
self.doc = doc.into(); let doc = doc.into();
if doc.is_empty() {
self.doc = None;
} else {
self.doc = Some(doc);
}
} }
/// Get the statements. /// Get the statements.
#[cfg(not(feature = "internals"))] #[cfg(not(feature = "internals"))]
@ -598,11 +604,13 @@ impl AST {
} }
#[cfg(feature = "metadata")] #[cfg(feature = "metadata")]
if !other.doc.is_empty() { if let Some(ref other_doc) = other.doc {
if !_ast.doc.is_empty() { if let Some(ref mut ast_doc) = _ast.doc {
_ast.doc.push('\n'); ast_doc.push('\n');
ast_doc.push_str(other_doc);
} else {
_ast.doc = Some(other_doc.clone());
} }
_ast.doc.push_str(other.doc());
} }
_ast _ast
@ -698,11 +706,13 @@ impl AST {
} }
#[cfg(feature = "metadata")] #[cfg(feature = "metadata")]
if !other.doc.is_empty() { if let Some(other_doc) = other.doc {
if !self.doc.is_empty() { if let Some(ref mut self_doc) = self.doc {
self.doc.push('\n'); self_doc.push('\n');
self_doc.push_str(&other_doc);
} else {
self.doc = Some(other_doc);
} }
self.doc.push_str(&other.doc);
} }
self self