about summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorLudovic Courtès2020-08-06 18:49:31 +0200
committerLudovic Courtès2020-08-06 18:49:31 +0200
commit47fd87d615102e20ec9b6ea648401caf91828711 (patch)
treebe73967a60521dc2f88414a8c8289d7e2f7c2d16 /tests
parent34c340fc7b3fa5c7218b4e42a37e8267c7258245 (diff)
downloadskribilo-47fd87d615102e20ec9b6ea648401caf91828711.tar.gz
skribilo-47fd87d615102e20ec9b6ea648401caf91828711.tar.lz
skribilo-47fd87d615102e20ec9b6ea648401caf91828711.zip
Remove 'cond-expand' clauses for Guile 1.8.
This is a followup to d183aa487d99baea3746f79759c17cf36c55dfbf.

* src/guile/skribilo/debug.scm (with-debug): Remove 'cond-expand' and
keep only 'guile-2' version.
* src/guile/skribilo/engine/html.scm (&html-generic-document)[set-output-encoding]:
Likewise.
* src/guile/skribilo/engine/info.scm (document): Likewise.
* src/guile/skribilo/engine/latex.scm (document): Likewise.
* src/guile/skribilo/engine/lout.scm (document): Likewise.
* src/guile/skribilo/evaluator.scm (%evaluate): Likewise.
* src/guile/skribilo/location.scm <top level>: Likewise.
* src/guile/skribilo/module.scm (maybe-set-module-name!): Likewise.
* src/guile/skribilo/package/base.scm <top level>: Likewise.
* src/guile/skribilo/utils/syntax.scm (unless, when): Remove.
(set-correct-file-encoding!, default-to-utf-8): Keep only 'guile-2' variant.
* tests/location.test <top level>: Likewise.
* tests/readers/rss-2.test <top level>: Likewise.
Diffstat (limited to 'tests')
-rw-r--r--tests/location.test5
-rw-r--r--tests/readers/rss-2.test5
2 files changed, 2 insertions, 8 deletions
diff --git a/tests/location.test b/tests/location.test
index 8d0e2c6..ae6c462 100644
--- a/tests/location.test
+++ b/tests/location.test
@@ -1,6 +1,6 @@
 ;;; Check the AST source location info.                  -*- Scheme -*-
 ;;;
-;;; Copyright (C) 2012  Ludovic Courtès <ludo@gnu.org>
+;;; Copyright (C) 2012, 2020  Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of Skribilo.
 ;;;
@@ -27,9 +27,6 @@
   #:use-module (srfi srfi-64)
   #:use-module (ice-9 match))
 
-(cond-expand (guile-2 (begin))
-             (else    (use-modules (ice-9 syncase))))
-
 (define-syntax call-with-code
   (syntax-rules ()
     ((_ string thunk)
diff --git a/tests/readers/rss-2.test b/tests/readers/rss-2.test
index 954ccff..a0e5838 100644
--- a/tests/readers/rss-2.test
+++ b/tests/readers/rss-2.test
@@ -1,6 +1,6 @@
 ;;; Excercise RSS 2.0 reader.                  -*- Scheme -*-
 ;;;
-;;; Copyright (C) 2008, 2009, 2012  Ludovic Courtès <ludo@gnu.org>
+;;; Copyright (C) 2008, 2009, 2012, 2020  Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of Skribilo.
 ;;;
@@ -22,9 +22,6 @@
   #:use-module (skribilo reader)
   #:use-module (srfi srfi-64))
 
-(cond-expand (guile-2 (begin))
-             (else    (use-modules (ice-9 syncase))))
-
 (if (or (not (false-if-exception (resolve-interface '(sxml simple))))
         (not (false-if-exception (resolve-interface '(htmlprag)))))
     (exit 77))