hg/stx-libbasic: comparison Context.st

equal deleted inserted replaced

-:8ca343d37d39
+:6302ce0150b4
 ! !
 !Context methodsFor:'Compatibility-Squeak'!
 longStack
-^ String streamContents:[:s |
+^ self fullPrintAllString
-self fullPrintAllOn:s
-]
 ! !
 !Context methodsFor:'Compatibility-VW'!
 resumeWith:value
 ! !
 !Context methodsFor:'printing & storing'!
 argStringFor:someObject
-|name s|
+|s|
 %{
 /*
 * special handling for (invalid) free objects.
 * these only appear if some primitiveCode does not correctly use SEND macros,
 * which may lead to sends to free objects. In normal operation, this 'cannot' happen.
 * However, these print methods are also invoked for low-level pointer errors, so better be prepared...
 */
 if (__isNonNilObject(someObject) && (__qClass(someObject)==nil)) {
-name = __MKSTRING("FreeObject");
+s = __MKSTRING("FreeObject");
 }
 %}.
-name notNil ifTrue:[^ name].
-s := someObject displayString.
 s isNil ifTrue:[
-^ '**************** nil displayString of ',(someObject class name ? '??')
+s := someObject displayString.
-].
+s isNil ifTrue:[
-s isWideString ifTrue:[
+^ '**************** nil displayString of ',(someObject class name ? '??')
-"make sure that the object really returns something we can stream into a string"
+].
-s := someObject storeString.
+].
-].
+"/    JV@2013-04-26: Following is rubbish, the callers must handle string output correctly.
+"/    moreover storeString does not work on self-referencing structures, but that doesn't matter
+"/    for wide strings.
+"/    SV@2013-08-19: I checked/fixed the callers to use CharacterWriteStreams.
+"/    s isWideString ifTrue:[
+"/        "make sure that the object really returns something we can stream into a string"
+"/        s := someObject storeString.
+"/    ].
 ^ s
-"Modified: / 07-03-2012 / 13:14:17 / cg"
 !
 argsDisplayString
 ^ String streamContents:[:s | self displayArgsOn:s ].
 n := self numArgs.
 1 to:n do:[:index |
 Error handle:[:ex |
 s := 'Error in argString'.
 ] do:[
-s := (self argStringFor:(self at:index)).
+s := self argStringFor:(self at:index).
 ].
 aStream nextPutAll:(s contractTo:100).
 index ~~ n ifTrue:[ aStream space ].
 ].
 !
 fullPrintAllString
 "return a string containing the full walkback (incl. arguments)"
-|s|
+^ String streamContents:[:s | self fullPrintAllOn:s]
-s := WriteStream on:''.
-self fullPrintAllOn:s.
-^ s contents
 "
 thisContext fullPrintAllString
 "
 fullPrintString
 "return a string describing the context - this includes the linenumber,
 receiver printString and argument printString"
-|s|
+^ String streamContents:[:s | self fullPrintOn:s]
-s := WriteStream on:''.
-self fullPrintOn:s.
-^ s contents
 "
 thisContext fullPrintString
 "
 !
 !Context methodsFor:'special accessing'!
 argAndVarNames
 "helper: given a context, return a collection of arg&var names"
-|homeContext method block numArgs numVars m src
+|homeContext homeMethod block numArgs numVars m src
 sel isDoIt blocksLineNr extractFromBlock sender|
 numArgs := self numArgs.
 numVars := self numVars.
 (numArgs == 0 and:[numVars == 0]) ifTrue:[^ #()].
 homeContext := self methodHome.
 homeContext notNil ifTrue:[
 sel := homeContext selector.
-method := homeContext method.
+homeMethod := homeContext method.
 ].
 extractFromBlock :=
 [
 |blockNode argNames varNames vars args blocksHome|
 argNames := #().
 varNames := #().
 numArgs > 0 ifTrue:[
 vars := blockNode arguments.
-vars size > 0 ifTrue:[
+vars notEmptyOrNil ifTrue:[
 argNames := vars collect:[:var | var name]
 ]
 ].
 numVars > 0 ifTrue:[
-vars := blockNode variables.
+vars := blockNode variablesIncludingInlined: (homeMethod code notNil and:[homeMethod byteCode isNil]).
-vars size > 0 ifTrue:[
+vars notEmptyOrNil ifTrue:[
 varNames := vars collect:[:var | var name].
 ]
 ].
 ^ argNames , varNames
 ].
 "/ #doIt needs special handling below
 isDoIt := (sel == #'doIt') or:[sel == #'doIt:'].
 self isBlockContext ifFalse:[
 isDoIt ifTrue:[
-method notNil ifTrue:[
+homeMethod notNil ifTrue:[
 "/ special for #doIt
 m := nil.
-src := ('[' , method source , '\]') withCRs.
+src := ('[' , homeMethod source , '\]') withCRs.
 "/ blocksLineNr := self lineNumber.
 blocksLineNr := (self home ? self) lineNumber.
 extractFromBlock value.
 ]
 ].
-method notNil ifTrue:[
+homeMethod notNil ifTrue:[
-^ method methodArgAndVarNames.
+^ homeMethod methodArgAndVarNamesInContext: self.
 ].
 ^ #()
 ].
-method notNil ifTrue:[
+homeMethod notNil ifTrue:[
 isDoIt ifTrue:[
 "/ special for #doIt
 "/ my source is found in the method.
 m := nil.
-src := ('[' , method source , '\]') withCRs.
+src := ('[' , homeMethod source , '\]') withCRs.
 ] ifFalse:[
-m := method.
+m := homeMethod.
 src := nil.
 ].
 blocksLineNr := self lineNumber.
 extractFromBlock value.
 blocksLineNr := self home lineNumber.
 sender := nil.
 ].
 ].
 ^ #()
+"Modified: / 19-08-2013 / 12:13:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 canResume
 "return true, if the receiver allows to be resumed.
 Due to the implementation, this requires that the context which
 ! !
 !Context class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/Context.st,v 1.186 2013-06-09 20:40:08 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Context.st,v 1.187 2013-08-19 15:56:31 stefan Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libbasic/Context.st,v 1.186 2013-06-09 20:40:08 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Context.st,v 1.187 2013-08-19 15:56:31 stefan Exp $'
+!
+version_HG
+^ '$Changeset: <not expanded> $'
 !
 version_SVN
 ^ '$ Id: Context.st 10643 2011-06-08 21:53:07Z vranyj1  $'
 ! !

changeset 15644	6302ce0150b4
parent 15388	1b0f7426a7bb
child 15650	6fb6c451391f