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

@@ -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
+Sxml bits from Guile
+module/sxml/xpath.scm

guile/mes/nyacc

@@ -0,0 +1 @@
+../../module/nyacc

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

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

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")

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")

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")

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")

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))

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")

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")

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")

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")