--- a/Object.st	Wed Jun 03 06:50:11 2015 +0200
+++ b/Object.st	Sat Jun 06 06:39:31 2015 +0200
@@ -256,6 +256,7 @@
     "Modified: / 4.8.1999 / 08:54:06 / stefan"
 ! !
 
+
 !Object class methodsFor:'Compatibility-ST80'!
 
 rootError
@@ -494,6 +495,7 @@
     InfoPrinting := aBoolean
 ! !
 
+
 !Object class methodsFor:'queries'!
 
 isAbstract
@@ -693,6 +695,7 @@
     "
 ! !
 
+
 !Object methodsFor:'accessing'!
 
 _at:index
@@ -2057,6 +2060,7 @@
     ^ aBlock ensure:[ self addDependent:someone ]
 ! !
 
+
 !Object methodsFor:'comparing'!
 
 = anObject
@@ -6561,8 +6565,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
 
@@ -6585,12 +6589,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.
 
@@ -6613,15 +6617,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.
 
@@ -6644,18 +6648,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.
 
@@ -7944,6 +7948,7 @@
     ^ self
 ! !
 
+
 !Object methodsFor:'secure message sending'!
 
 ?:selector
@@ -8549,6 +8554,7 @@
     "
 ! !
 
+
 !Object methodsFor:'synchronized evaluation'!
 
 freeSynchronizationSemaphore
@@ -9038,11 +9044,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
 !
@@ -9051,11 +9057,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
 !
@@ -9064,11 +9070,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
 !
@@ -10290,14 +10296,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_HG