From ac5d303b6ce7db61a8bd5af3ec0299118e6a7843 Mon Sep 17 00:00:00 2001
From: Marius Vollmer <mvo@zagadka.de>
Date: Wed, 1 Dec 2004 00:02:24 +0000
Subject: [PATCH] * boot-9.scm (app, %app): Renamed former to the latter.
 Previously, 'app' was reserved in every module.  Now '%app' is reserved,
 which is slightly better.  The real fix is to not use 'local-ref' etc to find
 modules.  Changed all uses. * syncase.scm: Changed 'app' to '%app'.

---
 ice-9/boot-9.scm  | 17 +++++++++--------
 ice-9/syncase.scm |  4 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ice-9/boot-9.scm b/ice-9/boot-9.scm
index 27658841e..defab8bfb 100644
--- a/ice-9/boot-9.scm
+++ b/ice-9/boot-9.scm
@@ -1788,12 +1788,12 @@
 
 
 
-;;; {The (app) module}
+;;; {The (%app) module}
 ;;;
 ;;; The root of conventionally named objects not directly in the top level.
 ;;;
-;;; (app modules)
-;;; (app modules guile)
+;;; (%app modules)
+;;; (%app modules guile)
 ;;;
 ;;; The directory of all modules and the standard root module.
 ;;;
@@ -1844,7 +1844,7 @@
 ;; NOTE: This binding is used in libguile/modules.c.
 ;;
 (define (resolve-module name . maybe-autoload)
-  (let ((full-name (append '(app modules) name)))
+  (let ((full-name (append '(%app modules) name)))
     (let ((already (nested-ref the-root-module full-name)))
       (if already
 	  ;; The module already exists...
@@ -1876,11 +1876,12 @@
 ;;
 (set-current-module the-root-module)
 
-(define app (make-module 31))
-(local-define '(app modules) (make-module 31))
-(local-define '(app modules guile) the-root-module)
+(define %app (make-module 31))
+(define app %app) ;; for backwards compatability
+(local-define '(%app modules) (make-module 31))
+(local-define '(%app modules guile) the-root-module)
 
-;; (define-special-value '(app modules new-ws) (lambda () (make-scm-module)))
+;; (define-special-value '(%app modules new-ws) (lambda () (make-scm-module)))
 
 (define (try-load-module name)
   (or (begin-deprecated (try-module-linked name))
diff --git a/ice-9/syncase.scm b/ice-9/syncase.scm
index e233fd7e9..526cc2255 100644
--- a/ice-9/syncase.scm
+++ b/ice-9/syncase.scm
@@ -214,7 +214,7 @@
 ;; (use-syntax sc-expand)
 ;; (load-from-path "ice-9/psyntax.ss")
 
-(define internal-eval (nested-ref the-scm-module '(app modules guile eval)))
+(define internal-eval (nested-ref the-scm-module '(%app modules guile eval)))
 
 (define (eval x environment)
   (internal-eval (if (and (pair? x)
@@ -224,7 +224,7 @@
 		 environment))
 
 ;;; Hack to make syncase macros work in the slib module
-(let ((m (nested-ref the-root-module '(app modules ice-9 slib))))
+(let ((m (nested-ref the-root-module '(%app modules ice-9 slib))))
   (if m
       (set-object-property! (module-local-variable m 'define)
 			    '*sc-expander*
-- 
2.20.1