mirror of
https://github.com/typst/typst
synced 2025-06-28 08:12:53 +08:00
Support in
operator on strings and modules (#6498)
This commit is contained in:
parent
d3caedd813
commit
35809387f8
@ -19,11 +19,8 @@ use crate::foundations::{repr, ty, Content, Scope, Value};
|
|||||||
///
|
///
|
||||||
/// You can access definitions from the module using [field access
|
/// You can access definitions from the module using [field access
|
||||||
/// notation]($scripting/#fields) and interact with it using the [import and
|
/// notation]($scripting/#fields) and interact with it using the [import and
|
||||||
/// include syntaxes]($scripting/#modules). Alternatively, it is possible to
|
/// include syntaxes]($scripting/#modules).
|
||||||
/// convert a module to a dictionary, and therefore access its contents
|
|
||||||
/// dynamically, using the [dictionary constructor]($dictionary/#constructor).
|
|
||||||
///
|
///
|
||||||
/// # Example
|
|
||||||
/// ```example
|
/// ```example
|
||||||
/// <<< #import "utils.typ"
|
/// <<< #import "utils.typ"
|
||||||
/// <<< #utils.add(2, 5)
|
/// <<< #utils.add(2, 5)
|
||||||
@ -34,6 +31,20 @@ use crate::foundations::{repr, ty, Content, Scope, Value};
|
|||||||
/// >>>
|
/// >>>
|
||||||
/// >>> #(-3)
|
/// >>> #(-3)
|
||||||
/// ```
|
/// ```
|
||||||
|
///
|
||||||
|
/// You can check whether a definition is present in a module using the `{in}`
|
||||||
|
/// operator, with a string on the left-hand side. This can be useful to
|
||||||
|
/// [conditionally access]($category/foundations/std/#conditional-access)
|
||||||
|
/// definitions in a module.
|
||||||
|
///
|
||||||
|
/// ```example
|
||||||
|
/// #("table" in std) \
|
||||||
|
/// #("nope" in std)
|
||||||
|
/// ```
|
||||||
|
///
|
||||||
|
/// Alternatively, it is possible to convert a module to a dictionary, and
|
||||||
|
/// therefore access its contents dynamically, using the [dictionary
|
||||||
|
/// constructor]($dictionary/#constructor).
|
||||||
#[ty(cast)]
|
#[ty(cast)]
|
||||||
#[derive(Clone, Hash)]
|
#[derive(Clone, Hash)]
|
||||||
#[allow(clippy::derived_hash_with_manual_eq)]
|
#[allow(clippy::derived_hash_with_manual_eq)]
|
||||||
|
@ -558,6 +558,7 @@ pub fn contains(lhs: &Value, rhs: &Value) -> Option<bool> {
|
|||||||
(Str(a), Str(b)) => Some(b.as_str().contains(a.as_str())),
|
(Str(a), Str(b)) => Some(b.as_str().contains(a.as_str())),
|
||||||
(Dyn(a), Str(b)) => a.downcast::<Regex>().map(|regex| regex.is_match(b)),
|
(Dyn(a), Str(b)) => a.downcast::<Regex>().map(|regex| regex.is_match(b)),
|
||||||
(Str(a), Dict(b)) => Some(b.contains(a)),
|
(Str(a), Dict(b)) => Some(b.contains(a)),
|
||||||
|
(Str(a), Module(b)) => Some(b.scope().get(a).is_some()),
|
||||||
(a, Array(b)) => Some(b.contains(a.clone())),
|
(a, Array(b)) => Some(b.contains(a.clone())),
|
||||||
|
|
||||||
_ => Option::None,
|
_ => Option::None,
|
||||||
|
@ -181,11 +181,7 @@
|
|||||||
[`sys.version`]($category/foundations/sys) can also be very useful.
|
[`sys.version`]($category/foundations/sys) can also be very useful.
|
||||||
|
|
||||||
```typ
|
```typ
|
||||||
#let tiling = if "tiling" in dictionary(std) {
|
#let tiling = if "tiling" in std { tiling } else { pattern }
|
||||||
tiling
|
|
||||||
} else {
|
|
||||||
pattern
|
|
||||||
}
|
|
||||||
|
|
||||||
...
|
...
|
||||||
```
|
```
|
||||||
|
@ -264,6 +264,8 @@
|
|||||||
#test("Hey" not in "abheyCd", true)
|
#test("Hey" not in "abheyCd", true)
|
||||||
#test("a" not
|
#test("a" not
|
||||||
/* fun comment? */ in "abc", false)
|
/* fun comment? */ in "abc", false)
|
||||||
|
#test("sys" in std, true)
|
||||||
|
#test("system" in std, false)
|
||||||
|
|
||||||
--- ops-not-trailing ---
|
--- ops-not-trailing ---
|
||||||
// Error: 10 expected keyword `in`
|
// Error: 10 expected keyword `in`
|
||||||
|
Loading…
x
Reference in New Issue
Block a user