From 0bac0cb948192be736ff0919597efdb408cb7b91 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 22 Dec 2016 19:34:41 +0100
Subject: [PATCH] Use include-from-path for upstream.

* module/mes/lalr.scm: Rename from module/mes/lalr.upstream.mes.
* module/mes/lalr.mes: Update.
* module/mes/match.scm: Rename from module/mes/match.upstream.mes.
* module/mes/match.mes: Update.
* module/mes/optargs.scm: Rename from module/mes/optargs.upstream.mes.
* module/mes/optargs.mes: Update.
* module/mes/quasisyntax.scm: Rename from module/mes/quasisyntax.upstream.mes.
* module/mes/quasisyntax.mes: Update.
* module/srfi/srfi-1.scm: Rename from module/srfi/srfi-1.upstream.mes.
* module/srfi/srfi-1.mes: Update.
* module/srfi/srfi-9.scm: Rename from module/srfi/srfi-9.upstream.mes.
* module/srfi/srfi-9.mes: Update.
* AUTHORS: Update.
---
 AUTHORS                                          | 16 ++++++++--------
 guile/mes/nyacc                                  |  1 +
 guile/nyacc-calc.scm                             |  2 +-
 guile/nyacc.scm                                  |  2 +-
 module/mes/lalr.mes                              |  2 +-
 module/mes/{lalr.upstream.mes => lalr.scm}       |  0
 module/mes/match.mes                             |  2 +-
 module/mes/{match.upstream.mes => match.scm}     |  0
 module/mes/optargs.mes                           |  3 ++-
 module/mes/{optargs.upstream.mes => optargs.scm} |  0
 module/mes/quasisyntax.mes                       |  2 +-
 ...{quasisyntax.upstream.mes => quasisyntax.scm} |  0
 module/mes/syntax.mes                            |  2 +-
 module/mes/{syntax.upstream.mes => syntax.scm}   |  0
 module/srfi/srfi-1.mes                           |  6 +++---
 module/srfi/{srfi-1.upstream.mes => srfi-1.scm}  |  0
 module/srfi/srfi-9-psyntax.mes                   |  2 +-
 module/srfi/srfi-9.mes                           |  2 +-
 module/srfi/{srfi-9.upstream.mes => srfi-9.scm}  |  0
 module/sxml/xpath.mes                            |  2 +-
 module/sxml/{xpath.upstream.mes => xpath.scm}    |  0
 21 files changed, 23 insertions(+), 21 deletions(-)
 create mode 120000 guile/mes/nyacc
 rename module/mes/{lalr.upstream.mes => lalr.scm} (100%)
 rename module/mes/{match.upstream.mes => match.scm} (100%)
 rename module/mes/{optargs.upstream.mes => optargs.scm} (100%)
 rename module/mes/{quasisyntax.upstream.mes => quasisyntax.scm} (100%)
 rename module/mes/{syntax.upstream.mes => syntax.scm} (100%)
 rename module/srfi/{srfi-1.upstream.mes => srfi-1.scm} (100%)
 rename module/srfi/{srfi-9.upstream.mes => srfi-9.scm} (100%)
 rename module/sxml/{xpath.upstream.mes => xpath.scm} (100%)

diff --git a/AUTHORS b/AUTHORS
index 83e5a9e0..426f375e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,8 +4,8 @@ All files except the files listed below
 
 Based on Scheme48's scheme/alt
 module/mes/record.mes
-module/mes/syntax.upstream.mes
-module/srfi/srfi-9.upstream.mes
+module/mes/syntax.scm
+module/srfi/srfi-9.scm
 
 Based on Guile ECMAScript
 module/language/c/lexer.mes
@@ -14,20 +14,20 @@ Included verbatim from gnulib
 build-aux/gitlog-to-changelog
 
 Portable hygienic pattern matcher
-module/mes/match.upstream.mes
+module/mes/match.scm
 
 Portable LALR(1) parser generator
-module/mes/lalr.upstream.mes
+module/mes/lalr.scm
 
 Portable syntax-case from Chez Scheme
 module/mes/psyntax.ss
 module/mes/psyntax-pp.mes [generated]
 
 Optargs from Guile
