--- a/Rectangle.st Tue Jun 27 04:15:21 1995 +0200
+++ b/Rectangle.st Sun Jul 02 03:08:30 1995 +0200
@@ -21,7 +21,7 @@
COPYRIGHT (c) 1989 by Claus Gittinger
All Rights Reserved
-$Header: /cvs/stx/stx/libbasic/Rectangle.st,v 1.21 1995-06-27 02:14:08 claus Exp $
+$Header: /cvs/stx/stx/libbasic/Rectangle.st,v 1.22 1995-07-02 01:08:04 claus Exp $
'!
!Rectangle class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
version
"
-$Header: /cvs/stx/stx/libbasic/Rectangle.st,v 1.21 1995-06-27 02:14:08 claus Exp $
+$Header: /cvs/stx/stx/libbasic/Rectangle.st,v 1.22 1995-07-02 01:08:04 claus Exp $
"
!
@@ -1005,40 +1005,40 @@
----------------------------------------------------------------"
| collect iRect tmp |
- iRect _ self intersect: aRectangle.
+ iRect := self intersect: aRectangle.
(iRect = nil) ifTrue: [^nil]. "case of no intersection"
"the collect collection gathers Rectangles"
- collect _ OrderedCollection new: 4.
+ collect := OrderedCollection new: 4.
"is it floating or on the edge?"
(((((iRect top) ~= self top)
and: [ (iRect bottom) ~= self bottom ])
and: [ (iRect left) ~= self left ])
and: [ (iRect right) ~= self right ] )
ifTrue: "entirely in the center."
- [tmp _ Rectangle origin: (Point x: iRect left y: self top)
- corner: iRect bottomRight.
+ [tmp := Rectangle origin: (Point x: iRect left y: self top)
+ corner: iRect bottomRight.
collect add: tmp.
- iRect _ iRect merge: tmp].
+ iRect := iRect merge: tmp].
((iRect left) ~= self left)
ifTrue: "doesn't touch left edge so make it touch"
- [tmp _ Rectangle origin: (Point x: self left y: iRect top)
- corner: iRect bottomLeft.
+ [tmp := Rectangle origin: (Point x: self left y: iRect top)
+ corner: iRect bottomLeft.
collect add: tmp.
"merge new (tmp) with overlap to keep track"
- iRect _ iRect merge: tmp].
+ iRect := iRect merge: tmp].
((iRect right) ~= self right)
ifTrue: "doesn't touch right edge so extend it"
- [tmp _ Rectangle origin: iRect topRight
- corner: (Point x: self right y: iRect bottom).
+ [tmp := Rectangle origin: iRect topRight
+ corner: (Point x: self right y: iRect bottom).
collect add: tmp.
- iRect _ iRect merge: tmp].
+ iRect := iRect merge: tmp].
(((iRect left) ~= self left) or: [(iRect top) ~= self top])
ifTrue: "whole top part can be taken now"
- [tmp _ Rectangle origin: self origin corner: iRect topRight.
+ [tmp := Rectangle origin: self origin corner: iRect topRight.
collect add: tmp].
(((iRect right) ~= self right) or: [(iRect bottom) ~= self bottom])
ifTrue: "whole bottom open and can be taken"
- [tmp _ Rectangle origin: iRect bottomLeft corner: self corner.
+ [tmp := Rectangle origin: iRect bottomLeft corner: self corner.
collect add: tmp].
^collect
!