From e7df9978d83d5d858c29d2d0160c7bba38145bbd Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 20 Nov 2009 11:43:02 +0100 Subject: Remove occurrences of `use-syntax' and `export-syntax'. * src/guile/skribilo/debug.scm, src/guile/skribilo/index.scm, src/guile/skribilo/lib.scm, src/guile/skribilo/package/base.scm, src/guile/skribilo/reader.scm, src/guile/skribilo/utils/compat.scm: Replace `use-syntax' by `use-module' and `export-syntax' by `export'. --- src/guile/skribilo/debug.scm | 6 +++--- src/guile/skribilo/index.scm | 8 ++++---- src/guile/skribilo/lib.scm | 8 ++++---- src/guile/skribilo/package/base.scm | 6 +++--- src/guile/skribilo/reader.scm | 6 ++++-- src/guile/skribilo/utils/compat.scm | 3 ++- 6 files changed, 20 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/guile/skribilo/debug.scm b/src/guile/skribilo/debug.scm index 46189f2..d9d54bd 100644 --- a/src/guile/skribilo/debug.scm +++ b/src/guile/skribilo/debug.scm @@ -1,7 +1,7 @@ -;;; debug.scm -- Debugging facilities. +;;; debug.scm -- Debugging facilities. -*- coding: iso-8859-1 -*- ;;; +;;; Copyright 2005, 2006, 2009 Ludovic Courtès ;;; Copyright 2003, 2004 Erick Gallesio - I3S-CNRS/ESSI -;;; Copyright 2005, 2006 Ludovic Courtès ;;; ;;; This program is free software; you can redistribute it and/or modify ;;; it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ (define-module (skribilo debug) :use-module (skribilo utils syntax) :use-module (srfi srfi-39) - :export-syntax (debug-item debug-bold with-debug)) + :export (debug-item debug-bold with-debug)) (skribilo-module-syntax) diff --git a/src/guile/skribilo/index.scm b/src/guile/skribilo/index.scm index 1a536d9..dc7ed40 100644 --- a/src/guile/skribilo/index.scm +++ b/src/guile/skribilo/index.scm @@ -1,6 +1,6 @@ -;;; index.scm +;;; index.scm -- Document indices. -*- coding: iso-8859-1 -*- ;;; -;;; Copyright 2005, 2006, 2008 Ludovic Courtès +;;; Copyright 2005, 2006, 2008, 2009 Ludovic Courtès ;;; Copyright 2003, 2004 Manuel Serrano ;;; ;;; @@ -20,8 +20,8 @@ ;;; USA. (define-module (skribilo index) - :use-syntax (skribilo utils syntax) - :use-syntax (skribilo lib) + :use-module (skribilo utils syntax) + :use-module (skribilo lib) :use-module (skribilo ast) :autoload (srfi srfi-34) (raise) diff --git a/src/guile/skribilo/lib.scm b/src/guile/skribilo/lib.scm index 06d12ea..45a8aee 100644 --- a/src/guile/skribilo/lib.scm +++ b/src/guile/skribilo/lib.scm @@ -1,4 +1,4 @@ -;;; lib.scm -- Utilities. +;;; lib.scm -- Utilities. -*- coding: iso-8859-1 -*- ;;; ;;; Copyright 2005, 2007, 2009 Ludovic Courtès ;;; Copyright 2003, 2004 Erick Gallesio - I3S-CNRS/ESSI @@ -26,10 +26,10 @@ skribe-warning skribe-warning/ast skribe-message - type-name) + type-name - :export-syntax (new define-markup define-simple-markup - define-simple-container define-processor-markup) + new define-markup define-simple-markup + define-simple-container define-processor-markup) ;; Re-exported because used in `define-markup'. :re-export (invocation-location) diff --git a/src/guile/skribilo/package/base.scm b/src/guile/skribilo/package/base.scm index 373be1d..4372b96 100644 --- a/src/guile/skribilo/package/base.scm +++ b/src/guile/skribilo/package/base.scm @@ -20,9 +20,9 @@ ;;; USA. (define-module (skribilo package base) - :use-syntax (skribilo lib) - :use-syntax (skribilo utils syntax) - :use-syntax (ice-9 optargs) + :use-module (skribilo lib) + :use-module (skribilo utils syntax) + :use-module (ice-9 optargs) :use-module (skribilo ast) :use-module (skribilo resolve) diff --git a/src/guile/skribilo/reader.scm b/src/guile/skribilo/reader.scm index 6bdb274..fa28029 100644 --- a/src/guile/skribilo/reader.scm +++ b/src/guile/skribilo/reader.scm @@ -1,4 +1,5 @@ ;;; reader.scm -- Skribilo's front-end (aka. reader) interface. +;;; -*- coding: iso-8859-1 -*- ;;; ;;; Copyright 2005, 2009 Ludovic Courtès ;;; @@ -29,8 +30,9 @@ *document-reader* &reader-search-error reader-search-error? - reader-search-error:reader) - :export-syntax (define-reader define-public-reader reader?)) + reader-search-error:reader + + define-reader define-public-reader reader?)) ;;; Author: Ludovic Courtès ;;; diff --git a/src/guile/skribilo/utils/compat.scm b/src/guile/skribilo/utils/compat.scm index 2777466..c955f14 100644 --- a/src/guile/skribilo/utils/compat.scm +++ b/src/guile/skribilo/utils/compat.scm @@ -1,4 +1,5 @@ ;;; compat.scm -- Skribe compatibility module. +;;; -*- coding: iso-8859-1 -*- ;;; ;;; Copyright 2005, 2006, 2007, 2009 Ludovic Courtès ;;; @@ -294,7 +295,7 @@ '()) (define-macro (printf . args) `(format #t ,@args)) -(export-syntax printf) +(export printf) (define-public fprintf format) (define-public (fprint port . args) -- cgit v1.2.3