From b4db70854b2f6dde8971b2967344ed09802c7138 Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Sun, 29 Oct 2017 11:25:26 +0100
Subject: [PATCH] Rename "number" tag to "heap-number"

* module/system/base/types/internal.scm (heap-tags): Rename number to
  heap-number.
* module/system/vm/assembler.scm: Adapt for emit-heap-number?.
* module/system/base/types.scm (%tc7-heap-number): Rename from
  %tc7-number.
---
 module/system/base/types.scm          | 2 +-
 module/system/base/types/internal.scm | 6 +++---
 module/system/vm/assembler.scm        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/system/base/types.scm b/module/system/base/types.scm
index cc37acdc2..0678e1548 100644
--- a/module/system/base/types.scm
+++ b/module/system/base/types.scm
@@ -417,7 +417,7 @@ using BACKEND."
                   (port    (memory-port backend address (sizeof double)))
                   (words   (get-bytevector-n port (sizeof double))))
              (bytevector-ieee-double-ref words 0 (native-endianness))))
-          (((_ & #x7f = %tc7-number) mpi)
+          (((_ & #x7f = %tc7-heap-number) mpi)
            (inferior-object 'number address))
           (((_ & #x7f = %tc7-hash-table) buckets meta-data unused)
            (inferior-object 'hash-table address))
diff --git a/module/system/base/types/internal.scm b/module/system/base/types/internal.scm
index fbb11d454..110465f0b 100644
--- a/module/system/base/types/internal.scm
+++ b/module/system/base/types/internal.scm
@@ -36,7 +36,7 @@
             %tc7-vector
             %tc7-weak-vector
             %tc7-string
-            %tc7-number
+            %tc7-heap-number
             %tc7-hash-table
             %tc7-pointer
             %tc7-fluid
@@ -120,7 +120,7 @@
   (vector           vector?                #b1111111       #b0001101)
   (weak-vector      weak-vector?           #b1111111       #b0001111)
   (string           string?                #b1111111       #b0010101)
-  (number           number?                #b1111111       #b0010111)
+  (heap-number      heap-number?           #b1111111       #b0010111)
   (hash-table       hash-table?            #b1111111       #b0011101)
   (pointer          pointer?               #b1111111       #b0011111)
   (fluid            fluid?                 #b1111111       #b0100101)
@@ -148,7 +148,7 @@
   (port             port?                  #b1111111       #b1111101)
   ;;(unused         unused                 #b1111111       #b1111111)
   
-  ;(number          number?                #b1111111       #b0010111)
+  ;(heap-number     heap-number?           #b1111111       #b0010111)
   (bignum           bignum?           #b111111111111  #b000100010111)
   (flonum           flonum?           #b111111111111  #b001000010111)
   (complex          complex?          #b111111111111  #b001100010111)
diff --git a/module/system/vm/assembler.scm b/module/system/vm/assembler.scm
index 40f5274cf..2fbf2520c 100644
--- a/module/system/vm/assembler.scm
+++ b/module/system/vm/assembler.scm
@@ -103,7 +103,7 @@
             emit-vector?
             emit-weak-vector?
             emit-string?
-            emit-number?
+            emit-heap-number?
             emit-hash-table?
             emit-pointer?
             emit-fluid?