Revert "compiler.tree: formatting."

This reverts commit ceb89cc87e231d92569b70f4ce235a8ee4558205.

diff --git a/basis/compiler/tree/propagation/info/info.factor b/basis/compiler/tree/propagation/info/info.factor
index de7a89c54062c5927ad9a0067f29651db121e46b..e0b1ed67750b546891ed9685c505024409007ff4 100644 (file)
--- a/basis/compiler/tree/propagation/info/info.factor
+++ b/basis/compiler/tree/propagation/info/info.factor
@@ -104,20 +104,22 @@ UNION: fixed-length array byte-array string ;
         [ drop 1/0. ]
     } case ;
 
-GENERIC: declared-class-interval ( classoid -- int/f )
+! : maybe-declared-interval ( classoid -- int )
+!     dup word?
+!     [ "declared-interval" word-prop full-interval or ]
+!     [ drop full-interval ] if ;
 
+GENERIC: declared-class-interval ( classoid -- int/f )
 M: object declared-class-interval drop full-interval ;
-
-M: class declared-class-interval
-    "declared-interval" word-prop full-interval or ;
-
+M: class declared-class-interval "declared-interval" word-prop full-interval or ;
 M: union-class declared-class-interval
-    class-members [ empty-interval ] [
+    class-members [ empty-interval ]
+    [
         [ declared-class-interval ] [ interval-union ] map-reduce
     ] if-empty ;
-
 M: intersection-class declared-class-interval
-    class-participants [ full-interval ] [
+    class-participants [ full-interval ]
+    [
         [ declared-class-interval ] [ interval-intersect ] map-reduce
     ] if-empty ;
 

diff --git a/basis/compiler/tree/propagation/simple/simple.factor b/basis/compiler/tree/propagation/simple/simple.factor
index 6a082ca31a09610ea0b7f4c49d57aa7444d5cb3d..60979d5d8de9a4165fdde7e70fd463822c6515ac 100644 (file)
--- a/basis/compiler/tree/propagation/simple/simple.factor
+++ b/basis/compiler/tree/propagation/simple/simple.factor
@@ -22,6 +22,7 @@ M: #push propagate-before
 : set-value-infos ( infos values -- )
     [ set-value-info ] 2each ;
 
+
 M: #declare propagate-before
     ! We need to force the caller word to recompile when the
     ! classes mentioned in the declaration are redefined, since

diff --git a/basis/math/intervals/predicates/predicates.factor b/basis/math/intervals/predicates/predicates.factor
index e8664656228a97b18135b5d75fcacec7d2f1016b..37bb92efaca6f73549d887a5138a65054ea95a84 100644 (file)
--- a/basis/math/intervals/predicates/predicates.factor
+++ b/basis/math/intervals/predicates/predicates.factor
@@ -5,9 +5,7 @@ IN: math.intervals.predicates
 ERROR: invalid-interval-definition stack ;
 
 <PRIVATE
-
 PREDICATE: empty-interval-class < word empty-interval eq? ;
-
 UNION: valid-interval interval full-interval empty-interval-class ;
 
 : evaluate-interval ( quot -- interval )
@@ -18,7 +16,6 @@ UNION: valid-interval interval full-interval empty-interval-class ;
 
 : interval>predicate ( interval -- quot )
     [ interval-contains? ] curry ;
-
 PRIVATE>
 
 : define-interval-predicate-class ( class superclass interval -- )