summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorLaurenz <laurmaedje@gmail.com>2020-07-29 17:46:57 +0200
committerGitHub <noreply@github.com>2020-07-29 17:46:57 +0200
commitf34ba3dcda182d9b9c14cc94fdb48810bf18bef0 (patch)
tree667a7aba2f26996c7ada8ce85952c384a1dbd5a1 /src/library
parente7ffdde43d09f60238590723c2829554806e23d5 (diff)
parent9672d4320052d08b67d497febed4a0ad78bf9252 (diff)
Merge pull request #7 from typst/parser-update
Parser update
Diffstat (limited to 'src/library')
-rw-r--r--src/library/mod.rs4
-rw-r--r--src/library/page.rs4
-rw-r--r--src/library/spacing.rs6
3 files changed, 7 insertions, 7 deletions
diff --git a/src/library/mod.rs b/src/library/mod.rs
index c8ca374d..e1aa4ac2 100644
--- a/src/library/mod.rs
+++ b/src/library/mod.rs
@@ -53,10 +53,10 @@ function! {
body: Option<SyntaxModel>,
}
- parse(header, body, ctx, f) {
+ parse(header, body, state, f) {
header.args.pos.items.clear();
header.args.key.pairs.clear();
- ValFunc { body: body!(opt: body, ctx, f) }
+ ValFunc { body: body!(opt: body, state, f) }
}
layout(self, ctx, f) {
diff --git a/src/library/page.rs b/src/library/page.rs
index 4d92ea91..1e782f8f 100644
--- a/src/library/page.rs
+++ b/src/library/page.rs
@@ -12,7 +12,7 @@ function! {
flip: bool,
}
- parse(header, body, ctx, f) {
+ parse(header, body, state, f) {
body!(nope: body, f);
PageSizeFunc {
paper: header.args.pos.get::<Paper>(&mut f.problems),
@@ -50,7 +50,7 @@ function! {
padding: PaddingMap,
}
- parse(header, body, ctx, f) {
+ parse(header, body, state, f) {
body!(nope: body, f);
PageMarginsFunc {
padding: PaddingMap::parse(&mut f.problems, &mut header.args),
diff --git a/src/library/spacing.rs b/src/library/spacing.rs
index 8d9c46aa..adca20af 100644
--- a/src/library/spacing.rs
+++ b/src/library/spacing.rs
@@ -46,9 +46,9 @@ function! {
type Meta = ContentKind;
- parse(header, body, ctx, f, meta) {
+ parse(header, body, state, f, meta) {
ContentSpacingFunc {
- body: body!(opt: body, ctx, f),
+ body: body!(opt: body, state, f),
content: meta,
spacing: header.args.pos.get::<f64>(&mut f.problems)
.map(|num| num as f32)
@@ -84,7 +84,7 @@ function! {
type Meta = Option<SpecificAxis>;
- parse(header, body, ctx, f, meta) {
+ parse(header, body, state, f, meta) {
body!(nope: body, f);
SpacingFunc {
spacing: if let Some(axis) = meta {