-module/mes/optargs.upstream.mes
+module/mes/optargs.scm
 
 Srfi-1 bits from Guile
-module/srfi/srfi-1.upstream.mes
+module/srfi/srfi-1.scm
 
-Sxml xpath from Guile
-module/sxml/xpath.upstream.mes
\ No newline at end of file
+Sxml bits from Guile
+module/sxml/xpath.scm
\ No newline at end of file
diff --git a/guile/mes/nyacc b/guile/mes/nyacc
new file mode 120000
index 00000000..dff38cc7
--- /dev/null
+++ b/guile/mes/nyacc
@@ -0,0 +1 @@
+../../module/nyacc
\ No newline at end of file
diff --git a/guile/nyacc-calc.scm b/guile/nyacc-calc.scm
index a4632921..a906231c 100755
--- a/guile/nyacc-calc.scm
+++ b/guile/nyacc-calc.scm
@@ -1,6 +1,6 @@
 #! /bin/sh
 # -*-scheme-*-
-exec ${GUILE-guile} -L $(pwd)/module -e '(nyacc)' -s "$0" "$@"
+exec ${GUILE-guile} -L $(pwd)/guile/mes -e '(nyacc)' -s "$0" "$@"
 !#
 
 ;;; Mes --- The Maxwell Equations of Software
diff --git a/guile/nyacc.scm b/guile/nyacc.scm
index 9a16d4d4..ea227dcf 100755
--- a/guile/nyacc.scm
+++ b/guile/nyacc.scm
@@ -1,6 +1,6 @@
 #! /bin/sh
 # -*-scheme-*-
-exec ${GUILE-guile} -L $(pwd)/module -e '(nyacc)' -s "$0" "$@"
+exec ${GUILE-guile} -L $(pwd)/guile/mes -e '(nyacc)' -s "$0" "$@"
 !#
 
 ;;; Mes --- The Maxwell Equations of Software
diff --git a/module/mes/lalr.mes b/module/mes/lalr.mes
index 3eaffd11..c34520b4 100644
--- a/module/mes/lalr.mes
+++ b/module/mes/lalr.mes
@@ -25,4 +25,4 @@
 (mes-use-module (mes scm))
 (mes-use-module (mes syntax))
 (mes-use-module (srfi srfi-9))
-(mes-use-module (mes lalr.upstream))
+(include-from-path "mes/lalr.scm")
diff --git a/module/mes/lalr.upstream.mes b/module/mes/lalr.scm
similarity index 100%
rename from module/mes/lalr.upstream.mes
rename to module/mes/lalr.scm
diff --git a/module/mes/match.mes b/module/mes/match.mes
index 95b51dbe..04c56b95 100644
--- a/module/mes/match.mes
+++ b/module/mes/match.mes
@@ -23,4 +23,4 @@
 ;;; portable matcher
 
 (mes-use-module (mes syntax))
-(mes-use-module (mes match.upstream))
+(include-from-path "mes/match.scm")
diff --git a/module/mes/match.upstream.mes b/module/mes/match.scm
similarity index 100%
rename from module/mes/match.upstream.mes
rename to module/mes/match.scm
diff --git a/module/mes/optargs.mes b/module/mes/optargs.mes
index 0b8db04b..7b67b609 100644
--- a/module/mes/optargs.mes
+++ b/module/mes/optargs.mes
@@ -31,4 +31,5 @@
 
 (define-macro (set-procedure-property! proc key value)
   proc)
-(mes-use-module (mes optargs.upstream))
+
+(include-from-path "mes/optargs.scm")
diff --git a/module/mes/optargs.upstream.mes b/module/mes/optargs.scm
similarity index 100%
rename from module/mes/optargs.upstream.mes
rename to module/mes/optargs.scm
diff --git a/module/mes/quasisyntax.mes b/module/mes/quasisyntax.mes
index 31271344..626abb9a 100644
--- a/module/mes/quasisyntax.mes
+++ b/module/mes/quasisyntax.mes
@@ -24,4 +24,4 @@
 
 (mes-use-module (mes psyntax))
 (define syntax-violation error)
