From 6cc031b7f8fe349166a6a3259e67e65b2cda4b85 Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Sat, 28 Jan 2017 03:19:45 -0800 Subject: [PATCH] Move non-{top,bottom}-tag? to be near {top,bottom}-tag?. --- src/runtime/predicate-lattice.scm | 3 --- src/runtime/predicate-metadata.scm | 2 ++ src/runtime/runtime.pkg | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/runtime/predicate-lattice.scm b/src/runtime/predicate-lattice.scm index af0a271cc..18d3f688f 100644 --- 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 defaa7763..c9640c806 100644 --- 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 372f7a1c1..8ac37293b 100644 --- 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 -- 2.25.1