Squeak-dev August 2017

squeak-dev@lists.squeakfoundation.org

42 participants
86 discussions

The Trunk: Multilingual-jr.218.mcz
by commits＠source.squeak.org 31 Aug '17

31 Aug '17

Patrick Rein uploaded a new version of Multilingual to project The Trunk: http://source.squeak.org/trunk/Multilingual-jr.218.mcz ==================== Summary ==================== Name: Multilingual-jr.218 Author: jr Time: 19 January 2017, 5:14:23.763655 pm UUID: 36416c42-a4b4-554f-8203-aba25eee794f Ancestors: Multilingual-tfel.217 support 'iso-8859-1' and do not let UTF8TextConverter expect that its input stream returns Characters from basicNext A stream implementation might always return bytes from basicNext and expect the conversion to Character to be done solely by the TextConverter, so use asInteger instead of asciiValue to support both cases. Convert back with asCharacter. =============== Diff against Multilingual-tfel.217 =============== Item was changed: ----- Method: Latin1TextConverter class>>encodingNames (in category 'utilities') ----- encodingNames + ^ #('latin-1' 'latin1' 'iso-8859-1') copy. - ^ #('latin-1' 'latin1') copy. ! Item was changed: ----- Method: UTF8TextConverter>>nextFromStream: (in category 'conversion') ----- nextFromStream: aStream | char1 value1 char2 value2 unicode char3 value3 char4 value4 | aStream isBinary ifTrue: [^ aStream basicNext]. char1 := aStream basicNext. char1 ifNil:[^ nil]. + value1 := char1 asInteger. - value1 := char1 asciiValue. value1 <= 127 ifTrue: [ "1-byte char" + ^ char1 asCharacter - ^ char1 ]. "at least 2-byte char" char2 := aStream basicNext. + char2 ifNil:[^self errorMalformedInput: (String with: char1 asCharacter)]. + value2 := char2 asInteger. - char2 ifNil:[^self errorMalformedInput: (String with: char1)]. - value2 := char2 asciiValue. (value1 bitAnd: 16rE0) = 192 ifTrue: [ ^ Unicode value: ((value1 bitAnd: 31) bitShift: 6) + (value2 bitAnd: 63). ]. "at least 3-byte char" char3 := aStream basicNext. + char3 ifNil:[^self errorMalformedInput: (String with: char1 asCharacter with: char2 asCharacter)]. + value3 := char3 asInteger. - char3 ifNil:[^self errorMalformedInput: (String with: char1 with: char2)]. - value3 := char3 asciiValue. (value1 bitAnd: 16rF0) = 224 ifTrue: [ unicode := ((value1 bitAnd: 15) bitShift: 12) + ((value2 bitAnd: 63) bitShift: 6) + (value3 bitAnd: 63). ]. (value1 bitAnd: 16rF8) = 240 ifTrue: [ "4-byte char" char4 := aStream basicNext. + char4 ifNil:[^self errorMalformedInput: (String with: char1 asCharacter with: char2 asCharacter with: char3 asCharacter)]. + value4 := char4 asInteger. - char4 ifNil:[^self errorMalformedInput: (String with: char1 with: char2 with: char3)]. - value4 := char4 asciiValue. unicode := ((value1 bitAnd: 16r7) bitShift: 18) + ((value2 bitAnd: 63) bitShift: 12) + ((value3 bitAnd: 63) bitShift: 6) + (value4 bitAnd: 63). ]. + unicode ifNil:[^self errorMalformedInput: (String with: char1 asCharacter with: char2 asCharacter with: char3 asCharacter)]. - unicode ifNil:[^self errorMalformedInput: (String with: char1 with: char2 with: char3)]. unicode > 16r10FFFD ifTrue: [ + ^self errorMalformedInput: (String with: char1 asCharacter with: char2 asCharacter with: char3 asCharacter). - ^self errorMalformedInput: (String with: char1 with: char2 with: char3). ]. unicode = 16rFEFF ifTrue: [^ self nextFromStream: aStream]. ^ Unicode value: unicode. !

1 0

The Trunk: Multilingual-pre.229.mcz
by commits＠source.squeak.org 31 Aug '17

31 Aug '17

