refine library entries, adjust tag tests, and bump version number

Also, correct number in "release_notes.stex" and the title of an
unrelated (but nearby) entry there.

Author: mflatt

boot/pb/equates.h

@@ -1,4 +1,4 @@
-/* equates.h for Chez Scheme Version 10.3.0-pre-release.1 */
+/* equates.h for Chez Scheme Version 10.3.0-pre-release.2 */
 
 /* Do not edit this file.  It is automatically generated and */
 /* specifically tailored to the version of Chez Scheme named */
@@ -335,7 +335,7 @@ typedef uint64_t U64;
 #define int_bits 0x20
 #define integer_divide_instruction 1
 #define keyboard_interrupt_index 0x3
-#define library_entry_vector_size 0x272
+#define library_entry_vector_size 0x276
 #define libspec_closure_index 0xD
 #define libspec_does_not_expect_headroom_index 0x0
 #define libspec_error_index 0xE
@@ -1015,7 +1015,7 @@ typedef uint64_t U64;
 #define rtd_sealed 0x4
 #define sbwp (ptr)0x4E
 #define scaled_shot_1_shot_flag -0x8
-#define scheme_version 0xA030001
+#define scheme_version 0xA030002
 #define seginfo_generation_disp 0x1
 #define seginfo_list_bits_disp 0x8
 #define seginfo_space_disp 0x0
@@ -1649,5 +1649,5 @@ typedef uint64_t U64;
 /* library entries we access from C code */
 #define library_nonprocedure_code 162
 #define library_dounderflow 164
-#define library_popcount_slow 622
-#define library_cpu_features 624
+#define library_popcount_slow 626
+#define library_cpu_features 628

boot/pb/petite.boot

@@ -1,4 +1,4 @@
-/* scheme.h for Chez Scheme Version 10.3.0-pre-release.1 (pb) */
+/* scheme.h for Chez Scheme Version 10.3.0-pre-release.2 (pb) */
 
 /* Do not edit this file.  It is automatically generated and */
 /* specifically tailored to the version of Chez Scheme named */
@@ -40,7 +40,7 @@
 #endif
 
 /* Chez Scheme Version and machine type */
-#define VERSION "10.3.0-pre-release.1"
+#define VERSION "10.3.0-pre-release.2"
 #define MACHINE_TYPE "pb"
 
 /* Integer typedefs */

boot/pb/scheme.boot

@@ -116,14 +116,14 @@ Online versions of both books can be found at
 %-----------------------------------------------------------------------------
 \section{Functionality Changes}\label{section:functionality}
 
-\subsection{Support for setting the default history file location using the \scheme{CHEZSCHEME_HISTORY} environment variable}
+\subsection{New \scheme{CHEZSCHEME_HISTORY} environment variable (10.3.0)}
 
 If the environment variable \scheme{CHEZSCHEME_HISTORY} is set during
 startup, and the \scheme{--eehistory} command-line option isn't used,
 the value of said environment variable will determine the history file
 location that will be used.
 
-\subsection{Inlined numeric predicates during compilation (10.4.0)}
+\subsection{Inlined numeric predicates during compilation (10.3.0)}
 
 The compiler inlines more numeric predicates during the compilation,
 in particular \scheme{real?}, \scheme{rational?}, \scheme{exact?}

boot/pb/scheme.h

@@ -357,7 +357,7 @@
 ;; ---------------------------------------------------------------------
 ;; Version and machine types:
 
