Ticket #1077: 0001-Do-not-use-a-private-namespace-for-the-csi-program.patch

File 0001-Do-not-use-a-private-namespace-for-the-csi-program.patch, 3.1 KB (added by sjamaan, 9 years ago)

Remove private namespace for csi

  • csi.scm

    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 
    4444
    4545(include "banner")
    4646
    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 
    5547(declare
    5648  (always-bound
    5749    ##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
    5954        describer-table dirseparator? circular-list? improper-pairs?
    6055        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))
    6359
    6460;;; Parameters:
    6561
  • rules.make

    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 
    506506        $(bootstrap-lib)
    507507modules.c: $(SRCDIR)modules.scm $(SRCDIR)common-declarations.scm
    508508        $(bootstrap-lib)
    509 extras.c: $(SRCDIR)extras.scm $(SRCDIR)private-namespace.scm $(SRCDIR)common-declarations.scm
     509extras.c: $(SRCDIR)extras.scm $(SRCDIR)common-declarations.scm
    510510        $(bootstrap-lib)
    511511posixunix.c: $(SRCDIR)posixunix.scm $(SRCDIR)posix-common.scm $(SRCDIR)common-declarations.scm
    512512        $(bootstrap-lib)
    513513posixwin.c: $(SRCDIR)posixwin.scm $(SRCDIR)posix-common.scm $(SRCDIR)common-declarations.scm
    514514        $(bootstrap-lib)
    515515srfi-69.c: $(SRCDIR)srfi-69.scm $(SRCDIR)common-declarations.scm
    516         $(bootstrap-lib) -extend $(SRCDIR)private-namespace.scm
     516        $(bootstrap-lib)
    517517irregex.c: $(SRCDIR)irregex.scm $(SRCDIR)irregex-core.scm $(SRCDIR)irregex-utils.scm $(SRCDIR)common-declarations.scm
    518518        $(bootstrap-lib)
    519519#
    endef 
    574574$(foreach obj, $(COMPILER_OBJECTS_1),\
    575575          $(eval $(call declare-bootstrap-compiler-object,$(obj))))
    576576
    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
     577csi.c: $(SRCDIR)csi.scm $(SRCDIR)banner.scm
     578        $(CHICKEN) $< $(CHICKEN_PROGRAM_OPTIONS) -output-file $@
    579579chicken-profile.c: $(SRCDIR)chicken-profile.scm
    580580        $(CHICKEN) $< $(CHICKEN_PROGRAM_OPTIONS) -output-file $@
    581581chicken-install.c: $(SRCDIR)chicken-install.scm setup-download.c setup-api.c