oops - folding argument is not always a symbol.
--- a/MessageNode.st Tue Nov 09 10:35:56 1999 +0100
+++ b/MessageNode.st Tue Nov 16 21:51:20 1999 +0100
@@ -164,10 +164,12 @@
].
(recVal isMemberOf:String) ifTrue:[
(argVal isInteger and:[selector == #at:]) ifTrue:[
- canFold := (folding >= #level2) or:[folding == #full].
+ canFold := folding isSymbol
+ and:[(folding >= #level2) or:[folding == #full]].
].
((argVal isMemberOf:String) and:[selector == #',']) ifTrue:[
- canFold := (folding >= #level2) or:[folding == #full].
+ canFold := folding isSymbol
+ and:[(folding >= #level2) or:[folding == #full]].
]
].
].
@@ -198,7 +200,7 @@
^ (self basicNew) receiver:recNode selector:selectorString args:(Array with:argNode) lineno:0
- "Modified: / 15.1.1998 / 15:04:27 / cg"
+ "Modified: / 16.11.1999 / 21:50:33 / cg"
!
receiver:recNode selector:selectorString args:anArray
@@ -2789,5 +2791,5 @@
!MessageNode class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libcomp/MessageNode.st,v 1.105 1999-11-09 09:35:56 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libcomp/MessageNode.st,v 1.106 1999-11-16 20:51:09 cg Exp $'
! !
--- a/UnaryNode.st Tue Nov 09 10:35:56 1999 +0100
+++ b/UnaryNode.st Tue Nov 16 21:51:20 1999 +0100
@@ -65,7 +65,7 @@
canFold := false.
- folding ~~ false ifTrue:[
+ (folding notNil and:[folding ~~ false]) ifTrue:[
selector := selectorString asSymbolIfInterned.
selector notNil ifTrue:[
"/
@@ -138,15 +138,18 @@
].
recVal isString ifTrue:[
(selector == #withCRs) ifTrue:[
- canFold := (folding >= #level2) or:[folding == #full]
+ canFold := folding isSymbol
+ and:[(folding >= #level2) or:[folding == #full]]
].
(selector == #size) ifTrue:[
- canFold := (folding >= #level1) or:[folding == #full]
+ canFold := folding isSymbol
+ and:[(folding >= #level1) or:[folding == #full]]
]
].
(recVal isMemberOf:Array) ifTrue:[
(#(asFloatArray asDoubleArray) includes:selector) ifTrue:[
- canFold := (folding >= #level2) or:[folding == #full]
+ canFold := folding isSymbol
+ and:[(folding >= #level2) or:[folding == #full]]
]
]
]
@@ -169,7 +172,7 @@
^ (self basicNew) receiver:r selector:selectorString args:nil lineno:0
- "Modified: / 3.2.1999 / 12:56:32 / cg"
+ "Modified: / 16.11.1999 / 21:49:17 / cg"
! !
!UnaryNode methodsFor:'checks'!
@@ -300,5 +303,5 @@
!UnaryNode class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libcomp/UnaryNode.st,v 1.30 1999-11-09 09:34:29 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libcomp/UnaryNode.st,v 1.31 1999-11-16 20:51:20 cg Exp $'
! !