Patrick Rein uploaded a new version of Multilingual to project The Trunk: http://source.squeak.org/trunk/Multilingual-pre.229.mcz ==================== Summary ==================== Name: Multilingual-pre.229 Author: pre Time: 31 August 2017, 2:56:54.1644 pm UUID: c481ed5b-4bf7-fb4b-9025-bb9e9d956778 Ancestors: Multilingual-pre.228, Multilingual-jr.218 Merges Multilingual-jr.218 from the inbox =============== Diff against Multilingual-pre.228 =============== Item was changed: ----- Method: UTF8TextConverter>>nextFromStream: (in category 'conversion') ----- nextFromStream: aStream | char1 value1 char2 value2 unicode char3 value3 char4 value4 | aStream isBinary ifTrue: [^ aStream basicNext]. char1 := aStream basicNext. char1 ifNil:[^ nil]. + value1 := char1 asInteger. - value1 := char1 asciiValue. value1 <= 127 ifTrue: [ "1-byte char" + ^ char1 asCharacter - ^ char1 ]. "at least 2-byte char" char2 := aStream basicNext. + char2 ifNil:[^self errorMalformedInput: (String with: char1 asCharacter)]. + value2 := char2 asInteger. - char2 ifNil:[^self errorMalformedInput: (String with: char1)]. - value2 := char2 asciiValue. (value1 bitAnd: 16rE0) = 192 ifTrue: [ ^ Unicode value: ((value1 bitAnd: 31) bitShift: 6) + (value2 bitAnd: 63). ]. "at least 3-byte char" char3 := aStream basicNext. + char3 ifNil:[^self errorMalformedInput: (String with: char1 asCharacter with: char2 asCharacter)]. + value3 := char3 asInteger. - char3 ifNil:[^self errorMalformedInput: (String with: char1 with: char2)]. - value3 := char3 asciiValue. (value1 bitAnd: 16rF0) = 224 ifTrue: [ unicode := ((value1 bitAnd: 15) bitShift: 12) + ((value2 bitAnd: 63) bitShift: 6) + (value3 bitAnd: 63). ]. (value1 bitAnd: 16rF8) = 240 ifTrue: [ "4-byte char" char4 := aStream basicNext. + char4 ifNil:[^self errorMalformedInput: (String with: char1 asCharacter with: char2 asCharacter with: char3 asCharacter)]. + value4 := char4 asInteger. - char4 ifNil:[^self errorMalformedInput: (String with: char1 with: char2 with: char3)]. - value4 := char4 asciiValue. unicode := ((value1 bitAnd: 16r7) bitShift: 18) + ((value2 bitAnd: 63) bitShift: 12) + ((value3 bitAnd: 63) bitShift: 6) + (value4 bitAnd: 63). ]. + unicode ifNil:[^self errorMalformedInput: (String with: char1 asCharacter with: char2 asCharacter with: char3 asCharacter)]. - unicode ifNil:[^self errorMalformedInput: (String with: char1 with: char2 with: char3)]. unicode > 16r10FFFD ifTrue: [ + ^self errorMalformedInput: (String with: char1 asCharacter with: char2 asCharacter with: char3 asCharacter). - ^self errorMalformedInput: (String with: char1 with: char2 with: char3). ]. unicode = 16rFEFF ifTrue: [^ self nextFromStream: aStream]. ^ Unicode value: unicode. !

1 0

Re: [squeak-dev] Pinning Objects in Pharo
by Ben Coman 31 Aug '17

31 Aug '17

