--- a/Object.st Fri Jun 05 18:10:58 2015 +0200
+++ b/Object.st Fri Jun 05 18:11:10 2015 +0200
@@ -258,6 +258,7 @@
"Modified: / 4.8.1999 / 08:54:06 / stefan"
! !
+
!Object class methodsFor:'Compatibility-ST80'!
rootError
@@ -496,6 +497,7 @@
InfoPrinting := aBoolean
! !
+
!Object class methodsFor:'queries'!
isAbstract
@@ -518,6 +520,8 @@
! !
+
+
!Object methodsFor:'Compatibility-Dolphin'!
stbFixup: anSTBInFiler at: newObjectIndex
@@ -685,6 +689,7 @@
"
! !
+
!Object methodsFor:'accessing'!
_at:index
@@ -2049,6 +2054,7 @@
^ aBlock ensure:[ self addDependent:someone ]
! !
+
!Object methodsFor:'comparing'!
= anObject
@@ -6553,8 +6559,8 @@
"send aSelector-message to the receiver.
If the message expects an argument, pass arg."
- aSelector numArgs == 1 ifTrue:[
- ^ self perform:aSelector with:arg
+ aSelector argumentCount == 1 ifTrue:[
+ ^ self perform:aSelector with:arg
].
^ self perform:aSelector
@@ -6577,12 +6583,12 @@
|numArgs|
- numArgs := aSelector numArgs.
+ numArgs := aSelector argumentCount.
numArgs == 0 ifTrue:[
- ^ self perform:aSelector
+ ^ self perform:aSelector
].
numArgs == 1 ifTrue:[
- ^ self perform:aSelector with:optionalArg1
+ ^ self perform:aSelector with:optionalArg1
].
^ self perform:aSelector with:optionalArg1 with:optionalArg2.
@@ -6605,15 +6611,15 @@
|numArgs|
- numArgs := aSelector numArgs.
+ numArgs := aSelector argumentCount.
numArgs == 0 ifTrue:[
- ^ self perform:aSelector
+ ^ self perform:aSelector
].
numArgs == 1 ifTrue:[
- ^ self perform:aSelector with:optionalArg1
+ ^ self perform:aSelector with:optionalArg1
].
numArgs == 2 ifTrue:[
- ^ self perform:aSelector with:optionalArg1 with:optionalArg2
+ ^ self perform:aSelector with:optionalArg1 with:optionalArg2
].
^ self perform:aSelector with:optionalArg1 with:optionalArg2 with:optionalArg3.
@@ -6636,18 +6642,18 @@
|numArgs|
- numArgs := aSelector numArgs.
+ numArgs := aSelector argumentCount.
numArgs == 0 ifTrue:[
- ^ self perform:aSelector
+ ^ self perform:aSelector
].
numArgs == 1 ifTrue:[
- ^ self perform:aSelector with:optionalArg1
+ ^ self perform:aSelector with:optionalArg1
].
numArgs == 2 ifTrue:[
- ^ self perform:aSelector with:optionalArg1 with:optionalArg2
+ ^ self perform:aSelector with:optionalArg1 with:optionalArg2
].
numArgs == 3 ifTrue:[
- ^ self perform:aSelector with:optionalArg1 with:optionalArg2 with:optionalArg3
+ ^ self perform:aSelector with:optionalArg1 with:optionalArg2 with:optionalArg3
].
^ self perform:aSelector with:optionalArg1 with:optionalArg2 with:optionalArg3 with:optionalArg4.
@@ -7936,6 +7942,7 @@
^ self
! !
+
!Object methodsFor:'secure message sending'!
?:selector
@@ -8541,6 +8548,7 @@
"
! !
+
!Object methodsFor:'synchronized evaluation'!
freeSynchronizationSemaphore
@@ -9030,11 +9038,11 @@
"return the value of the first arg, if I am nil,
the result from evaluating the 2nd argument, if I am not nil.
Notice:
- This method is open coded (inlined) by the compiler(s)
- - redefining it may not work as expected."
-
- (notNilBlockOrValue isBlock and:[notNilBlockOrValue numArgs == 1]) ifTrue:[
- ^ notNilBlockOrValue value:self.
+ This method is open coded (inlined) by the compiler(s)
+ - redefining it may not work as expected."
+
+ (notNilBlockOrValue isBlock and:[notNilBlockOrValue argumentCount == 1]) ifTrue:[
+ ^ notNilBlockOrValue value:self.
].
^ notNilBlockOrValue value
!
@@ -9043,11 +9051,11 @@
"return myself if nil, or the result from evaluating the argument,
if I am not nil.
Notice:
- This method is open coded (inlined) by the compiler(s)
- - redefining it may not work as expected."
-
- (aBlockOrValue isBlock and:[aBlockOrValue numArgs == 1]) ifTrue:[
- ^ aBlockOrValue value:self.
+ This method is open coded (inlined) by the compiler(s)
+ - redefining it may not work as expected."
+
+ (aBlockOrValue isBlock and:[aBlockOrValue argumentCount == 1]) ifTrue:[
+ ^ aBlockOrValue value:self.
].
^ aBlockOrValue value
!
@@ -9056,11 +9064,11 @@
"return the value of the 2nd arg, if I am nil,
the result from evaluating the 1st argument, if I am not nil.
Notice:
- This method is open coded (inlined) by the compiler(s)
- - redefining it may not work as expected."
-
- (notNilBlockOrValue isBlock and:[notNilBlockOrValue numArgs == 1]) ifTrue:[
- ^ notNilBlockOrValue value:self.
+ This method is open coded (inlined) by the compiler(s)
+ - redefining it may not work as expected."
+
+ (notNilBlockOrValue isBlock and:[notNilBlockOrValue argumentCount == 1]) ifTrue:[
+ ^ notNilBlockOrValue value:self.
].
^ notNilBlockOrValue value
!
@@ -10282,14 +10290,16 @@
^ aVisitor visitObject:self with:aParameter
! !
+
+
!Object class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Object.st,v 1.808 2015-05-31 09:23:08 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Object.st,v 1.809 2015-06-05 16:11:10 stefan Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic/Object.st,v 1.808 2015-05-31 09:23:08 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Object.st,v 1.809 2015-06-05 16:11:10 stefan Exp $'
!
version_SVN