Merge branch 'next-sensitive'

Makefile.in

@@ -255,7 +255,6 @@ CYGPATH_W = @CYGPATH_W@
 C_COMPILE = @C_COMPILE@
 C_LINK = @C_LINK@
 C_VERSION = @C_VERSION@
-DEFAULT_CS = @DEFAULT_CS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLIBS = @DLLIBS@

QUICK-INSTALL.md

@@ -19,7 +19,6 @@ four) step process:
 
     By default the following options are enabled, but can be disabled with the following `configure` options
 
-    - `--disable-case-sensitive`: symbols are case insensitive by default (as in R5RS)
     - `--disable-threads`: disable Posix threads support
     - `--disable-control-fast-math`: do not verify that parameters of fx/fl functions are correct fixnums/flonums
     - `--disable-ffi`: disable FFI (Foreign Function Interface) support
@@ -52,7 +51,6 @@ four) step process:
                     Loader:  ld
             Thread support:  yes
                FFI support:  yes
-    Case sensitive symbols:  yes
      Control fx parameters:  yes
      System libraries used:  ffi (3.4.6) pcre2 (10.44) gmp (6.3.0)
         Compiled libraries:  gc

configure

@@ -656,7 +656,6 @@ COMP_LIBS
 SYST_LIBS
 DLLIBS
 CONTROL_FX_PARAMETERS
-DEFAULT_CS
 CONF_SUMMARY
 THREADS
 RDLINE
@@ -813,7 +812,6 @@ ac_user_opts='
 enable_option_checking
 enable_silent_rules
 enable_dependency_tracking
-enable_case_sensitive
 enable_threads
 with_provided_gc
 with_provided_bignum
@@ -1465,7 +1463,6 @@ Optional Features:
                           do not reject slow dependency extractors
   --disable-dependency-tracking
                           speeds up one-time build
-  --enable-case-sensitive symbols are case sensitive (enabled by default)
   --enable-threads        enable Posix threads support (enabled by default)
   --enable-ffi            enable FFI support (enabled by default)
   --enable-fast-math-control
@@ -7207,21 +7204,6 @@ printf "%s\n" "#define HAVE_DLOPEN 1" >>confdefs.h
 
 fi
 
-###
-### Be case sensitive or not
-###
-# Check whether --enable-case-sensitive was given.
-if test ${enable_case_sensitive+y}
-then :
-  enableval=$enable_case_sensitive;
-fi
-
-
-case "$enable_case_sensitive" in
-  no|false|0) DEFAULT_CS=0; CASE_SENSITIVE=no;;
-  *)          DEFAULT_CS=1; CASE_SENSITIVE=yes;;
-esac
-
 
 ###
 ### To thread or not to thread?
@@ -8300,7 +8282,6 @@ fi
 
 
 
-
 # DOC
 
 
@@ -9855,7 +9836,6 @@ echo "     Compilation flags: " $CFLAGS
 echo "                Loader: " $LD
 echo "        Thread support: " $STR_THREADS
 echo "           FFI support: " $STR_FFI
-echo "Case sensitive symbols: " $CASE_SENSITIVE
 echo " Control fx parameters: " $CONTROL_FX
 echo " System libraries used: " $SYST_LIBS_SHOW
 echo "    Compiled libraries: " $COMP_LIBS_SHOW

configure.ac

@@ -207,18 +207,6 @@ then
   AC_DEFINE(HAVE_DLOPEN, 1, [System provides dlopen])
 fi
 
-###
-### Be case sensitive or not
-###
-AC_ARG_ENABLE(case-sensitive,
-  [AS_HELP_STRING([--enable-case-sensitive],
-                  [symbols are case sensitive (enabled by default)])])
-
-case "$enable_case_sensitive" in
-  no|false|0) DEFAULT_CS=0; CASE_SENSITIVE=no;;
-  *)          DEFAULT_CS=1; CASE_SENSITIVE=yes;;
-esac
-
 
 ###
 ### To thread or not to thread?
@@ -735,7 +723,6 @@ AC_SUBST(RDLINE)
 
 AC_SUBST(THREADS)
 AC_SUBST(CONF_SUMMARY)
-AC_SUBST(DEFAULT_CS)
 AC_SUBST(CONTROL_FX_PARAMETERS)
 AC_SUBST(DLLIBS)
 AC_SUBST(SYST_LIBS)
@@ -814,7 +801,6 @@ echo "     Compilation flags: " $CFLAGS
 echo "                Loader: " $LD
 echo "        Thread support: " $STR_THREADS
 echo "           FFI support: " $STR_FFI
