Renamed bindings from unstable/hash and unstable/debug that will clash

with subsequent adaptation of (planet cce/scheme) to collects/unstable.
These bindings are temporary, and will be replaced in the adaptation.

original commit: e52fb81aacb27318903a407eb9ca9225557f2093
This commit is contained in:
Carl Eastlund 2010-05-29 14:44:33 -04:00
parent 420d38ec9c
commit 544d9dd599
3 changed files with 4 additions and 4 deletions

View File

@ -75,7 +75,7 @@
[(map2 dmap2) (in-pairs maps2)])
(with-handlers ([exn:infer? (lambda (_) #f)])
(cons
(hash-union map1 map2 (lambda (k v1 v2) (c-meet v1 v2)))
(simple-hash-union map1 map2 (lambda (k v1 v2) (c-meet v1 v2)))
(dmap-meet dmap1 dmap2)))))])
(when (null? maps)
(fail! maps1 maps2))

View File

@ -62,5 +62,5 @@
(define (dmap-meet dm1 dm2)
(make-dmap
(hash-union (dmap-map dm1) (dmap-map dm2)
(lambda (k dc1 dc2) (dcon-meet dc1 dc2)))))
(simple-hash-union (dmap-map dm1) (dmap-map dm2)
(lambda (k dc1 dc2) (dcon-meet dc1 dc2)))))

View File

@ -47,7 +47,7 @@ don't depend on any other portion of the system
(when (and (warn-unreachable?)
(log-level? l 'warning)
(and (syntax-transforming?) (syntax-original? (syntax-local-introduce e)))
#;(and (orig-module-stx) (eq? (debug syntax-source-module e) (debug syntax-source-module (orig-module-stx))))
#;(and (orig-module-stx) (eq? (debug/call syntax-source-module e) (debug/call syntax-source-module (orig-module-stx))))
#;(syntax-source-module stx))
(log-message l 'warning (format "Typed Scheme has detected unreachable code: ~e" (syntax->datum (locate-stx e)))
e))))