From 4dd01ef3ab29148cb4aa86bd56bdf2235fcc5a91 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Thu, 29 Dec 2005 00:50:48 +0000 Subject: [PATCH] added mutable stuff to the class hierarchy svn: r1706 --- collects/swindle/tiny-clos.ss | 90 +++++++++++++++++++++++------------ 1 file changed, 60 insertions(+), 30 deletions(-) diff --git a/collects/swindle/tiny-clos.ss b/collects/swindle/tiny-clos.ss index 6a2c38982c..af8a8ed0cd 100644 --- a/collects/swindle/tiny-clos.ss +++ b/collects/swindle/tiny-clos.ss @@ -1905,21 +1905,27 @@ :direct-supers (list supers ...) :direct-slots '()))) ;;>> +;;>> ;;>> ;;>> ;;>> +;;>> ;;>> ;;>> ;;>> +;;>> ;;>> ;;>> ;;>> ;;>> ;;>> +;;>> ;;>> ;;>> +;;>> ;;>> ;;>> +;;>> ;;>> ;;>> ;;>> @@ -1989,23 +1995,29 @@ ;;> can only appear in the cpl of a struct class that ;;> inherits from a struct which is not under the current inspector). (defprimclass ) +(defprimclass ) (defprimclass ) (defprimclass ) (defprimclass ) +(defprimclass ) (defprimclass ) (defprimclass ) (defprimclass ) +(defprimclass ) (defprimclass ) (defprimclass ) -(defprimclass ) +(defprimclass ) (defprimclass ) (defprimclass ) +(defprimclass ) (defprimclass ) (defprimclass ) -(defprimclass ) +(defprimclass ) +(defprimclass ) (defprimclass ) -(defprimclass ) -(defprimclass ) +(defprimclass ) +(defprimclass ) +(defprimclass ) (defprimclass ) (defprimclass ) (defprimclass ) @@ -2035,7 +2047,7 @@ (defprimclass ) (defprimclass ) (defprimclass ) -(defprimclass ) +(defprimclass ) (defprimclass ) (defprimclass ) (defprimclass ) @@ -2088,34 +2100,36 @@ [(primitive? x) ] [else ])] [(string? x) (if (immutable? x) )] - [(pair? x) (if (list? x) - (if (immutable? x) - ) - (if (immutable? x) - ))] + [(pair? x) + (if (list? x) + (if (immutable? x) + ) + (if (immutable? x) + ))] [(null? x) ] [(symbol? x) (if (keyword? x) )] - [(number? x) (if (exact? x) - (cond [(integer? x) ] - [(rational? x) ] - [(real? x) ] - [(complex? x) ] - [else ]) ; should not happen - (cond [(integer? x) ] - [(rational? x) ] - [(real? x) ] - [(complex? x) ] - [else ]))] ; should not happen + [(number? x) + (if (exact? x) + (cond [(integer? x) ] + [(rational? x) ] + [(real? x) ] + [(complex? x) ] + [else ]) ; should not happen + (cond [(integer? x) ] + [(rational? x) ] + [(real? x) ] + [(complex? x) ] + [else ]))] ; should not happen [(boolean? x) ] [(char? x) ] [(bytes? x) (if (immutable? x) )] [(path? x) ] [(vector? x) ] [(eof-object? x) ] - [(input-port? x) (if (file-stream-port? x) - )] - [(output-port? x) (if (file-stream-port? x) - )] + [(input-port? x) + (if (file-stream-port? x) )] + [(output-port? x) + (if (file-stream-port? x) )] ;; MzScheme stuff [(struct? x) (let-values ([(type _) (struct-info x)]) @@ -2126,15 +2140,15 @@ [(regexp? x) ] [(byte-regexp? x) ] [(promise? x) ] - [(exn? x) (if (exn:break? x) - )] + [(exn? x) + (if (exn:break? x) )] [(real-keyword? x) ] [(semaphore? x) ] [(hash-table? x) ] [(thread? x) ] [(subprocess? x) ] - [(syntax? x) (if (identifier? x) - )] + [(syntax? x) + (if (identifier? x) )] [(namespace? x) ] [(custodian? x) ] [(tcp-listener? x) ] @@ -2183,24 +2197,40 @@ ;;> : ;;> : ;;> : +;;> : ;;> : ;;> : +;;> : ;;> : ;;> : ;;> : +;;> : ;;> : ;;> : ;;> : ;;> : ;;> : +;;> : +;;> : ;;> : -;;> : +;;> : +;;> : +;;> : +;;> : +;;> : +;;> : +;;> : +;;> : +;;> : +;;> +;;> ;;> : ;;> : ;;> : ;;> : ;;> : ;;> : +;;> : ;;> : ;;> : ;;> :