-echo "Case sensitive symbols: " $CASE_SENSITIVE
 echo " Control fx parameters: " $CONTROL_FX
 echo " System libraries used: " $SYST_LIBS_SHOW
 echo "    Compiled libraries: " $COMP_LIBS_SHOW

doc/HTML/stklos-ref.html

@@ -11448,7 +11448,7 @@ <h4 id="_ports">4.12.1. Ports</h4>
 </div>
 </div>
 <div class="paragraph">
-<p>behaves as <code>call-with-input-file</code> except that the port passed to <code>proc</code>
+<p>behaves as <code>call-with1-input-file</code> except that the port passed to <code>proc</code>
 is the sting port obtained from <code>port</code>.</p>
 </div>
 <div class="listingblock">
@@ -12696,6 +12696,25 @@ <h4 id="_input">4.12.2. Input</h4>
 the SRFI document for more information.</p>
 </div>
 <div class="paragraph">
+<p><a id='P_read-ci'></a>
+</p>
+</div>
+<div class="paragraph rmargin text-right">
+<p><span class="rmargin small silver">R<sup>5</sup>RS procedure</span></p>
+</div>
+<div class="sidebarblock">
+<div class="content">
+<div class="paragraph small">
+<p><code><strong>(read-ci) </strong></code><br>
+<code><strong>(read-ci port) </strong></code><br></p>
+</div>
+</div>
+</div>
+<div class="paragraph">
+<p><code>Read-ci</code> result is identical to <code>read</code> except that symbols are always
+read as case insensitive.</p>
+</div>
+<div class="paragraph">
 <p>
 <a id='P_read-with-shared-structure'></a>
 </p>
@@ -13197,7 +13216,8 @@ <h4 id="_input">4.12.2. Input</h4>
 </table>
 </div>
 <div class="paragraph">
-<p><a id='P_read-from-string'></a>
+<p><a id='P_read-from-string'></a><a id='P_read-from-string-ci'></a>
+
 </p>
 </div>
 <div class="paragraph rmargin text-right">
@@ -13212,12 +13232,15 @@ <h4 id="_input">4.12.2. Input</h4>
 </div>
 <div class="paragraph">
 <p>Performs a read from the given <code>str</code>. If <code>str</code> is the empty string,
-an end of file object is returned.</p>
+an end of file object is returned. <code>Read-from-string-ci</code> uses <code>read-ci</code>
+to read.</p>
 </div>
 <div class="listingblock">
 <div class="content">
 <pre class="rouge highlight"><code data-lang="scheme"><span class="p">(</span><span class="nf">read-from-string</span> <span class="s">"123 456"</span><span class="p">)</span> <span class="nv">=&gt;</span> <span class="mi">123</span>
-<span class="p">(</span><span class="nf">read-from-string</span> <span class="s">""</span><span class="p">)</span>        <span class="nv">=&gt;</span> <span class="nv">an</span> <span class="nv">eof</span> <span class="nv">object</span></code></pre>
+<span class="p">(</span><span class="nf">read-from-string</span> <span class="s">""</span><span class="p">)</span>        <span class="nv">=&gt;</span> <span class="nv">an</span> <span class="nv">eof</span> <span class="nv">object</span>
+<span class="p">(</span><span class="nf">read-from-string</span> <span class="s">"ABC"</span><span class="p">)</span>     <span class="nv">=&gt;</span> <span class="nv">ABC</span>
+<span class="p">(</span><span class="nf">read-from-string-ci</span> <span class="s">"ABC"</span><span class="p">)</span>  <span class="nv">=&gt;</span> <span class="nv">abc</span></code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -25745,18 +25768,10 @@ <h3 id="_parameter_objects_2">10.1. Parameter Objects</h3>
 </div>
 <div class="paragraph">
 <p>This parameter object permits to change the default behaviour of
