hg/stx-libbasic: comparison Context.st

equal deleted inserted replaced

-:b729c0e1d40c
+:c59fbf8e7b3a
 !
 argAt:n
 "return the n'th argument"
-n > self numArgs ifTrue:[
+n > self argumentCount ifTrue:[
-	^ self error:'invalid arg access'
+^ self subscriptBoundsError:n.
 ].
 ^ self at:n
 "Modified: 12.10.1996 / 21:44:28 / cg"
 !
 argAt:n put:value
 "set the n'th argument - useful when the receiver should be restarted"
-n > self numArgs ifTrue:[
+n > self argumentCount ifTrue:[
-	^ self error:'invalid arg access'
+^ self subscriptBoundsError:n.
 ].
 self at:n put:value.
 ^ value
 "Modified: 12.10.1996 / 21:44:32 / cg"
 args
 "return an array filled with the arguments of this context"
 |n|
-n := self numArgs.
+n := self argumentCount.
 n == 0 ifTrue:[
-	"/ little optimization here - avaoid creating empty containers
+"/ little optimization here - avaoid creating empty containers
-	^ #()
+^ #()
 ].
 ^ (Array new:n) replaceFrom:1 to:n with:self.
 !
 argsAndVars
 "return an array filled with the arguments and variables of this context"
 |n|
-n := self numArgs + self numVars.
+n := self argumentCount + self numVars.
 n == 0 ifTrue:[
-	"/ little optimization here - avoid creating empty containers
+"/ little optimization here - avoid creating empty containers
-	^ #()
+^ #()
 ].
 ^ (Array new:n) replaceFrom:1 to:n with:self.
 "Modified: 23.10.1996 / 16:19:41 / cg"
 !
 numTemps
 "return the number of temporary variables of the Block/Method.
 (for debugging only)"
-^ self size - self numArgs - self numVars
+^ self size - self argumentCount - self numVars
 "Created: 23.10.1996 / 16:19:10 / cg"
 "Modified: 23.10.1996 / 16:19:48 / cg"
 !
 temporaries
 "return an array filled with the temporaries of this context"
 |nonTemps mySize|
-nonTemps := self numArgs + self numVars.
+nonTemps := self argumentCount + self numVars.
 mySize := self numTemps.
 mySize == 0 ifTrue:[
-	"/ little optimization here - avaoid creating empty containers
+"/ little optimization here - avaoid creating empty containers
-	^ #()
+^ #()
 ].
 ^ (Array new:mySize) replaceFrom:1 to:mySize with:self startingAt:nonTemps+1
 "Modified: 23.10.1996 / 16:20:00 / cg"
 !
 varAt:n
 "return the n'th local variable"
-^ self at:(n + self numArgs)
+^ self at:(n + self argumentCount)
 !
 varAt:n put:value
 "set the n'th local variable - useful when the receiver should be restarted
 or continued"
-self at:(n + self numArgs) put:value
+self at:(n + self argumentCount) put:value
 !
 vars
 "return an array filled with the local variables of this context"
 |nonVars mySize|
-nonVars := self numArgs.
+nonVars := self argumentCount.
 mySize := self numVars.
 mySize == 0 ifTrue:[
-	"/ little optimization here - avaoid creating empty containers
+"/ little optimization here - avaoid creating empty containers
-	^ #()
+^ #()
 ].
 ^ (Array new:mySize) replaceFrom:1 to:mySize with:self startingAt:nonVars+1
 "Modified: 23.10.1996 / 16:20:06 / cg"
 ! !
 fullPrint
 "print the receiver, selector and args of the context
 - used only for MiniDebuggers walkback print"
 self receiverPrintString errorPrint. ' ' errorPrint. selector errorPrint.
-self numArgs ~~ 0 ifTrue: [
+self argumentCount ~~ 0 ifTrue: [
-	' ' errorPrint. self argsDisplayString errorPrint
+' ' errorPrint. self argsDisplayString errorPrint
 ].
 ' [' errorPrint. self lineNumber errorPrint. ']' errorPrintCR
 "
 thisContext fullPrint
 displayArgsOn:aStream
 | n "{ Class: SmallInteger }"
 s |
-n := self numArgs.
+n := self argumentCount.
 1 to:n do:[:index |
-	Error handle:[:ex |
+Error handle:[:ex |
-	    s := '*Error in argString*'.
+s := '*Error in argString*'.
-	] do:[
+] do:[
-	    s := self argStringFor:(self at:index).
+s := self argStringFor:(self at:index).
-	    s := s contractTo:100.
+s := s contractTo:100.
-	].
+].
-	aStream nextPutAll:s asString string.
+aStream nextPutAll:s asString string.
-	index ~~ n ifTrue:[ aStream space ].
+index ~~ n ifTrue:[ aStream space ].
 ].
 "Modified: / 07-03-2012 / 13:09:17 / cg"
 !
 "helper: given a context, return a collection of arg&var names"
 |homeContext homeMethod block numArgs numVars m src
 sel isDoIt blocksLineNr extractFromBlock sender|
-numArgs := self numArgs.
+numArgs := self argumentCount.
 numVars := self numVars.
 (numArgs == 0 and:[numVars == 0]) ifTrue:[^ #()].
 homeContext := self methodHome.
 homeContext notNil ifTrue:[
-	sel := homeContext selector.
+sel := homeContext selector.
-	homeMethod := homeContext method.
+homeMethod := homeContext method.
 ].
 extractFromBlock :=
-	[
+[
-	    |blockNode argNames varNames vars args blocksHome|
+|blockNode argNames varNames vars args blocksHome|
-	    blockNode := Compiler
+blockNode := Compiler
-			    blockAtLine:blocksLineNr
+blockAtLine:blocksLineNr
-			    in:m
+in:m
-			    orSource:src
+orSource:src
-			    numArgs:numArgs
+numArgs:numArgs
-			    numVars:numVars.
+numVars:numVars.
-	    blockNode notNil ifTrue:[
+blockNode notNil ifTrue:[
-		"/ a kludge
+"/ a kludge
-		blockNode lineNumber == blocksLineNr ifTrue:[
+blockNode lineNumber == blocksLineNr ifTrue:[
-		    blocksHome := blockNode home.
+blocksHome := blockNode home.
-		    (blocksHome notNil and:[blocksHome isBlock]) ifTrue:[
+(blocksHome notNil and:[blocksHome isBlock]) ifTrue:[
-			(blocksHome numArgs == numArgs
+(blocksHome numArgs == numArgs
-			and:[ blocksHome numVars == numVars ]) ifTrue:[
+and:[ blocksHome numVars == numVars ]) ifTrue:[
-			    blockNode := blocksHome
+blockNode := blocksHome
-			].
+].
-		    ].
+].
-		].
+].
-		argNames := #().
+argNames := #().
-		varNames := #().
+varNames := #().
-		numArgs > 0 ifTrue:[
+numArgs > 0 ifTrue:[
-		    vars := blockNode arguments.
+vars := blockNode arguments.
-		    vars notEmptyOrNil ifTrue:[
+vars notEmptyOrNil ifTrue:[
-			argNames := vars collect:[:var | var name]
+argNames := vars collect:[:var | var name]
-		    ]
+]
-		].
+].
-		numVars > 0 ifTrue:[
+numVars > 0 ifTrue:[
-		    vars := blockNode variablesIncludingInlined: (homeMethod code notNil and:[homeMethod byteCode isNil]).
+vars := blockNode variablesIncludingInlined: (homeMethod code notNil and:[homeMethod byteCode isNil]).
-		    vars notEmptyOrNil ifTrue:[
+vars notEmptyOrNil ifTrue:[
-			varNames := vars collect:[:var | var name].
+varNames := vars collect:[:var | var name].
-		    ]
+]
-		].
+].
-		^ argNames , varNames
+^ argNames , varNames
-	    ].
+].
-	].
+].
 "/ #doIt needs special handling below
 isDoIt := (sel == #'doIt') or:[sel == #'doIt:'].
 self isBlockContext ifFalse:[
-	isDoIt ifTrue:[
+isDoIt ifTrue:[
-	    homeMethod notNil ifTrue:[
+homeMethod notNil ifTrue:[
-		"/ special for #doIt
+"/ special for #doIt
-		m := nil.
+m := nil.
-		src := ('[' , homeMethod source , '\]') withCRs.
+src := ('[' , homeMethod source , '\]') withCRs.
-		"/ blocksLineNr := self lineNumber.
+"/ blocksLineNr := self lineNumber.
-		blocksLineNr := (self home ? self) lineNumber.
+blocksLineNr := (self home ? self) lineNumber.
-		extractFromBlock value.
+extractFromBlock value.
-	    ]
+]
-	].
+].
-	homeMethod notNil ifTrue:[
+homeMethod notNil ifTrue:[
-	    ^ homeMethod methodArgAndVarNamesInContext: self.
+^ homeMethod methodArgAndVarNamesInContext: self.
-	].
+].
-	^ #()
+^ #()
 ].
 homeMethod notNil ifTrue:[
-	isDoIt ifTrue:[
+isDoIt ifTrue:[
-	    "/ special for #doIt
+"/ special for #doIt
-	    "/ my source is found in the method.
+"/ my source is found in the method.
-	    m := nil.
+m := nil.
-	    src := ('[' , homeMethod source , '\]') withCRs.
+src := ('[' , homeMethod source , '\]') withCRs.
-	] ifFalse:[
+] ifFalse:[
-	    m := homeMethod.
+m := homeMethod.
-	    src := nil.
+src := nil.
-	].
+].
-	blocksLineNr := self lineNumber.
+blocksLineNr := self lineNumber.
-	extractFromBlock value.
+extractFromBlock value.
-	blocksLineNr := self home lineNumber.
+blocksLineNr := self home lineNumber.
-	extractFromBlock value.
+extractFromBlock value.
 ].
 blocksLineNr isNil ifTrue:[
-	self isBlockContext ifTrue:[
+self isBlockContext ifTrue:[
-	    sender := self sender.
+sender := self sender.
-	    (sender notNil
+(sender notNil
-	    and:[sender receiver isBlock
+and:[sender receiver isBlock
-	    and:[sender selector startsWith:'value']])
+and:[sender selector startsWith:'value']])
-	    ifTrue:[
+ifTrue:[
-		block := sender receiver.
+block := sender receiver.
-		src := block source.
+src := block source.
-		src isNil ifTrue:[
+src isNil ifTrue:[
-		    self error:'no source'.
+self error:'no source'.
-		].
+].
-		blocksLineNr := 1.
+blocksLineNr := 1.
-		extractFromBlock value.
+extractFromBlock value.
-	    ].
+].
-	    sender := nil.
+sender := nil.
-	].
+].
 ].
 ^ #()
 "Modified: / 19-08-2013 / 12:13:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 count := 0.
 c := self findNextContextWithSelector:selector or:nil or:nil.
 [c notNil] whileTrue:[
-	(c receiver == receiver) ifTrue:[
+(c receiver == receiver) ifTrue:[
-	    c method == self method ifTrue:[
+c method == self method ifTrue:[
-		sameArgs := true.
+sameArgs := true.
-		1 to:self numArgs do:[:i |
+1 to:self argumentCount do:[:i |
-		    (c argAt:1) ~~ (self argAt:i)ifTrue:[
+(c argAt:1) ~~ (self argAt:i)ifTrue:[
-			sameArgs := false
+sameArgs := false
-		    ]
+]
-		].
+].
-		sameArgs ifTrue:[^ true].
+sameArgs ifTrue:[^ true].
-	    ]
+]
-	].
+].
-	c := c findNextContextWithSelector:selector or:nil or:nil.
+c := c findNextContextWithSelector:selector or:nil or:nil.
-	"
+"
-	 this special test was added to get out after a while
+this special test was added to get out after a while
-	 if the sender chain is corrupt - this gives us at least
+if the sender chain is corrupt - this gives us at least
-	 a chance to find those errors.
+a chance to find those errors.
-	"
+"
-	count := count + 1.
+count := count + 1.
-	count >= 100000 ifTrue:[
+count >= 100000 ifTrue:[
-	    'Context [warning]: bad context chain' errorPrintCR.
+'Context [warning]: bad context chain' errorPrintCR.
-	    ^ true
+^ true
-	]
+]
 ].
 ^ false
 !
 isRecursive
 ! !
 !Context class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/Context.st,v 1.224 2015-05-27 19:09:55 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Context.st,v 1.225 2015-06-05 16:09:48 stefan Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libbasic/Context.st,v 1.224 2015-05-27 19:09:55 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Context.st,v 1.225 2015-06-05 16:09:48 stefan Exp $'
 !
 version_HG
 ^ '$Changeset: <not expanded> $'

changeset 18437	c59fbf8e7b3a
parent 18412	dc22d0d82e28
child 18442	bd42fa983e3f
child 18977	0088eb87454d