[gnunet-scheme] branch master updated (bf87f7d -> f5dc44e)

[gnunet]

This is an automated email from the git hooks/post-receive script.

maxime-devos pushed a change to branch master
in repository gnunet-scheme.

    from bf87f7d  Update documentation indices.
     new a68a911  config/parser: Use R7RS symbols instead of Guile's syntax.
     new a5a5717  config/expand: Use R7RS symbols instead of Guile's syntax.
     new f5dc44e  tests/config-parser: Use R7RS symbols instead of Guile's 
syntax.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/gnunet/config/expand.scm |  8 +++----
 gnu/gnunet/config/parser.scm | 57 ++++++++++++++++++++++----------------------
 tests/config-parser.scm      |  4 ++--
 3 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/gnu/gnunet/config/expand.scm b/gnu/gnunet/config/expand.scm
index 5a5fd0c..fb71748 100644
--- a/gnu/gnunet/config/expand.scm
+++ b/gnu/gnunet/config/expand.scm
@@ -1,6 +1,6 @@
 ;#!r6rs
 ;; This file is part of scheme-GNUnet, a partial Scheme port of GNUnet.
-;; Copyright (C) 2006, 2007, 2008, 2009, 2013, 2020, 2021 GNUnet e.V.
+;; Copyright (C) 2006, 2007, 2008, 2009, 2013, 2020, 2021, 2022 GNUnet e.V.
 ;;
 ;; scheme-GNUnet is free software: you can redistribute it and/or modify it
 ;; under the terms of the GNU Affero General Public License as published
@@ -48,9 +48,9 @@
          (only (gnu gnunet config parser)
                literal-position? expo:literal-start expo:literal-end
                $-position? expo:$-name-start expo:$-name-end
-               |${}-position?| #{expo:${}-name-start}#
-               |expo:${}-name-end| #{${:-}-position?}#
-               |expo:${:-}-name-start| #{expo:${:-}-name-end}#
+               |${}-position?| |expo:${}-name-start|
+               |expo:${}-name-end| |${:-}-position?|
+               |expo:${:-}-name-start| |expo:${:-}-name-end|
                |expo:${:-}-value-parts|)
          (only (gnu gnunet utils hat-let)
                let^))
diff --git a/gnu/gnunet/config/parser.scm b/gnu/gnunet/config/parser.scm
index 956e19e..4b69e9c 100644
--- a/gnu/gnunet/config/parser.scm
+++ b/gnu/gnunet/config/parser.scm
@@ -31,7 +31,7 @@
          <position:=> make-=-position =-position?
          position:variable-start position:variable-end
          position:= position:value-start position:value-end
-         |<position:[]>| #{make-[]-position}# #{[]-position?}#
+         |<position:[]>| |make-[]-position| |[]-position?|
          position:section-name-start position:section-name-end
          <position:@inline@> make-@inline@-position @inline@-position?
          position:@inline@-start position:@inline@-end
@@ -40,14 +40,14 @@
          ;; expansion parser (data types)
          <expo:literal> make-literal-position literal-position?
          <expo:$> make-$-position $-position?
-         |<expo:${}>| #{make-${}-position}# #{${}-position?}#
-         |<expo:${:-}>| #{make-${:-}-position}# #{${:-}-position?}#
+         |<expo:${}>| |make-${}-position| |${}-position?|
+         |<expo:${:-}>| |make-${:-}-position| |${:-}-position?|
 
          expo:literal-start expo:literal-end
          expo:$-name-start expo:$-name-end
-         |expo:${}-name-start| #{expo:${}-name-end}#
-         |expo:${:-}-name-start| #{expo:${:-}-name-end}#
-         |expo:${:-}-value-start| #{expo:${:-}-value-end}#
+         |expo:${}-name-start| |expo:${}-name-end|
+         |expo:${:-}-name-start| |expo:${:-}-name-end|
+         |expo:${:-}-value-start| |expo:${:-}-value-end|
          |expo:${:-}-value-parts|
 
          ;; expansion parser (conditions)