-the <code>read</code> primitive when reading a symbol. If this parameter has
-a true value a symbol is not converted to a default case when interned.
-Since R<sup>7</sup>RS requires that symbol are case insignificant, the default
-value  of this parameter is <code>#t</code>.</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="rouge highlight"><code data-lang="scheme"><span class="p">(</span><span class="nf">read-case-sensitive</span><span class="p">)</span>        <span class="nv">=&gt;</span> <span class="o">`</span><span class="no">#t</span><span class="o">`</span>
-<span class="p">(</span><span class="nf">read-from-string</span> <span class="s">"ABC"</span><span class="p">)</span>     <span class="nv">=&gt;</span> <span class="nv">ABC</span>
-<span class="p">(</span><span class="nf">read-case-sensitive</span> <span class="no">#f</span><span class="p">)</span>
-<span class="p">(</span><span class="nf">read-from-string</span> <span class="s">"ABC"</span><span class="p">)</span>     <span class="nv">=&gt;</span> <span class="nv">abc</span></code></pre>
-</div>
+the <code>read</code> primitive used on the current input port , when reading a symbol.
+If this parameter has a true value a symbol is not converted to a default
+case when interned. Since R<sup>7</sup>RS requires that symbol are case insignificant,
+the default value  of this parameter is <code>#t</code>.</p>
 </div>
 <div class="admonitionblock note">
 <table>
@@ -25768,8 +25783,8 @@ <h3 id="_parameter_objects_2">10.1. Parameter Objects</h3>
 <div class="ulist">
 <ul>
 <li>
-<p>Default behaviour can be changed for a whole execution
-with the <code>--case-sensitive</code> or <code>case-insensitive</code> options.</p>
+<p>This parameter works on the current input port only and cannot change
+read beahviour&#8217;s globally.</p>
 </li>
 <li>
 <p>See also syntax for <em><a href="#_symbols">special characters</a></em> in symbols.</p>
@@ -32548,7 +32563,7 @@ <h3 id="_stklos_compiler">A.2. STklos compiler</h3>
 <div class="content">
 <div class="paragraph small">
 <p><code><strong>(compile-file input output) </strong></code><br>
-<code><strong>(compile-file input output :prepend cmds) </strong></code><br></p>
+<code><strong>(compile-file input output #:prepend cmds #:case-sensitive cs) </strong></code><br></p>
 </div>
 </div>
 </div>
@@ -32558,10 +32573,22 @@ <h3 id="_stklos_compiler">A.2. STklos compiler</h3>
 deleted).</p>
 </div>
 <div class="paragraph">
-<p>If the <code>:prepend</code> keyword argument is given, it must be a list of
-expressions, which will be compiled before the rest of the input
-file. This can be used to define variables that the compiled program
-will use (but it does not affect the compiler itself).</p>
+<p>This command accepts two optional keywords:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><code>#:prepend</code> :  it must be a list of  expressions, which will be
+compiled before the rest of the input  file. This can be used
+to define variables that the compiled program  will use (but it
+does not affect the compiler itself).</p>
+</li>
+<li>
+<p><code>#:case-sensitive</code> : it tells if the compiler reads symbols in
+case sensitive mode (as R<sup>7</sup>RS) or not not (as R<sup>5</sup>RS).
+By default the compiler is in case sensitive mode.</p>
+</li>
+</ul>
 </div>
 <div class="paragraph">
 <p>This procedure will not set the executable bit on the generated file.</p>

doc/Makefile.in

@@ -209,7 +209,6 @@ CYGPATH_W = @CYGPATH_W@
 C_COMPILE = @C_COMPILE@
 C_LINK = @C_LINK@
 C_VERSION = @C_VERSION@
-DEFAULT_CS = @DEFAULT_CS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLIBS = @DLLIBS@

doc/hacking/Makefile.in

@@ -154,7 +154,6 @@ CYGPATH_W = @CYGPATH_W@
 C_COMPILE = @C_COMPILE@
 C_LINK = @C_LINK@
 C_VERSION = @C_VERSION@
-DEFAULT_CS = @DEFAULT_CS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLIBS = @DLLIBS@

doc/pp/Makefile.in

@@ -154,7 +154,6 @@ CYGPATH_W = @CYGPATH_W@
 C_COMPILE = @C_COMPILE@
 C_LINK = @C_LINK@
 C_VERSION = @C_VERSION@
-DEFAULT_CS = @DEFAULT_CS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLIBS = @DLLIBS@

doc/refman/Makefile.am

@@ -12,7 +12,7 @@ SOURCES  = biblio.adoc cond.adoc custom.adoc expr.adoc ffi.adoc          \
            progstruct.adoc regexp.adoc slib.adoc srfi.adoc stdproc.adoc  \
            stklos.adoc threads.adoc
 DOCDB    = ../DOCDB
-SPP      = $(STKLOS_BINARY) -q -I ../../lib -f ../../utils/stklos-pp.stk --
+SPP      = $(STKLOS_BINARY) -c -q -I ../../lib -f ../../utils/stklos-pp.stk --
 
 HTMLMAIN  = stklos-ref.html
 HTMLMULTI = stklos-ref-multi.html

doc/refman/Makefile.in

@@ -169,7 +169,6 @@ CYGPATH_W = @CYGPATH_W@
 C_COMPILE = @C_COMPILE@
 C_LINK = @C_LINK@
 C_VERSION = @C_VERSION@
-DEFAULT_CS = @DEFAULT_CS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLIBS = @DLLIBS@
@@ -311,7 +310,7 @@ SOURCES = biblio.adoc cond.adoc custom.adoc expr.adoc ffi.adoc          \
            stklos.adoc threads.adoc
 
 DOCDB = ../DOCDB
-SPP = $(STKLOS_BINARY) -q -I ../../lib -f ../../utils/stklos-pp.stk --
+SPP = $(STKLOS_BINARY) -c -q -I ../../lib -f ../../utils/stklos-pp.stk --
 HTMLMAIN = stklos-ref.html
 HTMLMULTI = stklos-ref-multi.html
 MULTI_AUX = FDL.html                                        \

doc/refman/stdproc.adoc

@@ -566,6 +566,7 @@ primitives.
 
 ==== Input
 {{insertdoc 'read}}
+{{insertdoc 'read-ci}}
 ((("SRFI-38")))
 {{insertdoc 'read-with-shared-structure}}
 [#readerctor]

doc/stklos.1.in

@@ -92,12 +92,10 @@ increase the debugging level;
 .IP "-s, --stack-size=n"
 use a stack of \fBn\fR cells.
 .IP "--case-insensitive"
-be case insensitive as in R5RS (see below).
+be case insensitive as in R5RS.
 .IP "-c, --case-sensitive"
-be case sensitive as in R7RS. This is the default value (unless \fBstklos\fR
-has been built with the \fI--disable-case-sensitive\fR configure
-option). This option (and the previous one) permits to change the default
-behavior.
+be case sensitive as in R7RS. This is the default value. This option
+(and the previous one) permits to change the default behavior.
 .IP "-u yes|no, --utf8-encoding=yes|no"
 At initialisation time, \fBSTklos\fR infers the current locale from the
 \fILC_ALL\fR variable. From the character encoding used in the selected

doc/vm/Makefile.in

@@ -154,7 +154,6 @@ CYGPATH_W = @CYGPATH_W@
 C_COMPILE = @C_COMPILE@
 C_LINK = @C_LINK@
 C_VERSION = @C_VERSION@
-DEFAULT_CS = @DEFAULT_CS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLIBS = @DLLIBS@

examples/C-module/Makefile-sample

@@ -42,7 +42,7 @@ all: $(SHARED_OBJ)
 # string-obfuscate-incl.c, so it will be included in the library C file
 # later:
 string-obfuscate-incl.c: $(SCHEME_SOURCE) $(C_INCL)
-	stklos-compile --no-time \
+	stklos-compile -c --no-time \
 	-C \
 	--output=$(C_INCL) \
 	$(SCHEME_SOURCE)

examples/C-module/Makefile.in

@@ -35,7 +35,7 @@ STKLOS_LIBS=../../lib
 # directory without a prior installation of STklos. If you have already
 # installed STklos on your machine , you can use the second (commented)
 # definition of this variable
-STKLOS_COMPILE=$(STKLOS_SRC)/stklos -q -I $(STKLOS_LIBS) \
+STKLOS_COMPILE=$(STKLOS_SRC)/stklos -c -q -I $(STKLOS_LIBS) \
 		$(STKLOS_UTILS)/stklos-compile
 # STKLOS_COMPILE=stklos-compile
 

examples/Makefile.in

@@ -204,7 +204,6 @@ CYGPATH_W = @CYGPATH_W@
 C_COMPILE = @C_COMPILE@
 C_LINK = @C_LINK@
 C_VERSION = @C_VERSION@
-DEFAULT_CS = @DEFAULT_CS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLIBS = @DLLIBS@

extensions/Makefile.in

@@ -159,7 +159,6 @@ CYGPATH_W = @CYGPATH_W@
 C_COMPILE = @C_COMPILE@
 C_LINK = @C_LINK@
 C_VERSION = @C_VERSION@
-DEFAULT_CS = @DEFAULT_CS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLIBS = @DLLIBS@

extensions/curl/Makefile.in

@@ -216,7 +216,6 @@ CYGPATH_W = @CYGPATH_W@
 C_COMPILE = @C_COMPILE@
 C_LINK = @C_LINK@
 C_VERSION = @C_VERSION@
-DEFAULT_CS = @DEFAULT_CS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLIBS = @DLLIBS@

extensions/curl/demos/Makefile.in

@@ -155,7 +155,6 @@ CYGPATH_W = @CYGPATH_W@
 C_COMPILE = @C_COMPILE@
 C_LINK = @C_LINK@
 C_VERSION = @C_VERSION@
-DEFAULT_CS = @DEFAULT_CS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLIBS = @DLLIBS@

extensions/curl/doc/Makefile.in

@@ -154,7 +154,6 @@ CYGPATH_W = @CYGPATH_W@
 C_COMPILE = @C_COMPILE@
 C_LINK = @C_LINK@
 C_VERSION = @C_VERSION@
-DEFAULT_CS = @DEFAULT_CS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLIBS = @DLLIBS@