From 53ca5a7fc5829d4c5b1cffc6d5a5f1706f8ec3cd Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Mon, 27 Jul 2020 13:47:29 +0200
Subject: =?UTF-8?q?Refactor=20parser=20=F0=9F=9A=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/library/mod.rs     | 4 ++--
 src/library/page.rs    | 4 ++--
 src/library/spacing.rs | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/library')

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 {
-- 
cgit v1.2.3