caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-14 04:56:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use equals sign instead of colon for objects 📍

Browse Source
This commit is contained in:
Laurenz 2020-08-13 20:10:29 +02:00
parent da2ade6542
commit 88151c546f
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/syntax/expr.rs
View File

@ -30,7 +30,7 @@ pub enum Expr {
Tuple(Tuple), Tuple(Tuple),
/// A named tuple: `cmyk(37.7, 0, 3.9, 1.1)`. /// A named tuple: `cmyk(37.7, 0, 3.9, 1.1)`.
NamedTuple(NamedTuple), NamedTuple(NamedTuple),
/// An object: `{ fit: false, width: 12pt }`. /// An object: `{ fit=false, width=12pt }`.
Object(Object), Object(Object),
/// An operation that negates the contained expression. /// An operation that negates the contained expression.
Neg(Box<Spanned<Expr>>), Neg(Box<Spanned<Expr>>),
@ -322,7 +322,7 @@ impl Deref for NamedTuple {
/// ///
/// # Example /// # Example
/// ```typst /// ```typst
/// { fit: false, width: 12cm, items: (1, 2, 3) } /// { fit = false, width = 12cm, items = (1, 2, 3) }
/// ``` /// ```
#[derive(Default, Clone, PartialEq)] #[derive(Default, Clone, PartialEq)]
pub struct Object(pub SpanVec<Pair>); pub struct Object(pub SpanVec<Pair>);

30
src/syntax/parsing.rs
View File

@ -475,7 +475,7 @@ impl FuncParser<'_> {
let after_key = self.pos(); let after_key = self.pos();
self.skip_white(); self.skip_white();
if !self.expect_at(Token::Colon, after_key) { if !self.expect_at(Token::Equals, after_key) {
continue; continue;
} }
@ -1078,16 +1078,16 @@ mod tests {
// Okay objects. // Okay objects.
pval!("{}" => (object! {})); pval!("{}" => (object! {}));
pval!("{ key: value }" => (object! { "key" => Id("value") })); pval!("{ key = value }" => (object! { "key" => Id("value") }));
// Unclosed object. // Unclosed object.
p!("[val: {hello: world]" => p!("[val: {hello = world]" =>
[par![func!("val": (object! { "hello" => Id("world") }), {})]], [par![func!("val": (object! { "hello" => Id("world") }), {})]],
[(0:19, 0:19, "expected closing brace")], [(0:20, 0:20, "expected closing brace")],
); );
p!("[val: { a]" => p!("[val: { a]" =>
[par![func!("val": (object! {}), {})]], [par![func!("val": (object! {}), {})]],
[(0:9, 0:9, "expected colon"), (0:9, 0:9, "expected closing brace")], [(0:9, 0:9, "expected equals sign"), (0:9, 0:9, "expected closing brace")],
); );
// Missing key. // Missing key.
@ -1096,39 +1096,39 @@ mod tests {
p!("[val: { : }]" => [val()], [(0:8, 0:9, "expected key, found colon")]); p!("[val: { : }]" => [val()], [(0:8, 0:9, "expected key, found colon")]);
// Missing colon. // Missing colon.
p!("[val: { key }]" => [val()], [(0:11, 0:11, "expected colon")]); p!("[val: { key }]" => [val()], [(0:11, 0:11, "expected equals sign")]);
p!("[val: { key false }]" => [val()], [ p!("[val: { key false }]" => [val()], [
(0:11, 0:11, "expected colon"), (0:11, 0:11, "expected equals sign"),
(0:12, 0:17, "expected key, found bool"), (0:12, 0:17, "expected key, found bool"),
]); ]);
p!("[val: { a b:c }]" => p!("[val: { a b=c }]" =>
[par![func!("val": (object! { "b" => Id("c") }), {})]], [par![func!("val": (object! { "b" => Id("c") }), {})]],
[(0:9, 0:9, "expected colon")], [(0:9, 0:9, "expected equals sign")],
); );
// Missing value. // Missing value.
p!("[val: { key: : }]" => [val()], [(0:13, 0:14, "expected value, found colon")]); p!("[val: { key= : }]" => [val()], [(0:13, 0:14, "expected value, found colon")]);
p!("[val: { key: , k: \"s\" }]" => p!("[val: { key= , k= \"s\" }]" =>
[par![func!("val": (object! { "k" => Str("s") }), {})]], [par![func!("val": (object! { "k" => Str("s") }), {})]],
[(0:13, 0:14, "expected value, found comma")], [(0:13, 0:14, "expected value, found comma")],
); );
// Missing comma, invalid token. // Missing comma, invalid token.
p!("[val: left={ a: 2, b: false 🌎 }]" => p!("[val: left={ a=2, b=false 🌎 }]" =>
[par![func!("val": (), { [par![func!("val": (), {
"left" => object! { "left" => object! {
"a" => Num(2.0), "a" => Num(2.0),
"b" => Bool(false), "b" => Bool(false),
} }
})]], })]],
[(0:27, 0:27, "expected comma"), [(0:25, 0:25, "expected comma"),
(0:28, 0:29, "expected key, found invalid token")], (0:26, 0:27, "expected key, found invalid token")],
); );
} }
#[test] #[test]
fn parse_nested_tuples_and_objects() { fn parse_nested_tuples_and_objects() {
pval!("(1, { ab: (), d: (3, 14pt) }), false" => ( pval!("(1, { ab=(), d = (3, 14pt) }), false" => (
tuple!( tuple!(
Num(1.0), Num(1.0),
object!( object!(