Object.st
branchjv
changeset 18075 bd252c0beac9
parent 18070 d262e3aecaca
parent 15519 16eaca36aac8
child 18079 7b5afc0ad3d5
--- a/Object.st	Sun Jul 14 19:27:31 2013 +0100
+++ b/Object.st	Tue Jul 16 14:00:13 2013 +0100
@@ -2984,9 +2984,7 @@
 
     EnabledBreakPoints notNil ifTrue:[
         EnabledBreakPoints remove:someKey ifAbsent:[].
-        EnabledBreakPoints isEmpty ifTrue:[
-            EnabledBreakPoints := nil
-        ].
+        EnabledBreakPoints := EnabledBreakPoints asNilIfEmpty.
     ].
 
     "
@@ -8494,8 +8492,10 @@
         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.
+    ].
     ^ notNilBlockOrValue value
-
 !
 
 ifNotNil:aBlockOrValue
@@ -8505,8 +8505,10 @@
         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.
+    ].
     ^ aBlockOrValue value
-
 !
 
 ifNotNil:notNilBlockOrValue ifNil:nilBlockOrValue
@@ -8516,9 +8518,10 @@
         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.
+    ].
     ^ notNilBlockOrValue value
-
-
 !
 
 ifNotNilDo:aBlock
@@ -9153,6 +9156,10 @@
     ^ false
 !
 
+isSocketAddress
+    ^ false
+!
+
 isSpecialInstrumentationInfoLiteral
     "return true, if the receiver is a special instrumentation info
      object as placed into the literal array of instrumented methods"
@@ -9675,11 +9682,11 @@
 !Object class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Object.st,v 1.728 2013-06-30 07:40:12 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Object.st,v 1.731 2013-07-13 20:35:11 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Object.st,v 1.728 2013-06-30 07:40:12 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Object.st,v 1.731 2013-07-13 20:35:11 cg Exp $'
 !
 
 version_SVN