Move non-{top,bottom}-tag? to be near {top,bottom}-tag?.

diff --git a/src/runtime/predicate-lattice.scm b/src/runtime/predicate-lattice.scm
index af0a271ccd1a79fdac215950e7f132db038bedbd..18d3f688f6a573a58914dc427d4d79498636c418 100644 (file)
--- a/src/runtime/predicate-lattice.scm
+++ b/src/runtime/predicate-lattice.scm
@@ -99,9 +99,6 @@ USA.
 (define (false-tag<= tag1 tag2) tag1 tag2 #f)
 (define (true-tag<= tag1 tag2) tag1 tag2 #t)
 
-(define (non-top-tag? object) (not (top-tag? object)))
-(define (non-bottom-tag? object) (not (bottom-tag? object)))
-
 (define tag<=-cache)
 (define tag<=-overrides)
 (add-boot-init!

diff --git a/src/runtime/predicate-metadata.scm b/src/runtime/predicate-metadata.scm
index defaa77630438e94a2837a3855fcca6015809430..c9640c8067a027945e022265601778395b9d9650 100644 (file)
--- a/src/runtime/predicate-metadata.scm
+++ b/src/runtime/predicate-metadata.scm
@@ -207,9 +207,11 @@ USA.
 
 (define (top-tag) the-top-tag)
 (define (top-tag? object) (eqv? the-top-tag object))
+(define (non-top-tag? object) (not (top-tag? object)))
 
 (define (bottom-tag) the-bottom-tag)
 (define (bottom-tag? object) (eqv? the-bottom-tag object))
+(define (non-bottom-tag? object) (not (bottom-tag? object)))
 
 (define (any-object? object) object #t)
 (define (no-object? object) object #f)

diff --git a/src/runtime/runtime.pkg b/src/runtime/runtime.pkg
index 372f7a1c1742d4a985456dbce2217cdcc08523f8..8ac37293b18336c12b4317f6ed43ca7b2a3ff6a8 100644 (file)
--- a/src/runtime/runtime.pkg
+++ b/src/runtime/runtime.pkg
@@ -1906,6 +1906,8 @@ USA.
          get-tag-subsets
          get-tag-supersets
          make-tag
+         non-bottom-tag?
+         non-top-tag?
          predicate->tag
          set-tag<=!
          tag->predicate