From 35ddd7bfcb38ca2fedd81afbe944e5275132949c Mon Sep 17 00:00:00 2001
From: Thomas Voss <mail@thomasvoss.com>
Date: Sat, 28 Oct 2023 02:46:54 +0200
Subject: Fix for GSP v2

---
 src/srp/gsp/abbr.m4.gsp        |  2 +-
 src/srp/gsp/folds.scm.gsp      |  6 +++---
 src/srp/gsp/grammar.js.gsp     | 16 ++++++++--------
 src/srp/gsp/highlights.scm.gsp | 16 ++++++++--------
 src/srp/gsp/pug.pug.gsp        | 16 ++++++++--------
 5 files changed, 28 insertions(+), 28 deletions(-)

(limited to 'src')

diff --git a/src/srp/gsp/abbr.m4.gsp b/src/srp/gsp/abbr.m4.gsp
index 48626e0..99ac1d7 100644
--- a/src/srp/gsp/abbr.m4.gsp
+++ b/src/srp/gsp/abbr.m4.gsp
@@ -1 +1 @@
-@span .fn{-⁨m4_define⁩}(⁨m4_abbr⁩, `\@abbr .@span .fn{-⁨m4_translit⁩}(@span .var{-$1}, A-Z, a-z) {-@span .var{-$1}\}')
+@span .fn {-⁨m4_define⁩}(⁨m4_abbr⁩, `\@abbr .@span .fn {-⁨m4_translit⁩}(@span .var {-$1}, A-Z, a-z) {-@span .var {-$1}\}')
diff --git a/src/srp/gsp/folds.scm.gsp b/src/srp/gsp/folds.scm.gsp
index 8c7cb61..fb8ce45 100644
--- a/src/srp/gsp/folds.scm.gsp
+++ b/src/srp/gsp/folds.scm.gsp
@@ -1,4 +1,4 @@
 [
- (@span .fn{-node})
- (@span .fn{-attribute_list})
-] @span .var{-\@fold}
+ (@span .fn {-node})
+ (@span .fn {-attribute_list})
+] @span .var {-\@fold}
diff --git a/src/srp/gsp/grammar.js.gsp b/src/srp/gsp/grammar.js.gsp
index 278fff0..7a06e7f 100644
--- a/src/srp/gsp/grammar.js.gsp
+++ b/src/srp/gsp/grammar.js.gsp
@@ -1,12 +1,12 @@
 {
-	@span .var{-node}: @span .var{-$} => @span .fn{-seq}(
-		@span .fn{-optional}('>'),
-		@span .var{-$.node_name},
-		@span .fn{-optional}(@span .var{-$.attribute_list}),
-		@span .str{-'{'},
-		@span .fn{-optional}(@span .var{-$.node_body}),
-		@span .str{-'\}'},
+	@span .var {-node}: @span .var {-$} => @span .fn {-seq}(
+		@span .fn {-optional}('>'),
+		@span .var {-$.node_name},
+		@span .fn {-optional}(@span .var {-$.attribute_list}),
+		@span .str {-'{'},
+		@span .fn {-optional}(@span .var {-$.node_body}),
+		@span .str {-'\}'},
 	),
 
-	@span .var{-node_name}: @span .var{-$} => @span .str{-/[a-zA-Z:_][a-zA-Z0-9:_\\-​.]*​/},
+	@span .var {-node_name}: @span .var {-$} => @span .str {-/[a-zA-Z:_][a-zA-Z0-9:_\\-​.]*​/},
 \}
diff --git a/src/srp/gsp/highlights.scm.gsp b/src/srp/gsp/highlights.scm.gsp
index 37f445e..6deeb8a 100644
--- a/src/srp/gsp/highlights.scm.gsp
+++ b/src/srp/gsp/highlights.scm.gsp
@@ -1,9 +1,9 @@
-[@span .str{-">"} @span .str{-"-"} @span .str{-"="} @span .str{-"\@"}] @span .var{-\@operator}
-[@span .str{-"{"} @span .str{-"\}"}] @span .var{-\@tag.delimiter}
-(@span .fn{-node_name}) @span .var{-\@tag}
+[@span .str {-">"} @span .str {-"-"} @span .str {-"="} @span .str {-"\@"}] @span .var {-\@operator}
+[@span .str {-"{"} @span .str {-"\}"}] @span .var {-\@tag.delimiter}
+(@span .fn {-node_name}) @span .var {-\@tag}
 [
- (@span .fn{-attribute_name})
- (@span .fn{-class_shorthand})
- (@span .fn{-id_shorthand})
-] @span .var{-\@tag.attribute}
-(@span .fn{-attribute_value}) @span .var{-\@string}
+ (@span .fn {-attribute_name})
+ (@span .fn {-class_shorthand})
+ (@span .fn {-id_shorthand})
+] @span .var {-\@tag.attribute}
+(@span .fn {-attribute_value}) @span .var {-\@string}
diff --git a/src/srp/gsp/pug.pug.gsp b/src/srp/gsp/pug.pug.gsp
index ac3e026..de816e3 100644
--- a/src/srp/gsp/pug.pug.gsp
+++ b/src/srp/gsp/pug.pug.gsp
@@ -1,8 +1,8 @@
-@span .pug-node{-div}
-	@span .pug-node{-p}
-		@span .pug-cont{-|} Hello world!  This is a
-		@span .pug-cont{-|} multiline paragraph.
-	@span .pug-node{-ul}
-		@span .pug-node{-li} foo
-		@span .pug-node{-li} bar
-		@span .pug-node{-li} baz
+@span .pug-node {-div}
+	@span .pug-node {-p}
+		@span .pug-cont {-|} Hello world!  This is a
+		@span .pug-cont {-|} multiline paragraph.
+	@span .pug-node {-ul}
+		@span .pug-node {-li} foo
+		@span .pug-node {-li} bar
+		@span .pug-node {-li} baz
-- 
cgit v1.2.3