@@ -153,7 +153,7 @@ If the value is empty, then by convention 
@var{variable-start} and
 @var{variable-end} are the positions right after the equality sign.")
 
     (define-positions-type
-      (|<position:[]>| #{make-[]-position}# #{[]-position?}#)
+      (|<position:[]>| |make-[]-position| |[]-position?|)
       ((section-name-start position:section-name-start)
        (section-name-end position:section-name-end))
       ;; TODO: should empty section names be allowed?
@@ -269,28 +269,27 @@ the start and end positions of a region of texts without 
expansions.")
       "@var{$-name-start} (inclusive) and @var{$-name-end} (exclusive) are the
 start and end positions of a variable name in an expansion X/$VAR/etcetera.")
 
-    (define-positions-type (|<expo:${}>| #{make-${}-position}#
-                           |${}-position?|)
-      ((|${}-name-start| #{expo:${}-name-start}#)
-       (|${}-name-end| #{expo:${}-name-end}#))
-      ((< |${}-name-start| #{${}-name-end}#))
+    (define-positions-type (|<expo:${}>| |make-${}-position| |${}-position?|)
+      ((|${}-name-start| |expo:${}-name-start|)
+       (|${}-name-end| |expo:${}-name-end|))
+      ((< |${}-name-start| |${}-name-end|))
       "@var{$@{@}-name-start} (inclusive) and @var{$@{@}-name-end}
 (exclusive) are the start and end positions of a variable name in an expansion
 ${VAR}.")
 
-    (define-record-type (|<expo:${:-}>| #{make-${:-}-position}#
+    (define-record-type (|<expo:${:-}>| |make-${:-}-position|
                         |${:-}-position?|)
-      (fields (immutable |${:-}-name-start| #{expo:${:-}-name-start}#)
-             (immutable |${:-}-name-end| #{expo:${:-}-name-end}#)
-             (immutable |${:-}-value-start| #{expo:${:-}-value-start}#)
-             (immutable |${:-}-value-end| #{expo:${:-}-value-end}#)
-             (immutable |${:-}-value-parts| #{expo:${:-}-value-parts}#))
+      (fields (immutable |${:-}-name-start| |expo:${:-}-name-start|)
+             (immutable |${:-}-name-end| |expo:${:-}-name-end|)
+             (immutable |${:-}-value-start| |expo:${:-}-value-start|)
+             (immutable |${:-}-value-end| |expo:${:-}-value-end|)
+             (immutable |${:-}-value-parts| |expo:${:-}-value-parts|))
       (sealed #t)
       (opaque #t)
       (protocol
        (lambda (%make)
-        (lambda (|${:-}-name-start| #{${:-}-name-end}#
-                 |${:-}-value-start| #{${:-}-value-end}#
+        (lambda (|${:-}-name-start| |${:-}-name-end|
+                 |${:-}-value-start| |${:-}-value-end|
                  |${:-}-value-parts|)
           "@var{$@{:-@}-name-start} (inclusive) and @var{$@{:-@}-name-end}
 (exclusive) are the start and end positions of a variable name in an expansion
@@ -300,16 +299,16 @@ DEFAULT-VALUE.  @var{${:-}-value-parts} is an ordered 
list of contiguous
 expansion position objects, representing the structure of @samp{DEFAULT-VALUE}
 (unverified)."
           (assert (and (exact-integers?
-                        |${:-}-name-start| #{${:-}-name-end}#
-                        |${:-}-value-start| #{${:-}-value-end}#)
+                        |${:-}-name-start| |${:-}-name-end|
+                        |${:-}-value-start| |${:-}-value-end|)
                        (<= 0 |${:-}-name-start|)
-                       (< |${:-}-name-start| #{${:-}-name-end}#)
-                       (= (- |${:-}-value-start| #{${:-}-name-end}#) 2)
-                       (<= |${:-}-value-start| #{${:-}-value-end}#)
+                       (< |${:-}-name-start| |${:-}-name-end|)
+                       (= (- |${:-}-value-start| |${:-}-name-end|) 2)
+                       (<= |${:-}-value-start| |${:-}-value-end|)
                        (or (pair? |${:-}-value-parts|)
                            (null? |${:-}-value-parts|))))
-          (%make |${:-}-name-start| #{${:-}-name-end}#
-                 |${:-}-value-start| #{${:-}-value-end}#
+          (%make |${:-}-name-start| |${:-}-name-end|
+                 |${:-}-value-start| |${:-}-value-end|
                  |${:-}-value-parts|)))))
 
     ;; Now define the possible syntax errors.
@@ -334,7 +333,7 @@ expansions with a default, @code{$@{@}} for braced variable 
expansions without
 default and @code{$} for unbraced variable expansions."
       (assert (and (exact-integers? position)
                   (<= 0 position)
-                  (memq kind '($ |${}| #{${:-}}#))))
+                  (memq kind '($ |${}| |${:-}|))))
       (%make-empty-variable-violation position kind))
 
     (define-condition-type &missing-close &expansion-violation
@@ -349,7 +348,7 @@ indicates the type of variable expansion found, as in
 @code{empty-variable-violation}, though it cannot be @code{$@}."
       (assert (and (exact-integers? position)
                   (<= 0 position)
-                  (memq kind '(|${}| #{${:-}}#))))
+                  (memq kind '(|${}| |${:-}|))))
       (%make-missing-close-violation position kind))
 
     (define cs::-or-close (char-set #\: #\}))
diff --git a/tests/config-parser.scm b/tests/config-parser.scm
index 214157a..144466f 100644
--- a/tests/config-parser.scm
+++ b/tests/config-parser.scm
@@ -1,5 +1,5 @@
 ;; This file is part of scheme-GNUnet.
-;; Copyright (C) 2021 GNUnet e.V.
+;; Copyright © 2021--2022 GNUnet e.V.
 ;;
 ;; scheme-GNUnet is free software: you can redistribute it and/or modify it
 ;; under the terms of the GNU Affero General Public License as published
@@ -325,7 +325,7 @@ If so, return the last object in @var{expos}.  Otherwise, 
return
   (char-set->arbitrary (string->char-set "${:-}ab")))
 (define-syntax-rule ($choose-with-eq? x ...)
   ($choose ((cute eq? x) ($const x)) ...))
-(define $nested ($choose-with-eq? #f '|${}| '#{${:-}}#))
+(define $nested ($choose-with-eq? #f '|${}| '|${:-}|))
 
 (define-syntax-rule (true-if-parse-error exp exp* ...)
   (with-exception-handler

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.