Squeak-dev April 2017

squeak-dev@lists.squeakfoundation.org

48 participants
221 discussions

The Trunk: Compiler-eem.341.mcz
by commits＠source.squeak.org 04 Apr '17

04 Apr '17

Eliot Miranda uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-eem.341.mcz ==================== Summary ==================== Name: Compiler-eem.341 Author: eem Time: 3 April 2017, 5:25:34.125602 pm UUID: a66d7b39-0d0f-4d67-8e82-02964c101b10 Ancestors: Compiler-eem.340 Add the refactored encoder-specific method generator. This one moves generation from MethodNode to BytecodeEncoder and subclasses, and hence allows easier bytecode set selection, or at least far more sends to self than to encoder. =============== Diff against Compiler-eem.340 =============== Item was added: + ----- Method: BytecodeEncoder>>generateMethodOfClass:trailer:from: (in category 'method encoding') ----- + generateMethodOfClass: aCompiledMethodClass trailer: trailer from: methodNode + "The receiver is the root of a parse tree. Answer an instance of aCompiledMethodClass. + The argument, trailer, is arbitrary but is typically either the reference to the source code + that is stored with every CompiledMethod, or an encoding of the method's temporary names." + + | primErrNode blkSize nLits locals literals header method stack | + primErrNode := methodNode primitiveErrorVariableName ifNotNil: + [self fixTemp: methodNode primitiveErrorVariableName]. + methodNode ensureClosureAnalysisDone. + self rootNode: methodNode. "this is for BlockNode>>sizeCodeForClosureValue:" + blkSize := (methodNode block sizeCodeForEvaluatedValue: self) + + (methodNode primitive > 0 + ifTrue: [self sizeCallPrimitive: methodNode primitive] + ifFalse: [0]) + + (primErrNode + ifNil: [0] + ifNotNil: + [primErrNode + index: methodNode arguments size + methodNode temporaries size; + sizeCodeForStore: self "The VM relies on storeIntoTemp: (129)"]). + locals := methodNode arguments, methodNode temporaries, (primErrNode ifNil: [#()] ifNotNil: [{primErrNode}]). + self noteBlockExtent: methodNode block blockExtent hasLocals: locals. + header := self computeMethodHeaderForNumArgs: methodNode arguments size + numTemps: locals size + numLits: (nLits := (literals := self allLiterals) size) + primitive: methodNode primitive. + method := trailer + createMethod: blkSize + class: aCompiledMethodClass + header: header. + 1 to: nLits do: [:lit | method literalAt: lit put: (literals at: lit)]. + self streamToMethod: method. + stack := ParseStack new init. + methodNode primitive > 0 ifTrue: + [self genCallPrimitive: methodNode primitive]. + primErrNode ifNotNil: + [primErrNode emitCodeForStore: stack encoder: self]. + stack position: method numTemps. + [methodNode block emitCodeForEvaluatedValue: stack encoder: self] + on: Error "If an attempt is made to write too much code the method will be asked" + do: [:ex| "to grow, and the grow attempt will fail in CompiledMethod class>>#new:" + ex signalerContext sender method = (CompiledMethod class>>#new:) + ifTrue: [^self error: 'Compiler code size discrepancy'] + ifFalse: [ex pass]]. + stack position ~= (method numTemps + 1) ifTrue: + [^self error: 'Compiler stack discrepancy']. + self methodStreamPosition ~= (method size - trailer size) ifTrue: + [^self error: 'Compiler code size discrepancy']. + method needsFrameSize: stack size - method numTemps. + ^method!

1 0

The Trunk: Compiler-eem.340.mcz
by commits＠source.squeak.org 04 Apr '17

04 Apr '17

Eliot Miranda uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-eem.340.mcz ==================== Summary ==================== Name: Compiler-eem.340 Author: eem Time: 3 April 2017, 5:00:32.319924 pm UUID: 76902ca3-f64d-427a-af3d-466a103a3ce3 Ancestors: Compiler-eem.339 Use the encoder-specifc limit for maxNumLiterals. =============== Diff against Compiler-eem.339 =============== Item was changed: ----- Method: BytecodeEncoder>>computeMethodHeaderForNumArgs:numTemps:numLits:primitive: (in category 'method generation') ----- computeMethodHeaderForNumArgs: numArgs numTemps: numTemps numLits: numLits primitive: primitiveIndex numArgs > 15 ifTrue: [^self error: 'Cannot compile -- too many arguments']. numTemps > 63 ifTrue: [^self error: 'Cannot compile -- too many temporary variables']. + numLits > self maxNumLiterals ifTrue: - numLits > 32767 ifTrue: [^self error: 'Cannot compile -- too many literals']. ^(CompiledMethod headerFlagForEncoder: self) + (numArgs bitShift: 24) + (numTemps bitShift: 18) "+ (largeBit bitShift: 17)" "largeBit gets filled in later" + (primitiveIndex > 0 ifTrue: [1 bitShift: 16] ifFalse: [0]) "+ (optimizedBit bitShift: 15)" "Sista marker may get filled in later" + numLits!

1 0

The Trunk: EToys-eem.289.mcz
by commits＠source.squeak.org 04 Apr '17

04 Apr '17

Eliot Miranda uploaded a new version of EToys to project The Trunk: http://source.squeak.org/trunk/EToys-eem.289.mcz ==================== Summary ==================== Name: EToys-eem.289 Author: eem Time: 3 April 2017, 4:55:54.254019 pm UUID: a288db28-8cdf-4e91-a6f8-2c8b94bee676 Ancestors: EToys-eem.288 Nuke a now unnecessary ScriptEncoder override, allowing EToys to also use a different bytecode set, if installed and preferred. =============== Diff against EToys-eem.288 =============== Item was removed: - ----- Method: ScriptEncoder>>computeMethodHeaderForNumArgs:numTemps:numLits:primitive: (in category 'method generation') ----- - computeMethodHeaderForNumArgs: numArgs numTemps: numTemps numLits: numLits primitive: primitiveIndex - "copied from superclass, only change is the >>headerFlagForEncoder: argument" - numArgs > 15 ifTrue: - [^self error: 'Cannot compile -- too many arguments']. - numTemps > 63 ifTrue: - [^self error: 'Cannot compile -- too many temporary variables']. - numLits > 65535 ifTrue: - [^self error: 'Cannot compile -- too many literals']. - ^(CompiledMethod headerFlagForEncoder: EncoderForV3PlusClosures new) - + (numArgs bitShift: 24) - + (numTemps bitShift: 18) - "+ (largeBit bitShift: 17)" "largeBit gets filled in later" - + (primitiveIndex > 0 ifTrue: [1 bitShift: 16] ifFalse: [0]) - + numLits!

1 0

The Trunk: Kernel-eem.1085.mcz
by commits＠source.squeak.org 04 Apr '17

04 Apr '17

Eliot Miranda uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-eem.1085.mcz ==================== Summary ==================== Name: Kernel-eem.1085 Author: eem Time: 3 April 2017, 4:53:09.025064 pm UUID: 0ed0802d-4a76-4345-a33a-ff400094a7d9 Ancestors: Kernel-eem.1084 Get the fix for the EToys ScriptEncoder right. =============== Diff against Kernel-eem.1084 =============== Item was changed: ----- Method: CompiledCode class>>headerFlagForEncoder: (in category 'method encoding') ----- headerFlagForEncoder: anEncoder anEncoder class == PrimaryBytecodeSetEncoderClass ifTrue: [^0]. anEncoder class == SecondaryBytecodeSetEncoderClass ifTrue: [^SmallInteger minVal]. "This allows subclasses for compiler variants such as the ScriptEncoder in EToys to continue to function." (anEncoder class inheritsFrom: PrimaryBytecodeSetEncoderClass) ifTrue: + [^0]. - [^self headerFlagForEncoder: PrimaryBytecodeSetEncoderClass]. (anEncoder class inheritsFrom: SecondaryBytecodeSetEncoderClass) ifTrue: + [^SmallInteger minVal]. - [^self headerFlagForEncoder: SecondaryBytecodeSetEncoderClass]. self error: 'The encoder is not one of the two installed bytecode sets'!

1 0

The Trunk: Kernel-eem.1084.mcz
by commits＠source.squeak.org 04 Apr '17

04 Apr '17

Eliot Miranda uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-eem.1084.mcz ==================== Summary ==================== Name: Kernel-eem.1084 Author: eem Time: 3 April 2017, 4:45:38.181168 pm UUID: 131f851c-368d-42aa-b28b-5a07ae8cb7f6 Ancestors: Kernel-eem.1083 Oops, the changes reported in Compiler-eem.339 are here, to whit: Fix a restriction in BytecodeEncoder>>computeMethodHeaderForNumArgs:numTemps:numLits:primitive: that caused EToys to have to implement an unnecessary override. Fix the literal limit in that same method. The max number of literals is 32767 now that we reserve bit 15 for the "do not jit-compile with counters' bit in Sista VMs. =============== Diff against Kernel-eem.1083 =============== Item was changed: ----- Method: CompiledCode class>>headerFlagForEncoder: (in category 'method encoding') ----- headerFlagForEncoder: anEncoder anEncoder class == PrimaryBytecodeSetEncoderClass ifTrue: [^0]. anEncoder class == SecondaryBytecodeSetEncoderClass ifTrue: [^SmallInteger minVal]. + "This allows subclasses for compiler variants such as the ScriptEncoder in EToys + to continue to function." + (anEncoder class inheritsFrom: PrimaryBytecodeSetEncoderClass) ifTrue: + [^self headerFlagForEncoder: PrimaryBytecodeSetEncoderClass]. + (anEncoder class inheritsFrom: SecondaryBytecodeSetEncoderClass) ifTrue: + [^self headerFlagForEncoder: SecondaryBytecodeSetEncoderClass]. self error: 'The encoder is not one of the two installed bytecode sets'!

1 0

The Trunk: Compiler-eem.339.mcz
by commits＠source.squeak.org 04 Apr '17

04 Apr '17

Eliot Miranda uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-eem.339.mcz ==================== Summary ==================== Name: Compiler-eem.339 Author: eem Time: 3 April 2017, 4:41:32.232382 pm UUID: fc3a8d3e-45e0-4d89-adde-ae01ce361263 Ancestors: Compiler-eem.338 Have the Parser obey the bytecode set preference in CompiledCode preferredBytecodeSetEncoderClass. Fix a restriction in BytecodeEncoder>>computeMethodHeaderForNumArgs:numTemps:numLits:primitive: that caused EToys to have to implement an unnecessary override. Fix the literal limit in that same method. The max number of literals is 32767 now that we reserve bit 15 for the "do not jit-compile with counters' bit in Sista VMs. =============== Diff against Compiler-eem.338 =============== Item was changed: ----- Method: BytecodeEncoder>>computeMethodHeaderForNumArgs:numTemps:numLits:primitive: (in category 'method generation') ----- computeMethodHeaderForNumArgs: numArgs numTemps: numTemps numLits: numLits primitive: primitiveIndex numArgs > 15 ifTrue: [^self error: 'Cannot compile -- too many arguments']. numTemps > 63 ifTrue: [^self error: 'Cannot compile -- too many temporary variables']. + numLits > 32767 ifTrue: - numLits > 65535 ifTrue: [^self error: 'Cannot compile -- too many literals']. ^(CompiledMethod headerFlagForEncoder: self) + (numArgs bitShift: 24) + (numTemps bitShift: 18) "+ (largeBit bitShift: 17)" "largeBit gets filled in later" + (primitiveIndex > 0 ifTrue: [1 bitShift: 16] ifFalse: [0]) + "+ (optimizedBit bitShift: 15)" "Sista marker may get filled in later" + numLits! Item was changed: ----- Method: Parser>>encoder (in category 'public access') ----- encoder ^encoder ifNil: + [encoder := CompiledMethod preferredBytecodeSetEncoderClass new]! - [encoder := EncoderForV3PlusClosures new]!

1 0

The Trunk: Kernel-eem.1083.mcz
by commits＠source.squeak.org 04 Apr '17

04 Apr '17

Eliot Miranda uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-eem.1083.mcz ==================== Summary ==================== Name: Kernel-eem.1083 Author: eem Time: 3 April 2017, 4:27:59.818532 pm UUID: 68311a56-626f-485c-a805-9922c04ed7e4 Ancestors: Kernel-eem.1082 Add a class variable for setting and holding the preferred bytecode set to use, along with a preference that uses the new code in PreferenceBrowser-eem.80. =============== Diff against Kernel-eem.1082 =============== Item was changed: ByteArray variableByteSubclass: #CompiledCode instanceVariableNames: '' + classVariableNames: 'LargeFrame PreferredBytecodeSetEncoderClass PrimaryBytecodeSetEncoderClass SecondaryBytecodeSetEncoderClass SmallFrame' - classVariableNames: 'LargeFrame PrimaryBytecodeSetEncoderClass SecondaryBytecodeSetEncoderClass SmallFrame' poolDictionaries: '' category: 'Kernel-Methods'! !CompiledCode commentStamp: 'eem 3/23/2017 14:33' prior: 0! CompiledCode instances are methods suitable for execution by the virtual machine. Instances of CompiledCode and its subclasses are the only objects in the system that have both indexable pointer fields and indexable 8-bit integer fields. The first part of a CompiledCode object is pointers, the second part is bytes. CompiledCode inherits from ByteArray to avoid duplicating some of ByteArray's methods, not because a CompiledCode is-a ByteArray. Instance variables: *indexed* (no named inst vars) Class variables: SmallFrame - the number of stack slots in a small frame Context LargeFrame - the number of stack slots in a large frame Context PrimaryBytecodeSetEncoderClass - the encoder class that defines the primary instruction set SecondaryBytecodeSetEncoderClass - the encoder class that defines the secondary instruction set The current format of a CompiledCode object is as follows: header (4 or 8 bytes, SmallInteger) literals (4 or 8 bytes each, Object, see "The last literal..." below) bytecodes (variable, bytes) trailer (variable, bytes) The header is a SmallInteger (which in the 32-bit system has 31 bits, and in the 64-bit system, 61 bits) in the following format: (index 0) 15 bits: number of literals (#numLiterals) (index 15) 1 bit: jit without counters - reserved for methods that have been optimized by Sista (index 16) 1 bit: has primitive (index 17) 1 bit: whether a large frame size is needed (#frameSize => either SmallFrame or LargeFrame) (index 18) 6 bits: number of temporary variables (#numTemps) (index 24) 4 bits: number of arguments to the method (#numArgs) (index 28) 2 bits: reserved for an access modifier (00-unused, 01-private, 10-protected, 11-public), although accessors for bit 29 exist (see #flag). sign bit: 1 bit: selects the instruction set, >= 0 Primary, < 0 Secondary (#signFlag) If the method has a primitive then the first bytecode of the method must be a callPrimitive: bytecode that encodes the primitive index. This bytecode can encode a primitive index from 0 to 65535. The trailer is an encoding of an instance of CompiledMethodTrailer. It is typically used to encode the index into the source files array of the method's source, but may be used to encode other values, e.g. tempNames, source as a string, etc. See the class CompiledMethodTrailer. While there are disadvantages to this "flat" representation (it is impossible to add named instance variables to CompiledCode or its subclasses, but it is possible indirectly; see AdditionalMethodState) it is effective for interpreters. It means that both bytecodes and literals can be fetched directly from a single method object, and that only one object, the method, must be saved and restored on activation and return. A more natural representation, in which there are searate instance variables for the bytecode, and (conveniently) the literals, requires either much more work on activation and return setting up references to the literals and bytecodes, or slower access to bytecodes and literals, indirecting on each access. The last literal of a CompiledCode object is reserved for special use by the kernel and/or the virtual machine. In CompiledMethod instances it must either be the methodClassAssociation, used to implement super sends, or nil, if the method is anonymous. In CompiledBlock it is to be used for a reference to the enclosing method or block object. By convention, the penultimate literal is reserved for special use by the kernel. CompiledMethod instances it must either be the method selector, or an instance of AdditionalMethodState which holds the selector and any pragmas or properties in the method. In CompiledBlock it is reserved for use for an AdditionalMethodState. Note that super sends in CompiledBlock instances do not use a methodClass association, but expect a directed supersend bytecode, in which the method class (the subclass of the class in which to start the lookup) is a literal. Logically when we switch to a bytecode set that supports the directed super send bytecode, and discard the old super send bytecodes, we can use the last literal to store the selector or the enclosing method/block or an AdditionalMethodState, and the AdditionalMethodState can hold the selector and/or the enclosing method/block.! Item was added: + ----- Method: CompiledCode class>>preferredBytecodeSetEncoderClass (in category 'preferences') ----- + preferredBytecodeSetEncoderClass + <preference: 'Preferred bytecode set encoder class' + category: 'Compiler' + description: 'The system supports up to two bytecode sets; select the preferred one to use here. See CompiledCode class variables PrimaryBytecodeSetEncoderClass and SecondaryBytecodeSetEncoderClass.' + type: #Class> + ^PreferredBytecodeSetEncoderClass ifNil: [PrimaryBytecodeSetEncoderClass]! Item was added: + ----- Method: CompiledCode class>>preferredBytecodeSetEncoderClass: (in category 'preferences') ----- + preferredBytecodeSetEncoderClass: aClass + "Set the class that determines the bytecoce set used to compile methods with." + self assert: (aClass includesBehavior: BytecodeEncoder). + PreferredBytecodeSetEncoderClass := aClass!

1 0

The Trunk: PreferenceBrowser-eem.80.mcz
by commits＠source.squeak.org 04 Apr '17

04 Apr '17

Eliot Miranda uploaded a new version of PreferenceBrowser to project The Trunk: http://source.squeak.org/trunk/PreferenceBrowser-eem.80.mcz ==================== Summary ==================== Name: PreferenceBrowser-eem.80 Author: eem Time: 3 April 2017, 4:25:44.198454 pm UUID: 934a50d9-f957-43d2-8ce8-ba5f7f4ee104 Ancestors: PreferenceBrowser-ul.79 Add a #Class type preference view (this code was contributed by Marcel Taumael and gratefully received by the publisher who will use it to select bytecode sets). =============== Diff against PreferenceBrowser-ul.79 =============== Item was added: + PBTextPreferenceView subclass: #PBClassPreferenceView + instanceVariableNames: 'styler completionController' + classVariableNames: '' + poolDictionaries: '' + category: 'PreferenceBrowser'! Item was added: + ----- Method: PBClassPreferenceView class>>initialize (in category 'as yet unclassified') ----- + initialize + PreferenceViewRegistry ofClassPreferences register: self.! Item was added: + ----- Method: PBClassPreferenceView class>>unload (in category 'as yet unclassified') ----- + unload + "Unload order is not guaranteed so guard against failure" + [PreferenceViewRegistry ofClassPreferences unregister: self] on: Error do:[]! Item was added: + ----- Method: PBClassPreferenceView>>aboutToStyle: (in category 'styling') ----- + aboutToStyle: styler + "For Shout styling support." + ^ true! Item was added: + ----- Method: PBClassPreferenceView>>completionController (in category 'auto completion') ----- + completionController + "For OCompletion support." + ^ completionController! Item was added: + ----- Method: PBClassPreferenceView>>initialize (in category 'initialize-release') ----- + initialize + super initialize. + styler := (Smalltalk classNamed: 'SHTextStylerST80') ifNotNil: [:s | s new]. + completionController := (Smalltalk classNamed: 'OController') ifNotNil: [:oc | oc model: self].! Item was added: + ----- Method: PBClassPreferenceView>>preferenceValue (in category 'user interface') ----- + preferenceValue + ^self preference preferenceValue ifNil: [''] ifNotNil: [:cls | cls name]! Item was added: + ----- Method: PBClassPreferenceView>>preferenceValue: (in category 'user interface') ----- + preferenceValue: aClassName + + | newClass | + newClass := Smalltalk classNamed: aClassName asString withBlanksTrimmed. + + "Avoid overwriting the previous setting by mistake unless explicitely stated so." + (newClass notNil or: [aClassName = 'nil']) + ifTrue: [self preference preferenceValue: newClass]. + + ^ true! Item was added: + ----- Method: PBClassPreferenceView>>selectedClassOrMetaClass (in category 'auto completion') ----- + selectedClassOrMetaClass + "For OCompletion support." + ^ nil! Item was added: + ----- Method: PBClassPreferenceView>>textField (in category 'user interface') ----- + textField + + | field | + field := PluggableTextMorphPlus + on: self + text: #preferenceValue + accept: #preferenceValue:. + field + hideScrollBarsIndefinitely; + acceptOnCR: true; + minimumHeight: 0; + vResizing: #rigid; + hResizing: #spaceFill; + height: TextStyle defaultFont height + 6. + + styler ifNotNil: [:s | field styler: (s view: field)]. + + ^ field! Item was changed: ----- Method: PreferenceViewRegistry class>>forType: (in category 'accessing') ----- forType: typeName "Answer the preference registry for the given type name" ^typeName caseOf:{ [#Boolean] -> [self ofBooleanPreferences]. [#Color] -> [self ofColorPreferences]. [#Font] -> [self ofFontPreferences]. [#Number] -> [self ofNumericPreferences]. [#String] -> [self ofTextPreferences]. + [#Class] -> [self ofClassPreferences]. [#Halo] -> [self ofHaloThemePreferences]. [#WindowColor] -> [self registryOf: #windowColorPreferences] } otherwise:[self registryOf: typeName].! Item was added: + ----- Method: PreferenceViewRegistry class>>ofClassPreferences (in category 'instance creation') ----- + ofClassPreferences + ^(self registryOf: #classPreferences) + viewOrder: 3; + yourself.! Item was changed: ----- Method: PreferenceViewRegistry class>>typeOfRegistry: (in category 'accessing') ----- typeOfRegistry: aRegistry "Answer the type name for a particular view registry" ^aRegistry caseOf:{ [self ofBooleanPreferences] -> [#Boolean]. [self ofColorPreferences] -> [#Color]. [self ofFontPreferences] -> [#Font]. [self ofNumericPreferences] -> [#Number]. [self ofTextPreferences] -> [#String]. + [self ofClassPreferences] -> [#Class]. [self ofHaloThemePreferences] -> [#Halo]. [self registryOf: #windowColorPreferences] -> [#WindowColor]. } otherwise:[self registries keyAtIdentityValue: aRegistry ifAbsent:[nil]].!

1 0

The Trunk: Compiler-eem.338.mcz
by commits＠source.squeak.org 04 Apr '17

04 Apr '17

Eliot Miranda uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-eem.338.mcz ==================== Summary ==================== Name: Compiler-eem.338 Author: eem Time: 3 April 2017, 4:08:55.888174 pm UUID: 8d9fa12c-80e0-4ba8-8101-8ead7d8425eb Ancestors: Compiler-eem.337 Use the newly regularized literal printing in Collections-eem.744 and Kernel-eem.1082 to ensure that literal characters and arrays are printed as such when pretty-rpinting and/or decompiling. =============== Diff against Compiler-eem.337 =============== Item was changed: ----- Method: LiteralNode>>printOn:indent: (in category 'printing') ----- printOn: aStream indent: level + key isVariableBinding ifTrue: + [key key isNil + ifTrue: + [aStream nextPutAll: '###'; nextPutAll: key value soleInstance name] + ifFalse: + [aStream nextPutAll: '##'; nextPutAll: key key]. + ^self]. + key isLiteral ifTrue: + [key printAsLiteralOn: aStream. + ^self]. + key storeOn: aStream! - key isVariableBinding - ifTrue: - [key key isNil - ifTrue: - [aStream nextPutAll: '###'; nextPutAll: key value soleInstance name] - ifFalse: - [aStream nextPutAll: '##'; nextPutAll: key key]] - ifFalse: - [key storeOn: aStream]!

1 0

The Trunk: Collections-eem.744.mcz
by commits＠source.squeak.org 04 Apr '17

04 Apr '17

Eliot Miranda uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-eem.744.mcz ==================== Summary ==================== Name: Collections-eem.744 Author: eem Time: 3 April 2017, 4:06:10.757097 pm UUID: a4dd8fb1-e4df-4031-b093-12296c5862f8 Ancestors: Collections-eem.743 Regularize literal printing for the Collection literal classes (which include Character). Replace the idiosyncratic forms storeAsLiteralByteArrayOn: and printAsLiteralFormOn: with printAsLiteralOn:. Assums Kernel-eem.1082 or later. =============== Diff against Collections-eem.743 =============== Item was changed: + ----- Method: Array>>printAsBraceFormOn: (in category 'printing') ----- - ----- Method: Array>>printAsBraceFormOn: (in category 'self evaluating') ----- printAsBraceFormOn: aStream - aStream nextPut: ${. + self do: [:el | el printOn: aStream] separatedBy: [ aStream nextPutAll: ' . ']. - self do: [:el | aStream print: el] separatedBy: [ aStream nextPutAll: ' . ']. aStream nextPut: $}! Item was removed: - ----- Method: Array>>printAsLiteralFormOn: (in category 'self evaluating') ----- - printAsLiteralFormOn: aStream - aStream nextPut: $#. - self printElementsOn: aStream - ! Item was added: + ----- Method: Array>>printAsLiteralOn: (in category 'printing') ----- + printAsLiteralOn: aStream + aStream nextPut: $#; nextPut: $(. + self do: [:each| each printAsLiteralOn: aStream] separatedBy: [aStream space]. + aStream nextPut: $) + ! Item was changed: ----- Method: Array>>printOn: (in category 'printing') ----- printOn: aStream + self class == Array ifFalse: + [^super printOn: aStream]. + self shouldBePrintedAsLiteral + ifTrue: [self printAsLiteralOn: aStream] + ifFalse: [self printAsBraceFormOn: aStream]! - self shouldBePrintedAsLiteral ifTrue: [^self printAsLiteralFormOn: aStream]. - self class = Array ifTrue: [^self printAsBraceFormOn: aStream]. - ^super printOn: aStream! Item was changed: ----- Method: Array>>storeOn: (in category 'printing') ----- + storeOn: aStream - storeOn: aStream "Use the literal form if possible." - self shouldBePrintedAsLiteral + ifTrue: [self printAsLiteralOn: aStream] - ifTrue: - [aStream nextPut: $#; nextPut: $(. - self do: - [:element | - element storeOn: aStream. - aStream space]. - aStream nextPut: $)] ifFalse: [super storeOn: aStream]! Item was removed: - ----- Method: ByteArray>>printAsLiteralByteArrayOn: (in category 'printing') ----- - printAsLiteralByteArrayOn: aStream - - aStream nextPutAll: '#['. - self - do: [ :each | each printOn: aStream ] - separatedBy: [ aStream nextPut: $ ]. - aStream nextPut: $]! Item was added: + ----- Method: ByteArray>>printAsLiteralOn: (in category 'printing') ----- + printAsLiteralOn: aStream + aStream nextPut: $#; nextPut: $[. + self do: [:each| each storeOn: aStream] + separatedBy: [aStream nextPut: $ ]. + aStream nextPut: $]! Item was changed: ----- Method: ByteArray>>printOn: (in category 'printing') ----- printOn: aStream - self shouldBePrintedAsLiteral ifFalse: [super printOn: aStream. aStream space]. + self printAsLiteralOn: aStream! - self printAsLiteralByteArrayOn: aStream! Item was removed: - ----- Method: ByteArray>>storeAsLiteralByteArrayOn: (in category 'printing') ----- - storeAsLiteralByteArrayOn: aStream - aStream nextPutAll: '#['. - self - do: [ :each | each storeOn: aStream ] - separatedBy: [ aStream nextPut: $ ]. - aStream nextPut: $]! Item was changed: ----- Method: ByteArray>>storeOn: (in category 'printing') ----- storeOn: aStream self shouldBePrintedAsLiteral + ifTrue: [self printAsLiteralOn: aStream] - ifTrue: [self storeAsLiteralByteArrayOn: aStream] ifFalse: [super storeOn: aStream]! Item was added: + ----- Method: Character>>printAsLiteralOn: (in category 'printing') ----- + printAsLiteralOn: aStream + aStream nextPut: $$; nextPut: self! Item was changed: ----- Method: Character>>printOn: (in category 'printing') ----- printOn: aStream - | integerValue | + ((integerValue := self asInteger) > 32 and: [integerValue ~= 127]) ifTrue: + [^self printAsLiteralOn: aStream]. - ((integerValue := self asInteger) > 32 and: [ integerValue ~= 127 ]) ifTrue: [ - aStream nextPut: $$; nextPut: self. - ^self ]. (self class constantNameFor: self) ifNotNil: [ :name | aStream nextPutAll: self class name; space; nextPutAll: name ] ifNil: [ aStream nextPutAll: self class name; nextPutAll: ' value: '; print: integerValue ]! Item was changed: ----- Method: Character>>storeOn: (in category 'printing') ----- storeOn: aStream "Common character literals are preceded by '$', however special need to be encoded differently: for some this might be done by using one of the shortcut constructor methods for the rest we have to create them by ascii-value." + self shouldBePrintedAsLiteral ifTrue: + [^self printAsLiteralOn: aStream]. - self shouldBePrintedAsLiteral ifTrue: [ - aStream nextPut: $$; nextPut: self. - ^self ]. (self class constantNameFor: self) ifNotNil: [ :name | aStream nextPutAll: self class name; space; nextPutAll: name. ^self ]. aStream nextPut: $(; nextPutAll: self class name; nextPutAll: ' value: '; print: self asInteger; nextPut: $)! Item was added: + ----- Method: String>>printAsLiteralOn: (in category 'printing') ----- + printAsLiteralOn: aStream + "Print inside string quotes, doubling embedded quotes." + self storeOn: aStream! Item was changed: ----- Method: String>>printOn: (in category 'printing') ----- + printOn: aStream + "Print inside string quotes, doubling embedded quotes." - printOn: aStream - "Print inside string quotes, doubling inbedded quotes." self storeOn: aStream! Item was changed: ----- Method: String>>storeOn: (in category 'printing') ----- + storeOn: aStream + "Print inside string quotes, doubling embedded quotes." - storeOn: aStream - "Print inside string quotes, doubling inbedded quotes." | x | aStream nextPut: $'. 1 to: self size do: [:i | aStream nextPut: (x := self at: i). x = $' ifTrue: [aStream nextPut: x]]. aStream nextPut: $'!

1 0

Jump to page: