Mercurial Mercurial > hg > stx-libbasic / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Object.st
branchjv
changeset 18630 a74d669db937
parent 18442 bd42fa983e3f
parent 18620 b4e9f25d6ce6
child 18688 43370946620c 
--- a/Object.st	Wed Jul 22 06:38:29 2015 +0200
+++ b/Object.st	Fri Jul 24 08:06:37 2015 +0100
@@ -3459,7 +3459,7 @@
 	    deps class == WeakArray ifTrue:[
 		dep := deps at:1.
 		dep ~~ anObject ifTrue:[
-		    (dep isNil or:[dep == 0]) ifTrue:[
+		    (dep isNil or:[dep class == SmallInteger]) ifTrue:[
 			deps at:1 put:anObject
 		    ] ifFalse:[
 			self dependents:(WeakIdentitySet with:dep with:anObject)
@@ -3562,7 +3562,7 @@
     deps := self dependents.
     deps size ~~ 0 ifTrue:[
 	deps do:[:d |
-		    (d notNil and:[d ~~ 0]) ifTrue:[
+		    (d notNil and:[d class ~~ SmallInteger]) ifTrue:[
 			aBlock value:d
 		    ]
 		]
@@ -3615,7 +3615,7 @@
 	    ((deps class == WeakArray) or:[deps class == Array]) ifTrue:[
 		((d := deps at:1) == anObject
 		or:[d isNil
-		or:[d == 0]]) ifTrue:[
+		or:[d class == SmallInteger]]) ifTrue:[
 		    self dependents:nil
 		]
 	    ] ifFalse:[
@@ -5272,6 +5272,7 @@
 "/        ] do:[
 "/           Processor activeProcess terminate.
 "/        ].
+	MiniDebugger enter.
 	Processor activeProcess terminateNoSignal.
     ].
 
@@ -6566,7 +6567,7 @@
      If the message expects an argument, pass arg."
 
     aSelector argumentCount == 1 ifTrue:[
-        ^ self perform:aSelector with:arg
+	^ self perform:aSelector with:arg
     ].
     ^ self perform:aSelector
 
@@ -6591,10 +6592,10 @@
 
     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.
 
@@ -6619,13 +6620,13 @@
 
     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.
 
@@ -6650,16 +6651,16 @@
 
     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.
 
@@ -9044,11 +9045,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."
+	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:self.
     ].
     ^ notNilBlockOrValue value
 !
@@ -9057,11 +9058,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."
+	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:self.
     ].
     ^ aBlockOrValue value
 !
@@ -9070,11 +9071,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."
+	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:self.
     ].
     ^ notNilBlockOrValue value
 !
@@ -10301,11 +10302,11 @@
 !Object class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Object.st,v 1.809 2015-06-05 16:11:10 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Object.st,v 1.809 2015-06-05 16:11:10 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_HG
hg/stx-libbasic