-(define-constant scheme-version #x0a030001) ; <-- TODO: update this
+(define-constant scheme-version #x0a030002)
 
 (define-syntax define-machine-types
   (lambda (x)
@@ -2983,7 +2983,8 @@
      (bytevector-ieee-double-native-ref #f 2 #t #t)
      (bytevector-ieee-double-native-set! #f 2 #t #t)
      (real->flonum #f 2 #f #t)
-     ($number-oops #f 2 #t #t)
+     (exact? #f 1 #t #t)
+     (inexact? #f 1 #t #t)
      (unsafe-port-eof? #f 1 #f #t)
      (unsafe-lookahead-u8 #f 1 #f #t)
      (unsafe-unget-u8 #f 2 #f #t)

release_notes/release_notes.stex

@@ -411,6 +411,13 @@
       (syntax-rules ()
         [(_ multiple-ref? (b ...) e)
          ($bind dirty-store-binder multiple-ref? ptr (b ...) e)]))
+    (define-syntax bind-type-object-type ; NB: caller must bind expr
+      (syntax-rules ()
+        [(_ ([id expr]) body)
+         (build-and
+          (%type-check mask-typed-object type-typed-object ,expr)
+          (bind #t ([id (%mref ,expr ,(constant typed-object-type-disp))])
+            body))]))
     (define lift-fp-unboxed
       (lambda (k)
         (lambda (e)
@@ -532,10 +539,7 @@
             ;; by counter-productive by introducing too many branches
             (build-simple-or
              (%type-check mask-flonum type-flonum ,e1)
-             (build-and
-              (%type-check mask-typed-object type-typed-object ,e1)
-              (%type-check mask-other-number type-other-number
-                ,(%mref ,e1 ,(constant bignum-type-disp)))))
+             (%typed-object-check mask-other-number type-other-number ,e1))
             (build-libcall #f src sexpr eqv? e1 e2))))))
     (define make-build-eqv?
       (lambda (src sexpr)
@@ -3111,18 +3115,20 @@
                  (build-and
                    (%type-check mask-flonum type-flonum ,e)
                    `(call ,(make-info-call src sexpr #f #f #f) #f ,(lookup-primref 3 'flfinite?) ,e))
-                 (build-simple-or
-                   (%typed-object-check mask-bignum type-bignum ,e)
-                   (%typed-object-check mask-ratnum type-ratnum ,e)))))])
+                 (bind-type-object-type ([t e])
+                   (build-simple-or
+                     (%type-check mask-bignum type-bignum ,t)
+                     (%type-check mask-ratnum type-ratnum ,t))))))])
     (define-inline 2 real?
       [(e) (bind #t (e)
              (build-simple-or
                (%type-check mask-fixnum type-fixnum ,e)
                (build-simple-or
                  (%type-check mask-flonum type-flonum ,e)
-                 (build-simple-or
-                   (%typed-object-check mask-bignum type-bignum ,e)
-                   (%typed-object-check mask-ratnum type-ratnum ,e)))))])
+                 (bind-type-object-type ([t e])
+                   (build-simple-or
+                     (%type-check mask-bignum type-bignum ,t)
+                     (%type-check mask-ratnum type-ratnum ,t))))))])
     (define-inline 2 inexact?
       [(e) (bind #t (e)
              (build-and
@@ -3132,12 +3138,8 @@
                  (build-simple-or
                    (%typed-object-check mask-inexactnum type-inexactnum ,e)
                    (build-and
-                     (build-not
-                       (build-and
-                         (%type-check mask-typed-object type-typed-object ,e)
-                         (%type-check mask-other-number type-other-number
-                           ,(%mref ,e ,(constant bignum-type-disp)))))
-                     (build-libcall #t src sexpr $number-oops `(quote inexact?) e))))))])
+                     (build-not (%typed-object-check mask-other-number type-other-number ,e))
+                     (build-libcall #t src sexpr inexact? e))))))])
     (define-inline 2 exact?
       [(e) (bind #t (e)
              (build-simple-or
@@ -3147,11 +3149,8 @@
                  (build-and
                    (build-not (%typed-object-check mask-inexactnum type-inexactnum ,e))
                    (build-simple-or
-                     (build-and
-                       (%type-check mask-typed-object type-typed-object ,e)
-                       (%type-check mask-other-number type-other-number
-                         ,(%mref ,e ,(constant bignum-type-disp))))
-                     (build-libcall #t src sexpr $number-oops `(quote exact?) e))))))])
+                    (%typed-object-check mask-other-number type-other-number ,e)
+                    (build-libcall #t src sexpr exact? e))))))])
     (define-inline 3 inexact?
       [(e) (bind #t (e)
              (build-simple-or
@@ -3170,10 +3169,7 @@
               (%type-check mask-fixnum type-fixnum ,e)
               (build-simple-or
                 (%type-check mask-flonum type-flonum ,e)
-                (build-and
-                  (%type-check mask-typed-object type-typed-object ,e)
-                  (%type-check mask-other-number type-other-number
-                    ,(%mref ,e ,(constant bignum-type-disp)))))))))
+                (%typed-object-check mask-other-number type-other-number ,e))))))
       (define-inline 2 number?
         [(e) (build-number? e)])
       (define-inline 2 complex?

s/cmacros.ss

@@ -295,6 +295,9 @@
     ;; for consistency with error before library entry was introduced:
     (lambda (who x i)
       ($oops who "invalid index ~s for bytevector ~s" i x)))
+  (define number-oops
+    (lambda (who x)
+      ($oops who "~s is not a number" x)))
 
   (define stencil-vector-oops
     (lambda (who x)
@@ -426,6 +429,9 @@
   (define-library-entry (char>? x y) (char-oops 'char>? (if (char? x) y x)))
   (define-library-entry (char<=? x y) (char-oops 'char<=? (if (char? x) y x)))
   (define-library-entry (char>=? x y) (char-oops 'char>=? (if (char? x) y x)))
+
+  (define-library-entry (exact? x) (number-oops 'exact? x))
+  (define-library-entry (inexact? x) (number-oops 'inexact? x))
 )
 
 (define-library-entry (real->flonum x who)
@@ -435,8 +441,6 @@
     [(flonum? x) x]
     [else ($oops who "~s is not a real number" x)]))
 
-(define-library-entry ($number-oops who x)
-  ($oops who "~s is not a number" x))
 
 (let ()
   (define pair-oops

s/cpprim.ss

@@ -26,7 +26,7 @@
        (with-implicit (k $type-check quasiquote)
          #'($type-check (constant mask) (constant type) `expr))])))
 
-(define-syntax %typed-object-check ; NB: caller must bind e
+(define-syntax %typed-object-check ; NB: caller must bind expr
   (lambda (x)
     (syntax-case x ()
       [(k mask type expr)