From 73d3eae406610085991c2b6f9c92432cac269e6d Mon Sep 17 00:00:00 2001
From: Peter Bex <peter.bex@xs4all.nl>
Date: Sun, 2 Feb 2014 21:09:22 +0100
Subject: [PATCH] Do not use a private namespace for the "csi" program
This is unnecessary as it does not share hidden variables with any
other separately compiled unit.
This also removes the (unused) private-namespace dependency from
the extras and srfi-69 units.
---
csi.scm | 18 +++++++-----------
rules.make | 8 ++++----
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/csi.scm b/csi.scm
index 3565a5f..996ba40 100644
a
|
b
|
EOF |
44 | 44 | |
45 | 45 | (include "banner") |
46 | 46 | |
47 | | (private csi |
48 | | print-usage print-banner |
49 | | run hexdump |
50 | | parse-option-string chop-separator lookup-script-file |
51 | | report describe dump hexdump bytevector-data get-config |
52 | | tty-input? |
53 | | history-list history-count history-add history-ref history-clear history-show) |
54 | | |
55 | 47 | (declare |
56 | 48 | (always-bound |
57 | 49 | ##sys#windows-platform) |
58 | | (hide parse-option-string bytevector-data member* canonicalize-args |
| 50 | (hide chop-separator run report |
| 51 | describe dump hexdump get-config tty-input? |
| 52 | print-usage print-banner lookup-script-file |
| 53 | parse-option-string bytevector-data member* canonicalize-args |
59 | 54 | describer-table dirseparator? circular-list? improper-pairs? |
60 | 55 | show-frameinfo selected-frame select-frame copy-from-frame |
61 | | findall command-table default-editor csi-eval) ) |
62 | | |
| 56 | findall command-table default-editor csi-eval |
| 57 | history-list history-count history-add history-ref |
| 58 | history-clear history-show)) |
63 | 59 | |
64 | 60 | ;;; Parameters: |
65 | 61 | |
diff --git a/rules.make b/rules.make
index b52bdf8..a836a6a 100644
a
|
b
|
expand.c: $(SRCDIR)expand.scm $(SRCDIR)synrules.scm $(SRCDIR)common-declarations |
506 | 506 | $(bootstrap-lib) |
507 | 507 | modules.c: $(SRCDIR)modules.scm $(SRCDIR)common-declarations.scm |
508 | 508 | $(bootstrap-lib) |
509 | | extras.c: $(SRCDIR)extras.scm $(SRCDIR)private-namespace.scm $(SRCDIR)common-declarations.scm |
| 509 | extras.c: $(SRCDIR)extras.scm $(SRCDIR)common-declarations.scm |
510 | 510 | $(bootstrap-lib) |
511 | 511 | posixunix.c: $(SRCDIR)posixunix.scm $(SRCDIR)posix-common.scm $(SRCDIR)common-declarations.scm |
512 | 512 | $(bootstrap-lib) |
513 | 513 | posixwin.c: $(SRCDIR)posixwin.scm $(SRCDIR)posix-common.scm $(SRCDIR)common-declarations.scm |
514 | 514 | $(bootstrap-lib) |
515 | 515 | srfi-69.c: $(SRCDIR)srfi-69.scm $(SRCDIR)common-declarations.scm |
516 | | $(bootstrap-lib) -extend $(SRCDIR)private-namespace.scm |
| 516 | $(bootstrap-lib) |
517 | 517 | irregex.c: $(SRCDIR)irregex.scm $(SRCDIR)irregex-core.scm $(SRCDIR)irregex-utils.scm $(SRCDIR)common-declarations.scm |
518 | 518 | $(bootstrap-lib) |
519 | 519 | # |
… |
… |
endef |
574 | 574 | $(foreach obj, $(COMPILER_OBJECTS_1),\ |
575 | 575 | $(eval $(call declare-bootstrap-compiler-object,$(obj)))) |
576 | 576 | |
577 | | csi.c: $(SRCDIR)csi.scm $(SRCDIR)banner.scm $(SRCDIR)private-namespace.scm |
578 | | $(CHICKEN) $< $(CHICKEN_PROGRAM_OPTIONS) -output-file $@ -extend $(SRCDIR)private-namespace.scm |
| 577 | csi.c: $(SRCDIR)csi.scm $(SRCDIR)banner.scm |
| 578 | $(CHICKEN) $< $(CHICKEN_PROGRAM_OPTIONS) -output-file $@ |
579 | 579 | chicken-profile.c: $(SRCDIR)chicken-profile.scm |
580 | 580 | $(CHICKEN) $< $(CHICKEN_PROGRAM_OPTIONS) -output-file $@ |
581 | 581 | chicken-install.c: $(SRCDIR)chicken-install.scm setup-download.c setup-api.c |