-(mes-use-module (mes quasisyntax.upstream))
+(include-from-path "mes/quasisyntax.scm")
diff --git a/module/mes/quasisyntax.upstream.mes b/module/mes/quasisyntax.scm
similarity index 100%
rename from module/mes/quasisyntax.upstream.mes
rename to module/mes/quasisyntax.scm
diff --git a/module/mes/syntax.mes b/module/mes/syntax.mes
index 48725660..2a6ac581 100644
--- a/module/mes/syntax.mes
+++ b/module/mes/syntax.mes
@@ -26,7 +26,7 @@
 
 ;;; Code:
 (mes-use-module (mes scm))
-(mes-use-module (mes syntax.upstream))
+(include-from-path "mes/syntax.scm")
 
 (define (syntax-error message thing)
   (display "syntax-error:" (current-error-port))
diff --git a/module/mes/syntax.upstream.mes b/module/mes/syntax.scm
similarity index 100%
rename from module/mes/syntax.upstream.mes
rename to module/mes/syntax.scm
diff --git a/module/srfi/srfi-1.mes b/module/srfi/srfi-1.mes
index 144b851c..4f9315e2 100644
--- a/module/srfi/srfi-1.mes
+++ b/module/srfi/srfi-1.mes
@@ -3,7 +3,7 @@
 ;;; Mes --- Maxwell Equations of Software
 ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;
-;;; srfi-1.mes: This file is part of Mes.
+;;; This file is part of Mes.
 ;;;
 ;;; Mes is free software; you can redistribute it and/or modify it
 ;;; under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 
 ;;; Commentary:
 
-;;; srfi-1.mes is the miminimal srfi-1 needed to run mescc.
+;;; srfi-1.mes is the minimal srfi-1 needed to run mescc.
 
 ;;; Code:
 
@@ -70,4 +70,4 @@
           (set-cdr! lst result)
           (loop tail lst)))))
 
-(mes-use-module (srfi srfi-1.upstream))
+(include-from-path "srfi/srfi-1.scm")
diff --git a/module/srfi/srfi-1.upstream.mes b/module/srfi/srfi-1.scm
similarity index 100%
rename from module/srfi/srfi-1.upstream.mes
rename to module/srfi/srfi-1.scm
diff --git a/module/srfi/srfi-9-psyntax.mes b/module/srfi/srfi-9-psyntax.mes
index e44976ea..78ab8b9f 100644
--- a/module/srfi/srfi-9-psyntax.mes
+++ b/module/srfi/srfi-9-psyntax.mes
@@ -26,4 +26,4 @@
 (mes-use-module (mes psyntax))
 (mes-use-module (mes record-0))
 (mes-use-module (mes record))
-(mes-use-module (srfi srfi-9.upstream))
+(include-from-path "srfi/srfi-9.scm")
diff --git a/module/srfi/srfi-9.mes b/module/srfi/srfi-9.mes
index 05714a93..104c188e 100644
--- a/module/srfi/srfi-9.mes
+++ b/module/srfi/srfi-9.mes
@@ -26,4 +26,4 @@
 (mes-use-module (mes syntax))
 (mes-use-module (mes record-0))
 (mes-use-module (mes record))
-(mes-use-module (srfi srfi-9.upstream))
+(include-from-path "srfi/srfi-9.scm")
diff --git a/module/srfi/srfi-9.upstream.mes b/module/srfi/srfi-9.scm
similarity index 100%
rename from module/srfi/srfi-9.upstream.mes
rename to module/srfi/srfi-9.scm
diff --git a/module/sxml/xpath.mes b/module/sxml/xpath.mes
index 3168bfa0..41da96ea 100644
--- a/module/sxml/xpath.mes
+++ b/module/sxml/xpath.mes
@@ -23,4 +23,4 @@
 ;;; xpath
 
 (mes-use-module (mes scm))
-(mes-use-module (sxml xpath.upstream))
+(include-from-path "sxml/xpath.scm")
diff --git a/module/sxml/xpath.upstream.mes b/module/sxml/xpath.scm
similarity index 100%
rename from module/sxml/xpath.upstream.mes
rename to module/sxml/xpath.scm