Thx Eliot for that detailed description. What might be the impact of a default-pin every object passed to FFI? Cheers -ben On 30 Aug 2017 11:46 PM, "Eliot Miranda" <eliot.miranda(a)gmail.com> wrote: Hi Torsten, Hi All, re pinDuring: > On Aug 28, 2017, at 9:17 AM, Torsten Bergmann <astares(a)gmx.de> wrote: > > As some of you are aware of Spur added memory pinning and in Pharo 6.1 (#60510) as well as Pharo 7 > we currently have > > Object>>pin > Object>>unpin > Object>>isPinned > > and also Object>>setPinned:. > > Object pinning is explained by Eliot here [1]. > > I would propose two changes (at least for Pharo but ideally also for Squeak): > > 1. IMHO #setPinned: should be moved to a private protocol > 2. Provide a #pinDuring: aBlock method like: > > pinDuring: aBlock > [ self pin. > aBlock value ] ensure: [ self unpin ] > > so we can ensure that a pinned object is unpinned after an operation. >From an implementation perspective, I suspect this is unnecessary. There are two reasons, one to do with collecting pinned objects and the other to do with compaction. Pinning an object forces it into oldSpace if it was not there already, but does not prevent it being garbage collected. So any un references pinned object in oldSpace will be collected at the next full GC. It is possible (but in implemented) to move not large objects back to newSpace but the forwarder left in oldSpace will prevent its collection until the next full GC so trying to move an object back into newSpace is pointless. Conclusion, there is no point unpinning for garbage collectability. The compactor does a good job of moving unpinned objects around pinned objects, typically leaving very small gaps before pinned objects. [One can observe how much free space exists in an image file to get an idea of how much free space this causes. It's low]. The number of uncollectable pinned objects in an application, which will be objects that are long-lived that have been passed through the FFI, is likely to be small. Conclusion there is little to be gained in avoiding fragmentation by unpinning long-lived objects pinned on an FFI call. In summary, collectible ones objects will be collected anyway, and the few long-lived pinned objects should not cause significant fragmentation. So pinDuring: is unlikely to provide any benefit. Simply pin and leave it to the GC and its compactor to clean up afterwards. > What do you think? > > Also I wonder why FFICallbackTests>>#testCqsortWithByteArray is sending #pin but not > #unpin afterwards. Maybe that is the reason why there is a flag in this method that it > is crashing on Windows. > > Bye > T. > > [1] http://lists.squeakfoundation.org/pipermail/squeak-dev/2017- August/195129.html

2 1

The Trunk: Kernel-tbn.1112.mcz
by commits＠source.squeak.org 30 Aug '17

30 Aug '17

Torsten Bergmann uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-tbn.1112.mcz ==================== Summary ==================== Name: Kernel-tbn.1112 Author: tbn Time: 30 August 2017, 11:21:46.282311 pm UUID: a4399bb0-13e7-7a4f-a0a1-d78bfbd3012e Ancestors: Kernel-nice.1111 Cleanup pinning protocols - isPinned moves from "system primitive" to "pinning" - pin moves from "system primitive" to "pinning" - unpin moves from "system primitive" to "pinning" - setPinned: moves from "system primitive" to "private" (as this should not be part of the public API, people should use pin/unpin methods) (similar to https://github.com/pharo-project/pharo/pull/224 for Pharo) =============== Diff against Kernel-nice.1111 =============== Item was changed: + ----- Method: Object>>isPinned (in category 'pinning') ----- - ----- Method: Object>>isPinned (in category 'system primitives') ----- isPinned "Answer if the receiver is pinned. The VM's garbage collector routinely moves objects as it reclaims and compacts memory. But it can also pin an object so that it will not be moved, which can make it easier to pass objects out through the FFI." <primitive: 183 error: ec> ^self primitiveFailed! Item was changed: + ----- Method: Object>>pin (in category 'pinning') ----- - ----- Method: Object>>pin (in category 'system primitives') ----- pin "The VM's garbage collector routinely moves objects as it reclaims and compacts memory. But it can also pin an object so that it will not be moved, which can make it easier to pass objects out through the FFI. Objects are unpinnned when created. This method ensures an object is pinned, and answers whether it was already pinned." ^self setPinned: true! Item was changed: + ----- Method: Object>>setPinned: (in category 'private') ----- - ----- Method: Object>>setPinned: (in category 'system primitives') ----- setPinned: aBoolean "The VM's garbage collector routinely moves objects as it reclaims and compacts memory. But it can also pin an object so that it will not be moved, which can make it easier to pass objects out through the FFI. Objects are unpinnned when created. This primitive either pins or unpins an object, and answers if it was already pinned." <primitive: 184 error: ec> ^self primitiveFailed! Item was changed: + ----- Method: Object>>unpin (in category 'pinning') ----- - ----- Method: Object>>unpin (in category 'system primitives') ----- unpin "The VM's garbage collector routinely moves objects as it reclaims and compacts memory. But it can also pin an object so that it will not be moved, which can make it easier to pass objects out through the FFI. Objects are unpinnned when created. This method ensures an object is unpinned, and answers whether it was pinned." ^self setPinned: false!

1 0

Re: [squeak-dev] Pinning Objects in Pharo
by Eliot Miranda 30 Aug '17

30 Aug '17

Hi Torsten, Hi All, re pinDuring: > On Aug 28, 2017, at 9:17 AM, Torsten Bergmann <astares(a)gmx.de> wrote: > > As some of you are aware of Spur added memory pinning and in Pharo 6.1 (#60510) as well as Pharo 7 > we currently have > > Object>>pin > Object>>unpin > Object>>isPinned > > and also Object>>setPinned:. > > Object pinning is explained by Eliot here [1]. > > I would propose two changes (at least for Pharo but ideally also for Squeak): > > 1. IMHO #setPinned: should be moved to a private protocol > 2. Provide a #pinDuring: aBlock method like: > > pinDuring: aBlock > [ self pin. > aBlock value ] ensure: [ self unpin ] > > so we can ensure that a pinned object is unpinned after an operation. From an implementation perspective, I suspect this is unnecessary. There are two reasons, one to do with collecting pinned objects and the other to do with compaction. Pinning an object forces it into oldSpace if it was not there already, but does not prevent it being garbage collected. So any un references pinned object in oldSpace will be collected at the next full GC. It is possible (but in implemented) to move not large objects back to newSpace but the forwarder left in oldSpace will prevent its collection until the next full GC so trying to move an object back into newSpace is pointless. Conclusion, there is no point unpinning for garbage collectability. The compactor does a good job of moving unpinned objects around pinned objects, typically leaving very small gaps before pinned objects. [One can observe how much free space exists in an image file to get an idea of how much free space this causes. It's low]. The number of uncollectable pinned objects in an application, which will be objects that are long-lived that have been passed through the FFI, is likely to be small. Conclusion there is little to be gained in avoiding fragmentation by unpinning long-lived objects pinned on an FFI call. In summary, collectible ones objects will be collected anyway, and the few long-lived pinned objects should not cause significant fragmentation. So pinDuring: is unlikely to provide any benefit. Simply pin and leave it to the GC and its compactor to clean up afterwards. > What do you think? > > Also I wonder why FFICallbackTests>>#testCqsortWithByteArray is sending #pin but not > #unpin afterwards. Maybe that is the reason why there is a flag in this method that it > is crashing on Windows. > > Bye > T. > > [1] http://lists.squeakfoundation.org/pipermail/squeak-dev/2017-August/195129.h…

1 0

Re: [squeak-dev] what's the best Mac VM?
by Edgar J. De Cleene 30 Aug '17

30 Aug '17

I have not only several Squeak images , also Cuis and Cuis forks. Here a quick resume Squeak from 1.x until 4.1 could be open by old stack machines like John McIntosh for Mac and old Unix stack VM which still instal in Ubuntu and Ubuntu forks this days. 4.6 is the release which change to Cog, In fact I have 4.6 derivated from before the change and I could run this old images in G4 Power PC Macs and Pentium IV Ubuntu boxes For 4.6 from http://ftp.squeak.org/4.6/ you see Squeak4.6-15102 but this could be updated from trunk and still be Cog. >From 5.1 until today the VM must be Spur. Spur do not open older images. Cog could open some 4.x , but you was forced to continue using Cog, .image can’t be opened again by stack VM’s My two cents. I currently learning webassembly , so if people here like learning I’m ready to exchange. I have in the cooking phase of a Cuis derivate image which have KomHV for the back end and Amber , Morphic.js and sevearl Git .js useful libraries on the front . Edgar @morplenauta

1 0

what's the best Mac VM?
by Bob Arning 29 Aug '17

29 Aug '17

Since I upgraded to MacOS 10.12, I've had a devil of a time finding a VM that will reliably run various images I have lying around. Can someone point me to a good one?

3 10

Does anyone run 'plain' Debian? Could you test out building a vm for us?
by tim Rowledge 29 Aug '17

29 Aug '17

We need to demonstrate that the vm can be built in a vanilla-as-posible Debian; https://drive.google.com/file/d/0Bzi8Tf4EvjhoYTNEUDRCc09KOEk/view?usp=shari… If it builds then grab http://squeakland.org/content/installers/Etoys-To-Go-5.0.zip and try running the image in there tim -- tim Rowledge; tim(a)rowledge.org; http://www.rowledge.org/tim Strange OpCodes: HBT: Harvest Binary Tree

4 5

The Trunk: Collections-pre.762.mcz
by commits＠source.squeak.org 29 Aug '17

29 Aug '17

Patrick Rein uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-pre.762.mcz ==================== Summary ==================== Name: Collections-pre.762 Author: pre Time: 29 August 2017, 4:50:11.458834 pm UUID: d7838b91-7ce4-c34c-ac5a-c46cee281140 Ancestors: Collections-bf.761 Changes the HTMLReadWriter to deal correctly with nested tags and their mapping to text attributes. Also adds a comment to the class. =============== Diff against Collections-bf.761 =============== Item was changed: TextReadWriter subclass: #HtmlReadWriter instanceVariableNames: 'count offset runStack runArray string breakLines' classVariableNames: '' poolDictionaries: '' category: 'Collections-Text'! + + !HtmlReadWriter commentStamp: 'pre 8/29/2017 16:14' prior: 0! + A HtmlReadWriter is used to read a Text object from a string containing HTML or writing a Text object to a string with HTML tags representing the text attributes. + + It does two things currently: + 1) Setting text attributes on the beginning of tags, e.g. setting a bold text attribute when seeing a tag. + 2) Changing the resulting string, e.g. replacing a with a Character cr. + + The implementation works by pushing attributes on a stack on every opening tag. On the corresponding closing tag, the attribute is poped from the stack and stored in an array of attribute runs. From this array the final string is constructed. + + ## Notes on the implementation + - The final run array is completely constructed while parsing so it has to be correct with regard to the length of the runs. There is no consolidation except for merging neighboring runs which include the same attributes. + - The *count* variable is the position in the source string, the *offset* is the number of skipped characters, for example ones that denote a tag. + - The stack contains elements which are of the form: {text attributes. current start index. original start}! Item was added: + ----- Method: HtmlReadWriter>>addCharacter: (in category 'private') ----- + addCharacter: aCharacter + + string add: aCharacter. + count := count + 1.! Item was added: + ----- Method: HtmlReadWriter>>addString: (in category 'private') ----- + addString: aString + + string addAll: aString. + count := count + aString size.! Item was changed: ----- Method: HtmlReadWriter>>isTagIgnored: (in category 'testing') ----- isTagIgnored: aTag | space t | + t := aTag copyWithoutAll: '</>'. + space := t indexOf: Character space. - space := aTag indexOf: Character space. t := space > 0 + ifTrue: [t copyFrom: 1 to: space - 1] + ifFalse: [t]. - ifTrue: [aTag copyFrom: 2 to: space - 1] - ifFalse: [aTag copyFrom: 2 to: aTag size - 1]. ^ self ignoredTags includes: t! Item was changed: ----- Method: HtmlReadWriter>>mapCloseCodeTag (in category 'mapping') ----- mapCloseCodeTag | theDoIt | theDoIt := runStack top first detect: [:attribute | attribute isKindOf: TextDoIt] ifNone: [^ self "nothing found, ignore"]. + theDoIt evalString: (String withAll: (string copyFrom: runStack top third to: string size)).! - theDoIt evalString: (String withAll: (string copyFrom: runStack top second to: string size)).! Item was changed: + ----- Method: HtmlReadWriter>>nextPutText: (in category 'private') ----- - ----- Method: HtmlReadWriter>>nextPutText: (in category 'accessing') ----- nextPutText: aText | previous | previous := #(). self activateAttributesEnding: #() starting: previous. "for consistency" aText runs withStartStopAndValueDo: [:start :stop :attributes | self deactivateAttributesEnding: previous starting: attributes; activateAttributesEnding: previous starting: attributes; writeContent: (aText string copyFrom: start to: stop). previous := attributes]. self deactivateAttributesEnding: previous starting: #().! Item was changed: + ----- Method: HtmlReadWriter>>nextText (in category 'private') ----- - ----- Method: HtmlReadWriter>>nextText (in category 'accessing') ----- nextText count := 0. offset := 0. "To ignore characters in the input string that are used by tags." runStack := Stack new. runArray := RunArray new. string := OrderedCollection new. + "{text attributes. current start index. original start}" + runStack push: {OrderedCollection new. 1. 1}. - "{text attributes. start index. end index. number of open tags}" - runStack push: {OrderedCollection new. 1. nil. 0}. [stream atEnd] whileFalse: [self processNextTag]. self processRunStackTop. "Add last run." string := String withAll: string. runArray coalesce. ^ Text string: string runs: runArray! Item was changed: ----- Method: HtmlReadWriter>>processEmptyTag: (in category 'reading') ----- processEmptyTag: aTag (aTag beginsWith: '<br') ifTrue: [ + self addCharacter: Character cr. - string add: Character cr. - count := count + 1. ^ self]. + (self isTagIgnored: aTag) - (self ignoredTags includes: (aTag copyFrom: 2 to: aTag size - 3)) ifTrue: [^ self]. + "TODO... what?"! - "TODO..."! Item was changed: ----- Method: HtmlReadWriter>>processEndTag: (in category 'reading') ----- processEndTag: aTag | index tagName | index := count - offset. tagName := aTag copyFrom: 3 to: aTag size - 1. + (self isTagIgnored: tagName) ifTrue: [^ self]. + - (self ignoredTags includes: tagName) ifTrue: [^ self]. tagName = 'code' ifTrue: [self mapCloseCodeTag]. tagName = 'pre' ifTrue: [self breakLines: true]. - - "De-Accumulate adjacent tags." - runStack top at: 4 put: runStack top fourth - 1. - runStack top fourth > 0 - ifTrue: [^ self "not yet"]. self processRunStackTop. runStack pop. runStack top at: 2 put: index + 1.! Item was changed: ----- Method: HtmlReadWriter>>processHtmlEscape: (in category 'reading') ----- processHtmlEscape: aString | escapeSequence | escapeSequence := aString copyFrom: 2 to: aString size - 1. escapeSequence first = $# ifTrue: [^ self processHtmlEscapeNumber: escapeSequence allButFirst]. (String htmlEntities at: (aString copyFrom: 2 to: aString size - 1) ifAbsent: []) ifNotNil: [:char | + self addCharacter: char].! - string add: char. - count := count + 1].! Item was changed: + ----- Method: HtmlReadWriter>>processHtmlEscapeNumber: (in category 'private') ----- - ----- Method: HtmlReadWriter>>processHtmlEscapeNumber: (in category 'reading') ----- processHtmlEscapeNumber: aString | number | number := aString first = $x ifTrue: [ '16r', aString allButFirst ] ifFalse: [ aString ]. + self addCharacter: number asNumber asCharacter. + ! - string add: number asNumber asCharacter! Item was changed: ----- Method: HtmlReadWriter>>processNextTag (in category 'reading') ----- processNextTag | tag htmlEscape lookForNewTag lookForHtmlEscape tagFound valid inComment inTagString | lookForNewTag := true. lookForHtmlEscape := false. tagFound := false. tag := OrderedCollection new. htmlEscape := OrderedCollection new. inComment := false. inTagString := false. [stream atEnd not and: [tagFound not]] whileTrue: [ | character | character := stream next. valid := (#(10 13) includes: character asciiValue) not. count := count + 1. character = $< ifTrue: [lookForNewTag := false]. + character = $& ifTrue: [inComment ifFalse: [lookForHtmlEscape := true]]. - character = $& ifTrue: [ - inComment ifFalse: [lookForHtmlEscape := true]]. lookForNewTag ifTrue: [ lookForHtmlEscape ifFalse: [ (valid or: [self breakLines not]) ifTrue: [string add: character] ifFalse: [offset := offset + 1]] ifTrue: [valid ifTrue: [htmlEscape add: character]. offset := offset + 1]] ifFalse: [valid ifTrue: [tag add: character]. offset := offset + 1]. "Toggle within tag string/text." (character = $" and: [lookForNewTag not]) ifTrue: [inTagString := inTagString not]. inComment := ((lookForNewTag not and: [tag size >= 4]) and: [tag beginsWith: '<!!--']) and: [(tag endsWith: '-->') not]. (((character = $> and: [inComment not]) and: [lookForNewTag not]) and: [inTagString not]) ifTrue: [ lookForNewTag := true. (tag beginsWith: '<!!--') ifTrue: [self processComment: (String withAll: tag)] ifFalse: [tag second ~= $/ ifTrue: [ (tag atLast: 2) == $/ ifTrue: [self processEmptyTag: (String withAll: tag)] ifFalse: [self processStartTag: (String withAll: tag)]] ifFalse: [self processEndTag: (String withAll: tag)]]. tagFound := true]. (((character = $; and: [lookForNewTag]) and: [htmlEscape notEmpty]) and: [htmlEscape first = $&]) ifTrue: [ lookForHtmlEscape := false. self processHtmlEscape: (String withAll: htmlEscape). htmlEscape := OrderedCollection new]]. ! Item was changed: ----- Method: HtmlReadWriter>>processRunStackTop (in category 'reading') ----- processRunStackTop "Write accumulated attributes to run array." + | currentIndex start attrs | + currentIndex := count - offset. - | index start end attrs | - index := count - offset. - - "Set end index." - runStack top at: 3 put: index. - "Write to run array." start := runStack top second. - end := runStack top third. attrs := runStack top first. runArray addLast: attrs asArray + times: currentIndex - start + 1.! - times: end - start + 1.! Item was changed: ----- Method: HtmlReadWriter>>processStartTag: (in category 'reading') ----- processStartTag: aTag | index | (self isTagIgnored: aTag) ifTrue: [^ self]. index := count - offset. aTag = ' ' ifTrue: [ + self addCharacter: Character cr. - string add: Character cr. - count := count + 1. ^ self]. (aTag beginsWith: '<img') ifTrue: [ + self addString: '[image]'. - string addAll: '[image]'. - count := count + 7. ^ self]. + self processRunStackTop. "To add all attributes before the next tag adds some." - "Accumulate adjacent tags." - (runStack size > 1 and: [runStack top second = (index + 1) "= adjacent start tags"]) - ifTrue: [ - runStack top at: 1 put: (runStack top first copy addAll: (self mapTagToAttribute: aTag); yourself). - runStack top at: 4 put: (runStack top fourth + 1). "increase number of open tags" - ^self]. - - self processRunStackTop. - "Remove start/end info to reuse attributes later." - runStack top at: 2 put: nil. - runStack top at: 3 put: nil. "Copy attr list and add new attr." + runStack push: ({runStack top first copy addAll: (self mapTagToAttribute: aTag); yourself. index + 1 . index + 1}). + ! - runStack push: ({runStack top first copy addAll: (self mapTagToAttribute: aTag); yourself. index + 1. nil. 1}).!

2 1

The Trunk: CollectionsTests-pre.281.mcz
by commits＠source.squeak.org 29 Aug '17

29 Aug '17

Patrick Rein uploaded a new version of CollectionsTests to project The Trunk: http://source.squeak.org/trunk/CollectionsTests-pre.281.mcz ==================== Summary ==================== Name: CollectionsTests-pre.281 Author: pre Time: 29 August 2017, 4:48:41.041834 pm UUID: af95c7d9-1681-c941-81a5-d74691576b20 Ancestors: CollectionsTests-eem.280 Adds and modifies tests for the HTMLReadWriter to cater for nested attributes =============== Diff against CollectionsTests-eem.280 =============== Item was changed: ----- Method: HtmlReadWriterTest>>test02Mixed (in category 'tests') ----- test02Mixed "At the moment, the html code generation is kind of verbose..." { + 'Hello, World!!!!'. + 'Hello, World!!!!' asText + addAttribute: TextEmphasis bold from: 1 to: 13; - 'Hello, World!!'. - 'Hello, World!!' asText - addAttribute: TextEmphasis bold; addAttribute: TextEmphasis italic from: 8 to: 13. } pairsDo: [:expectedHtml :expectedText | self convertHtml: expectedHtml. self assert: expectedText string equals: text string. self assert: expectedText runs equals: text runs. self convertText: expectedText. self assert: expectedHtml equals: html].! Item was changed: ----- Method: HtmlReadWriterTest>>test08MultilineCode (in category 'tests') ----- test08MultilineCode { '<code> <pre>3 + 7. 3 > 4.</pre></code>' . Text string: '3 + 7. + 3 > 4.' runs: (RunArray runs: #(13) values: { {TextDoIt evalString: '3 + 7. - 3 > 4.' runs: (RunArray runs: #(13 ) values: { {TextDoIt evalString: '3 + 7. 3 > 4.' } } ) } pairsDo: [:expectedHtml :expectedText | self convertHtml: expectedHtml. self assert: expectedText string equals: text string. self assert: expectedText runs equals: text runs. self convertText: expectedText. self assert: expectedHtml equals: html].! Item was added: + ----- Method: HtmlReadWriterTest>>test15NestedTagsStillEndBefore (in category 'tests') ----- + test15NestedTagsStillEndBefore + + { + 'Hallo welt'. + 'Hallo welt' asText + addAttribute: TextEmphasis italic from: 1 to: 5. + } pairsDo: [:expectedHtml :expectedText | + self convertHtml: expectedHtml. + self assert: expectedText string equals: text string. + self assert: expectedText runs equals: text runs]!

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →