diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lang/ref/array.png | bin | 3609 -> 3922 bytes | |||
| -rw-r--r-- | tests/lang/ref/call-invalid.png | bin | 3032 -> 3043 bytes | |||
| -rw-r--r-- | tests/lang/ref/call.png | bin | 5157 -> 5661 bytes | |||
| -rw-r--r-- | tests/lang/ref/dict.png | bin | 1836 -> 1905 bytes | |||
| -rw-r--r-- | tests/lang/ref/if.png | bin | 1959 -> 1227 bytes | |||
| -rw-r--r-- | tests/lang/ref/repr.png | bin | 8451 -> 9032 bytes | |||
| -rw-r--r-- | tests/lang/typ/array.typ | 5 | ||||
| -rw-r--r-- | tests/lang/typ/call-invalid.typ | 34 | ||||
| -rw-r--r-- | tests/lang/typ/call.typ | 20 | ||||
| -rw-r--r-- | tests/lang/typ/dict.typ | 2 | ||||
| -rw-r--r-- | tests/lang/typ/repr.typ | 3 | ||||
| -rw-r--r-- | tests/library/ref/rgb.png | bin | 2688 -> 3068 bytes | |||
| -rw-r--r-- | tests/typeset.rs | 4 |
13 files changed, 35 insertions, 33 deletions
diff --git a/tests/lang/ref/array.png b/tests/lang/ref/array.png Binary files differindex 36845b5f..5bfddeb1 100644 --- a/tests/lang/ref/array.png +++ b/tests/lang/ref/array.png diff --git a/tests/lang/ref/call-invalid.png b/tests/lang/ref/call-invalid.png Binary files differindex f6c2d67f..eee20e4d 100644 --- a/tests/lang/ref/call-invalid.png +++ b/tests/lang/ref/call-invalid.png diff --git a/tests/lang/ref/call.png b/tests/lang/ref/call.png Binary files differindex d44d7178..5963d30e 100644 --- a/tests/lang/ref/call.png +++ b/tests/lang/ref/call.png diff --git a/tests/lang/ref/dict.png b/tests/lang/ref/dict.png Binary files differindex 45d23ad3..b30f1300 100644 --- a/tests/lang/ref/dict.png +++ b/tests/lang/ref/dict.png diff --git a/tests/lang/ref/if.png b/tests/lang/ref/if.png Binary files differindex 4e7f471a..75a20d00 100644 --- a/tests/lang/ref/if.png +++ b/tests/lang/ref/if.png diff --git a/tests/lang/ref/repr.png b/tests/lang/ref/repr.png Binary files differindex 16c7ea95..13ba6297 100644 --- a/tests/lang/ref/repr.png +++ b/tests/lang/ref/repr.png diff --git a/tests/lang/typ/array.typ b/tests/lang/typ/array.typ index b17b722c..c9383501 100644 --- a/tests/lang/typ/array.typ +++ b/tests/lang/typ/array.typ @@ -14,9 +14,8 @@ {(true, false)} // Multiple lines and items and trailing comma. -{("one" - , 2 - , #003 +{("1" + , #002 ,)} // Error: 3 expected closing paren diff --git a/tests/lang/typ/call-invalid.typ b/tests/lang/typ/call-invalid.typ index 56b23a19..0ed5246f 100644 --- a/tests/lang/typ/call-invalid.typ +++ b/tests/lang/typ/call-invalid.typ @@ -5,24 +5,24 @@ # --- -// Error: 4-5 expected expression, found colon -#f(:) +// Error: 7-8 expected expression, found colon +#args(:) -// Error: 7-9 expected expression, found end of block comment -#f(a:1*/) +// Error: 10-12 expected expression, found end of block comment +#args(a:1*/) -// Error: 5 expected comma -#f(1 2) +// Error: 8 expected comma +#args(1 2) -// Error: 2:4-2:5 expected identifier -// Error: 1:6 expected expression -#f(1:) +// Error: 2:7-2:8 expected identifier +// Error: 1:9 expected expression +#args(1:) -// Error: 4-5 expected identifier -#f(1:2) +// Error: 7-8 expected identifier +#args(1:2) -// Error: 4-7 expected identifier -{f((x):1)} +// Error: 7-10 expected identifier +{args((x):1)} --- #let x = "string" @@ -32,13 +32,13 @@ --- // Error: 3:1 expected closing bracket -#f[`a]` +#args[`a]` --- -// Error: 4 expected closing paren -{f(} +// Error: 7 expected closing paren +{args(} --- // Error: 3:1 expected quote // Error: 2:1 expected closing paren -#f("] +#args("] diff --git a/tests/lang/typ/call.typ b/tests/lang/typ/call.typ index 101fb99c..213d5554 100644 --- a/tests/lang/typ/call.typ +++ b/tests/lang/typ/call.typ @@ -2,16 +2,16 @@ --- // One argument. -#f(bold) +#args(bold) // One argument and trailing comma. -#f(1,) +#args(1,) // One named argument. -#f(a:2) +#args(a:2) // Mixed arguments. -{f(1, a: (3, 4), 2, b: "5")} +{args(1, b: "2", 3)} --- // Different forms of template arguments. @@ -19,17 +19,17 @@ #let a = "a" -#f[a] \ -#f(a) \ -#f(a, [b]) \ -#f(a)[b] \ +#args[a] \ +#args(a) \ +#args(a, [b]) \ +#args(a)[b] \ // Template can be argument or body depending on whitespace. #if "template" == type[b] [Sure ] #if "template" == type [Nope.] #else [thing.] -// Should output `<function f> (Okay.)`. -#f (Okay.) +// Should output `<function args> (Okay.)`. +#args (Okay.) --- // Call function assigned to variable. diff --git a/tests/lang/typ/dict.typ b/tests/lang/typ/dict.typ index 076a572f..655a3299 100644 --- a/tests/lang/typ/dict.typ +++ b/tests/lang/typ/dict.typ @@ -5,7 +5,7 @@ {(:)} // Two pairs. -{(one: 1, two: 2)} +{(a1: 1, a2: 2)} --- // Simple expression after already being identified as a dictionary. diff --git a/tests/lang/typ/repr.typ b/tests/lang/typ/repr.typ index 6229165a..666db428 100644 --- a/tests/lang/typ/repr.typ +++ b/tests/lang/typ/repr.typ @@ -33,6 +33,9 @@ {2.5rad} \ {45deg} \ +// Not in monospace via repr. +#repr(45deg) + --- // Colors. {#f7a20500} \ diff --git a/tests/library/ref/rgb.png b/tests/library/ref/rgb.png Binary files differindex 3060e42c..a6e6f7d4 100644 --- a/tests/library/ref/rgb.png +++ b/tests/library/ref/rgb.png diff --git a/tests/typeset.rs b/tests/typeset.rs index ac4fe9b0..3041499a 100644 --- a/tests/typeset.rs +++ b/tests/typeset.rs @@ -312,7 +312,7 @@ struct Panic { } fn register_helpers(scope: &mut Scope, panics: Rc<RefCell<Vec<Panic>>>) { - pub fn f(_: &mut EvalContext, args: &mut ValueArgs) -> Value { + pub fn args(_: &mut EvalContext, args: &mut ValueArgs) -> Value { let value = args.clone().into(); args.items.clear(); value @@ -329,7 +329,7 @@ fn register_helpers(scope: &mut Scope, panics: Rc<RefCell<Vec<Panic>>>) { } }; - scope.def_const("f", ValueFunc::new("f", f)); + scope.def_const("args", ValueFunc::new("args", args)); scope.def_const("test", ValueFunc::new("test", test)); } |
