DRAFT mes: srfi-9: Switch to Guile modules.

* mes/module/srfi/srfi-9-struct.mes: Rename to...
* mes/module/srfi/srfi-9-struct.scm: ...this.
* mes/module/srfi/srfi-9-vector.mes: Rename to...
* mes/module/srfi/srfi-9-vector.scm: ...this.
* mes/module/srfi/srfi-9.mes: Rename to...
* mes/module/srfi/srfi-9.scm: ...this.
* mes/module/mes/boot-0.scm: Update accordingly.
* tests/srfi-9.test: Update accordingly.

mes/module/mes/boot-0.scm

@@ -179,7 +179,7 @@
 ;; end boot-04.scm
 
 (include-from-path "ice-9/optargs.scm")
-(include-from-path "srfi/srfi-9.mes")
+(include-from-path "srfi/srfi-9.scm")
 (include-from-path "ice-9/getopt-long.scm")
 (mes-use-module (mes main))
 

mes/module/srfi/srfi-9.mes

@@ -1 +0,0 @@
-srfi-9-struct.mes

mes/module/srfi/srfi-9.mes

@@ -0,0 +1,27 @@
+;;; -*-scheme-*-
+
+;;; GNU Mes --- Maxwell Equations of Software
+;;; Copyright © 2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;;
+;;; This file is part of GNU Mes.
+;;;
+;;; GNU Mes is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Mes is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Bootstrap srfi-9
+
+;;; Code:
+
+(include-from-path "srfi/srfi-9.scm")

mes/module/srfi/srfi-9.scm

@@ -0,0 +1 @@
+srfi-9-struct.scm

mes/module/srfi/srfi-9/gnu.mes

@@ -1 +0,0 @@
-gnu-struct.mes

mes/module/srfi/srfi-9/gnu.scm

@@ -0,0 +1 @@
+gnu-struct.scm

tests/srfi-9.test

@@ -10,7 +10,7 @@ exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests
 ;;; -*-scheme-*-
 
 ;;; GNU Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2018,2019,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Mes.
 ;;;
@@ -33,6 +33,14 @@ exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests
   #:use-module (srfi srfi-9)
   #:use-module (srfi srfi-9 gnu))
 
+(cond-expand
+ (mes
+  ;; pre-boot-6.scm bootstrap test
+  (primitive-load "module/mes/test.scm")
+  (primitive-load "mes/module/srfi/srfi-9-struct.scm")
+  (primitive-load "mes/module/srfi/srfi-9/gnu-struct.scm"))
+ (else))
+
 (pass-if "first dummy" #t)
 (pass-if-not "second dummy" #f)