Merge github.com:cisco/ChezScheme

original commit: bb65f1a8e429683e2925cf1678145efe0ade59bb

BUILDING

@@ -210,11 +210,16 @@ env OS=Windows_NT make
 Prerequisites:
 
 * Bash/WSL, MinGW/MSYS, or Cygwin with bash, git, grep, make, sed, etc.
-* Microsoft Visual Studio 2017 or 2015
+* Microsoft Visual Studio 2019, 2017, or 2015
 * WiX Toolset (for making an install)
 
 Be sure that git config core.autocrlf is set to false.
 
+If you're using Visual Studio 2019, install "Desktop development with C++"
+on the "Workloads" tabs and the "C++ 2019 Redistributable MSMs" on the
+"Individual components" tab under the "Compilers, build tools, and runtimes"
+section.
+
 To run Chez Scheme or Petite Chez Scheme from a Windows command prompt,
 set PATH:
 

LOG

@@ -1411,3 +1411,9 @@
 - fix signatures of $annotation-options, $fasl-strip-options,
   $file-options, and $library-requirements-options
     primdata.ss
+- small fix in relop-length to enable the optimization
+    cpnanopass.ss
+- make test for relop-length more sensitive
+    5_2.ms
+- added support for Microsoft Visual Studio 2019 on Windows
+    BUILDING, c/vs.bat, wininstall/locate-vcredist.bat

c/vs.bat

@@ -7,6 +7,22 @@ set Applications=%ProgramFiles%
 :: Set up Visual Studio command line environment variables given a
 :: machine type, e.g., amd64 or x86.
 
+:: Visual Studio 2019 Enterprise
+set BATDIR=%Applications%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build
+if exist "%BATDIR%\vcvarsall.bat" goto found
+
+:: Visual Studio 2019 Professional
+set BATDIR=%Applications%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build
+if exist "%BATDIR%\vcvarsall.bat" goto found
+
+:: Visual Studio 2019 Community
+set BATDIR=%Applications%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build
+if exist "%BATDIR%\vcvarsall.bat" goto found
+
+:: Visual Studio 2019 BuildTools
+set BATDIR=%Applications%\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build
+if exist "%BATDIR%\vcvarsall.bat" goto found
+
 :: Visual Studio 2017 Enterprise
 set BATDIR=%Applications%\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build
 if exist "%BATDIR%\vcvarsall.bat" goto found

mats/5_2.ms

@@ -188,7 +188,7 @@
           [(_ prim)
            (let ()
              (define (f x)
-               (and
+               (list
                  (prim (#3%length x) 0)
                  (prim 0 (#3%length x))
                  (prim (#3%length x) 1)
@@ -204,7 +204,7 @@
                  (let ([n (length x)])
                    (equal?
                      (f x)
-                     (and
+                     (list
                        (prim n 0)
                        (prim 0 n)
                        (prim n 1)

s/cpnanopass.ss

@@ -3885,8 +3885,8 @@
           (define RELOP< -2)
           (define RELOP<= -1)
           (define RELOP= 0)
-          (define RELOP>= 2)
-          (define RELOP> 1)
+          (define RELOP>= 1)
+          (define RELOP> 2)
           (define (mirror op) (fx- op))
           (define go
             (lambda (op e n)
@@ -3939,7 +3939,7 @@
           (define relop-length
             (case-lambda
               [(op e) (relop-length1 op e 0)]
-              [(op e1 e2) (or (relop-length2 op e1 e2) (relop-length2 (mirror op) e1 e2))])))
+              [(op e1 e2) (or (relop-length2 op e1 e2) (relop-length2 (mirror op) e2 e1))])))
         (define make-ftype-pointer-equal?
           (lambda (e1 e2)
             (bind #f (e1 e2)

wininstall/locate-vcredist.bat

@@ -7,7 +7,7 @@
   SET "Path64=%CommonProgramFiles(x86)%\Merge Modules\Microsoft_VC140_CRT_x64.msm"
 )
 
-@IF "%VisualStudioVersion%"=="15.0" (
+@IF "%VisualStudioVersion%"=="15.0" or "%VisualStudioVersion%"=="16.0" (
   @PUSHD "%VCINSTALLDIR%Redist\MSVC"
   @FOR /D %%D IN (*) DO (
     @PUSHD %%D