Squeak-dev September 2009

squeak-dev@lists.squeakfoundation.org

119 participants
370 discussions

FreeTypePlus integration status
by Andreas Raab 01 Sep '09

01 Sep '09

Hi - I'm sure most of you have seen what I've been up to on the weekend. I did a round of integration work on Freetype in order to make its installation and uninstallation just as simple as Shout. Plus, there have already been some changes to font rendering in the trunk that interact with Freetype's overrides in problematic ways and I really want to give this stuff even more of a make-over which would make the problem only worse. The current status is that outside of the FreeTypePlus core classes you need two additional extension methods, BitBlit(GrafPort)>>installFreeTypeFont:... and BitBlt>>copyBitsColor:alpha:gammaTable:ungammaTable:. I've left these with Freetype since they are "classic" extension methods (that is they add functionality that is required by Freetype but doesn't affect anything else). Other than that there are no further extensions or overrides of the core packages necessary. All of the core font stuff has been merged and the only other thing needed is to tell Squeak where to find the new fonts. I've cheated a little on that one by providing a hook that allows replacing the font chooser with one that knows how to deal with Freetype fonts, i.e., after installing Freetype you can simply execute "FontChooserTool default: FontChooser" and it will take the FontChooser from Freetype and give you access to the Freetype fonts. Andy - I'm curious if you would consider moving these extensions and overrides out of the Freetype and into some FreetypePatches packages (just like you have with the PinesoftEnhancementsForFreetype). This would allow us to load a straight version of Freetype into trunk images without the fear of conflicts. Cheers, - Andreas

2 1

The Trunk: Kernel-tfel.235.mcz
by commits＠source.squeak.org 01 Sep '09

01 Sep '09

A new version of Kernel was added to project The Trunk: http://source.squeak.org/trunk/Kernel-tfel.235.mcz ==================== Summary ==================== Name: Kernel-tfel.235 Author: tfel Time: 1 September 2009, 11:37:20 am UUID: d2e0bf54-4389-4074-8d85-d98707f39ef1 Ancestors: Kernel-ar.234 Changed the parsing from Stream in Date and Time classes to be more forgiving and esp. in the Date class to allow the ISO8601 format. Also changed the DateAndTime parsing to use the methods of Date and Time to parse their parts of the Stream making the whole method more forgiving if they don't properly keep to the standard. =============== Diff against Kernel-ar.234 =============== Item was changed: ----- Method: DateAndTime class>>readFrom: (in category 'squeak protocol') ----- readFrom: aStream - | bc year month day hour minute second nanos offset buffer ch | - - - aStream peek = $- ifTrue: [ aStream next. bc := -1] ifFalse: [bc := 1]. - year := (aStream upTo: $-) asInteger * bc. - month := (aStream upTo: $-) asInteger. - day := (aStream upTo: $T) asInteger. - hour := (aStream upTo: $:) asInteger. - buffer := '00:' copy. ch := nil. - minute := WriteStream on: buffer. - [ aStream atEnd | (ch = $:) | (ch = $+) | (ch = $-) ] - whileFalse: [ ch := minute nextPut: aStream next. ]. - (ch isNil or: [ch isDigit]) ifTrue: [ ch := $: ]. - minute := ((ReadStream on: buffer) upTo: ch) asInteger. - buffer := '00.' copy. - second := WriteStream on: buffer. - [ aStream atEnd | (ch = $.) | (ch = $+) | (ch = $-) ] - whileFalse: [ ch := second nextPut: aStream next. ]. - (ch isNil or: [ch isDigit]) ifTrue: [ ch := $. ]. - second := ((ReadStream on: buffer) upTo: ch) asInteger. - buffer := '000000000+' copy. - (ch = $.) ifTrue: [ - nanos := WriteStream on: buffer. - [ aStream atEnd | ((ch := aStream next) = $+) | (ch = $-) ] - whileFalse: [ nanos nextPut: ch. ]. - (ch isNil or: [ch isDigit]) ifTrue: [ ch := $+ ]. - ]. - - nanos := buffer asInteger. - aStream atEnd - ifTrue: [ offset := self localOffset ] - - ifFalse: - [offset := Duration fromString: (ch asString, '0:', aStream upToEnd). - - (offset = self localOffset) ifTrue: [ offset := self localOffset ]]. - ^ self - year: year - month: month - day: day - hour: hour - minute: minute - - second: second - nanoSecond: nanos + | offset date time ch | + + date := Date readFrom: aStream. + [aStream peek isDigit] + whileFalse: [aStream next]. + time := Time readFrom: aStream. + aStream atEnd + ifTrue: [ offset := self localOffset ] + ifFalse: [ + ch := aStream next. + ch = $+ ifTrue: [ch := Character space]. + offset := Duration fromString: ch asString, '0:', aStream upToEnd]. + + ^ self + year: date year + month: date monthIndex + day: date dayOfMonth + hour: time hour + minute: time minute + second: time second + nanoSecond: time nanoSecond + offset: offset - offset: offset. " '-1199-01-05T20:33:14.321-05:00' asDateAndTime ' 2002-05-16T17:20:45.1+01:01' asDateAndTime ' 2002-05-16T17:20:45.02+01:01' asDateAndTime ' 2002-05-16T17:20:45.003+01:01' asDateAndTime ' 2002-05-16T17:20:45.0004+01:01' asDateAndTime ' 2002-05-16T17:20:45.00005' asDateAndTime ' 2002-05-16T17:20:45.000006+01:01' asDateAndTime ' 2002-05-16T17:20:45.0000007+01:01' asDateAndTime ' 2002-05-16T17:20:45.00000008-01:01' asDateAndTime ' 2002-05-16T17:20:45.000000009+01:01' asDateAndTime ' 2002-05-16T17:20:45.0000000001+01:01' asDateAndTime ' 2002-05-16T17:20' asDateAndTime ' 2002-05-16T17:20:45' asDateAndTime ' 2002-05-16T17:20:45+01:57' asDateAndTime ' 2002-05-16T17:20:45-02:34' asDateAndTime ' 2002-05-16T17:20:45+00:00' asDateAndTime ' 1997-04-26T01:02:03+01:02:3' asDateAndTime "! Item was changed: ----- Method: Time class>>readFrom: (in category 'smalltalk-80') ----- readFrom: aStream "Read a Time from the stream in the form: <hour>:<minute>:<second> <am/pm> <minute>, <second> or <am/pm> may be omitted. e.g. 1:59:30 pm; 8AM; 15:30" + | hour minute second ampm nanos nanosBuffer | - | hour minute second ampm | hour := Integer readFrom: aStream. minute := 0. second := 0. + nanosBuffer := '000000000' copy. + nanos := ReadWriteStream on: nanosBuffer. + (aStream peekFor: $:) + ifTrue: [ + minute := Integer readFrom: aStream. + (aStream peekFor: $:) + ifTrue: [ + second := Integer readFrom: aStream]. + (aStream peekFor: $.) + ifTrue: [ + [aStream atEnd not and: [aStream peek isDigit]] + whileTrue: [nanos nextPut: aStream next]]]. - (aStream peekFor: $:) ifTrue: - - [ minute := Integer readFrom: aStream. - (aStream peekFor: $:) ifTrue: [ second := Integer readFrom: aStream ]]. aStream skipSeparators. (aStream atEnd not and: [aStream peek isLetter]) ifTrue: [ampm := aStream next asLowercase. (ampm = $p and: [hour < 12]) ifTrue: [hour := hour + 12]. (ampm = $a and: [hour = 12]) ifTrue: [hour := 0]. (aStream peekFor: $m) ifFalse: [aStream peekFor: $M ]]. + ^ self + hour: hour + minute: minute + second: second + nanoSecond: nanosBuffer asInteger - ^ self hour: hour minute: minute second: second - "Time readFrom: (ReadStream on: '2:23:09 pm')"! Item was changed: ----- Method: Date class>>readFrom: (in category 'squeak protocol') ----- readFrom: aStream "Read a Date from the stream in any of the forms: + <day> <month> <year> (15 April 1982; 15-APR-82; 15.4.82; 15APR82) + <month> <day> <year> (April 15, 1982; 4/15/82) + <year>-<month>-<day> (1982-04-15) (ISO8601)" + | day month year parsedNumber prefix | + aStream peek = $- + ifTrue: [prefix := -1] + ifFalse: [prefix := 1]. - - <day> <monthName> <year> (5 April 1982; 5-APR-82) - - <monthName> <day> <year> (April 5, 1982) - - <monthNumber> <day> <year> (4/5/82) - <day><monthName><year> (5APR82)" - | day month year | - aStream peek isDigit - ifTrue: [day := Integer readFrom: aStream]. [aStream peek isAlphaNumeric] whileFalse: [aStream skip: 1]. + aStream peek isDigit + ifTrue: [ + parsedNumber := (Integer readFrom: aStream) * prefix. + (parsedNumber < 0 or: [parsedNumber > 31]) + ifTrue: [year := parsedNumber]]. + [aStream peek isAlphaNumeric] + whileFalse: [aStream skip: 1]. aStream peek isLetter + ifTrue: ["MM-DD-YY or DD-MM-YY or YY-MM-DD" + month := WriteStream on: (String new: 10). - ifTrue: ["number/name... or name..." - month := WriteStream - on: (String new: 10). [aStream peek isLetter] whileTrue: [month nextPut: aStream next]. month := month contents. + [aStream peek isAlphaNumeric] + whileFalse: [aStream skip: 1]. + parsedNumber isNil + ifTrue: ["MM DD YY" + day := Integer readFrom: aStream] + ifFalse: [ + year isNil + ifTrue: ["DD MM YY" + day := parsedNumber]]] + ifFalse: ["MM-DD-YY or DD-MM-YY or YY-MM-DD" + year isNil + ifTrue: ["MM-DD-YY or DD-MM-YY" + parsedNumber > 12 + ifTrue: ["DD-MM-YY" + day := parsedNumber. + month := Month nameOfMonth: (Integer readFrom: aStream)] + ifFalse: ["MM-DD-YY" + month := Month nameOfMonth: parsedNumber. + day := Integer readFrom: aStream]] + ifFalse: ["YY-MM-DD" + month := Month nameOfMonth: (Integer readFrom: aStream)]]. - day isNil - ifTrue: ["name/number..." - [aStream peek isAlphaNumeric] - whileFalse: [aStream skip: 1]. - day := Integer readFrom: aStream]] - ifFalse: ["number/number..." - month := Month nameOfMonth: day. - day := Integer readFrom: aStream]. [aStream peek isAlphaNumeric] whileFalse: [aStream skip: 1]. + year isNil + ifTrue: [year := Integer readFrom: aStream] + ifFalse: [day := Integer readFrom: aStream]. + (year < 100 and: [year >= 0]) + ifTrue: [ + year < 69 + ifTrue: [ year := 2000 + year] + ifFalse: [year := 1900 + year]]. - year := Integer readFrom: aStream. - year < 10 ifTrue: [year := 2000 + year] - ifFalse: [ year < 1900 ifTrue: [ year := 1900 + year]]. ^ self year: year month: month day: day !

1 0

The Trunk: KernelTests-tfel.89.mcz
by commits＠source.squeak.org 01 Sep '09

01 Sep '09

A new version of KernelTests was added to project The Trunk: http://source.squeak.org/trunk/KernelTests-tfel.89.mcz ==================== Summary ==================== Name: KernelTests-tfel.89 Author: tfel Time: 1 September 2009, 11:43:01 am UUID: f0986558-bc8e-4799-8daf-547574dd7e6e Ancestors: KernelTests-laza.88 Change a test in the Time tests to check if it allows nanSeconds at the end. Add a test in Date tests to check parsing from ISO8601. These are for a proposed change in the parsing methods. =============== Diff against KernelTests-laza.88 =============== Item was changed: ----- Method: TimeTest>>testReadFrom (in category 'Tests') ----- testReadFrom + | t1 t2 | + t1 := self timeClass readFrom: '4:02:47 am' readStream. + t2 := self timeClass readFrom: '4:02:47.000 am' readStream. - | string t | - string := '4:02:47 am'. - t := self timeClass readFrom: string readStream. self + assert: time = t1; + assert: time = t2 - assert: time = t. ! Item was added: + ----- Method: DateTest>>testConvertingFromIso8601 (in category 'Tests') ----- + testConvertingFromIso8601 + + self + assert: '1973-06-02' asDate = date; + assert: '1973-JUN-02' asDate = date; + assert: '1973-June-02' asDate = date!

1 0

Status of Tests in trunk
by Alexander Lazarević 01 Sep '09

01 Sep '09

6 11

Re: Polymorph/Trunk issues (was: Re: Incompatible code between pharo and Squeak)
by Gary Chambers 01 Sep '09

01 Sep '09

Regards, Gary ----- Original Message ----- From: "Gary Chambers" <gazzaguru2(a)btinternet.com> To: "Andreas Raab" <andreas.raab(a)gmx.de> Sent: Wednesday, August 26, 2009 2:51 PM Subject: Re: Polymorph/Trunk issues (was: Re: Incompatible code between pharo and Squeak) > > > Regards, Gary > > ----- Original Message ----- > From: "Andreas Raab" <andreas.raab(a)gmx.de> > To: "The general-purpose Squeak developers list" > <squeak-dev(a)lists.squeakfoundation.org>; <gazzaguru2(a)btinternet.com> > Sent: Wednesday, August 26, 2009 4:36 AM > Subject: Polymorph/Trunk issues (was: Re: Incompatible code between pharo > and Squeak) > > >> Hi Giuseppe - >> >> [cc: Gary for input on some of the issues below] >> >> Giuseppe Luigi Punzi Ruiz wrote: >>> I started from >>> http://squeakvm.org/win32/release/Squeak-3.10.2-trunk.zip, Load Code >>> Updates. >>> Then, I add the MC repository of Polymorph, and Load latest package of >>> Polymorph-Widgets, then latest from Polymorph-Squeak-Widgets >>> >>> Title bar looks ugly, and If you open Preferences, click on Windows to >>> get a MNU (and others strange behaviour). >> >> Let's start with the easy stuff. The issue of the ugly title bars are >> caused by an age-old issue of trying to create a bold version of a font >> that's already bold (and failing to do so in a visually pleasing way). >> You can work around this issue by changing the window title font to a >> non-bold font (or convincing Gary not to bolden the title font in the >> SoftSqueak theme ;-) >> >> The preferences blow up has been fixed in the trunk, it resulted from the >> use of custom view registries in Polymorph (but was my fault for not >> properly supporting those). >> >> However, even after fixing that I got some errors about >> BlockClosure>>isValid and BlockClosure>>asMinimalRepresentation. Looking >> around in the Polymorph repository I found these in >> Polymorph-EventEnhancements (but on BlockContext not on BlockClosure) >> with a number of other extension methods and classes none of which seem >> to be used by Polymorph-Widgets. >> >> Question for Gary: Is it enough to implement these methods on >> BlockClosure and expect things to work without having to load >> Polymorph-EventEnhancements, or is some or all of EventEnhancements >> needed for Polymorph? If it's just the two methods I think we should put >> them into the trunk with comments and get over it. > > Just those, the rest of EventEnhancements is used by the Diff Tools > though. > There was some discussion a while back (and, possibly on Mantis) about > them. > >> The other package I looked at was Polymorph-Squeak-Widgets. There are >> only two methods here; one in BorderedMorph that looks like an obvious >> fix and should be added to the trunk. The other one (#handleDisabledKey:) >> is on ParagraphEditor and effectively a no-op since we are switching to >> the Cuis editors. Something will need to be added to TextEditor for this >> purpose. >> >> Question for Gary: Should these be folded into Squeak proper or do you >> prefer to keep them in Polymorph? Either way is fine by me but you might >> have a preference. >> >> Then there is the issue of overrides. Polymorph contains a lot of them >> which is understandable considering what it is doing but it means that >> the code will be very brittle with regards to any changes in Morphic. >> >> Question for Gary: Do you think it would make sense to try to integrate >> these overrides so that we avoid these brittle dependencies or is this >> just going to create a maintenance nightmare for you (i.e., having >> versions with and without overrides)? >> > > Will need to be done eventually... with a patch package for Squeak3.9. > > >> Lastly, performance. The image felt slow after loading Polymorph which I >> attributed at first to the pretty gradients but when I switched to the >> "StandardSqueak" theme (which is indistinguishable from the trunk's >> current look) it still felt slow. So I ran a version of the "standard" >> browser benchmark: >> >> | saveMorphs time | >> [saveMorphs := World submorphs. >> World removeAllMorphs."heh, heh" >> time := [1 to: 10 do: [:i | >> MorphicToolBuilder new open: >> (Browser new setClass: SystemDictionary selector: nil). >> World doOneCycleNow]. >> World submorphs do: [:m | m delete. World doOneCycleNow]. >> ] timeToRun] ensure:[World addAllMorphs: saveMorphs]. >> >> I found that in the current trunk image the benchmark completes in less >> than half the time (!) that it takes to run it in the same image with >> Polymorph loaded (10401 msecs vs. 23297 msecs). Something is slowing down >> with Polymorph and very much so. >> >> Question for Gary: Is there any intrinsic reason why the Polymorph image >> would be so much slower? Have you done any serious performance analysis >> and any insights what might be slowing it down? The benchmark was run >> with all animations turned off yaddaya to get as close as possible to the >> default Squeak look. I actually think that the above benchmark is a >> smoking gun that you can increase performance of Polymorph by 2x if you >> can find out what is slowing you down. > > This is mostly down to having correct scrollbar ranges. I've done some > optimisation that narrows the gap (1900 for Squeak, 2200 in Pharo). Will > put out in next update. > >> >> All said and done the situation is this: Once you update from the trunk >> you need to implement two methods on BlockClosure, that is >> BlockClosure>>isValid (returns true) and >> BlockClosure>>asMinimalRepresentation (returns self). Once this is done, >> load Polymorph-Widgets and Polymorph will work. There is the outstanding >> issue of ParagraphEditor but it won't cause any immediate harm and I'd >> like to hear back from Gary before deciding on how to fix these issues. >> >> Cheers, >> - Andreas >> >

1 0

Latest trunk and tests
by Alexander Lazarević 01 Sep '09

01 Sep '09

Maybe someone can verify this. With the latest batch of updates the BitmapStreamTests result in errors for me. Alex

1 1

The Trunk: Kernel-ar.234.mcz
by commits＠source.squeak.org 01 Sep '09

01 Sep '09

Andreas Raab uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-ar.234.mcz ==================== Summary ==================== Name: Kernel-ar.234 Author: ar Time: 1 September 2009, 1:19:59 am UUID: 24194d03-8c8c-324f-b6bb-34c7caf7011e Ancestors: Kernel-ar.233 BlockClosure>>argumentCount for ansi compatibility. =============== Diff against Kernel-ar.233 =============== Item was added: + ----- Method: BlockClosure>>argumentCount (in category 'accessing') ----- + argumentCount + "Answers the number of arguments needed to evaluate the receiver. + For ansi compatibility." + ^ self numArgs!

1 0

The Trunk: Kernel-ar.233.mcz
by commits＠source.squeak.org 01 Sep '09

01 Sep '09

Andreas Raab uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-ar.233.mcz ==================== Summary ==================== Name: Kernel-ar.233 Author: ar Time: 1 September 2009, 1:00 am UUID: 3041bac3-13dd-d841-99a7-79e006ddf675 Ancestors: Kernel-dtl.232 Restore traits composition when printing class definitions. =============== Diff against Kernel-dtl.232 =============== Item was changed: ----- Method: ClassDescription>>definition (in category 'fileIn/Out') ----- definition "Answer a String that defines the receiver." | aStream path | aStream := WriteStream on: (String new: 300). superclass == nil ifTrue: [aStream nextPutAll: 'ProtoObject'] ifFalse: [path := ''. self environment scopeFor: superclass name from: nil envtAndPathIfFound: [:envt :remotePath | path := remotePath]. aStream nextPutAll: path , superclass name]. aStream nextPutAll: self kindOfSubclass; store: self name. + (self hasTraitComposition and: [self traitComposition notEmpty]) ifTrue: [ + aStream cr; tab; nextPutAll: 'uses: '; + nextPutAll: self traitCompositionString]. aStream cr; tab; nextPutAll: 'instanceVariableNames: '; store: self instanceVariablesString. aStream cr; tab; nextPutAll: 'classVariableNames: '; store: self classVariablesString. aStream cr; tab; nextPutAll: 'poolDictionaries: '; store: self sharedPoolsString. aStream cr; tab; nextPutAll: 'category: '; store: (SystemOrganization categoryOfElement: self name) asString. superclass ifNil: [ aStream nextPutAll: '.'; cr. aStream nextPutAll: self name. aStream space; nextPutAll: 'superclass: nil'. ]. ^ aStream contents!

1 0

The Trunk: CollectionsTests-ar.93.mcz
by commits＠source.squeak.org 01 Sep '09

01 Sep '09

Andreas Raab uploaded a new version of CollectionsTests to project The Trunk: http://source.squeak.org/trunk/CollectionsTests-ar.93.mcz ==================== Summary ==================== Name: CollectionsTests-ar.93 Author: ar Time: 1 September 2009, 12:58:10 pm UUID: adc1c915-26d6-644c-bf9b-482bf46a9418 Ancestors: CollectionsTests-jcg.92, CollectionsTests-ar.92 Fix concurrent commit with Josh. =============== Diff against CollectionsTests-jcg.92 =============== Item was added: + TestCase subclass: #RWBinaryOrTextStreamTest + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CollectionsTests-Streams'! Item was added: + ----- Method: RWBinaryOrTextStreamTest>>testUpToEnd (in category 'tests') ----- + testUpToEnd + + | stream | + stream := RWBinaryOrTextStream on: String new. + stream nextPutAll: 'world'; reset. + self assert: stream upToEnd = 'world'. + self assert: stream atEnd. + + self assert: stream upToEnd = ''. + self assert: stream atEnd. + + stream reset. + stream upTo: $r. + self assert: stream upToEnd = 'ld'. + self assert: stream atEnd. + + stream := RWBinaryOrTextStream on: String new. + stream binary. + stream nextPutAll: 'world'; reset. + self assert: stream upToEnd = 'world' asByteArray. + self assert: stream atEnd. + + self assert: stream upToEnd = ByteArray new. + self assert: stream atEnd. + + stream reset. + stream upTo: $r asciiValue. + self assert: stream upToEnd = 'ld' asByteArray. + self assert: stream atEnd! Item was added: + ----- Method: RWBinaryOrTextStreamTest>>testNextPutAll (in category 'tests') ----- + testNextPutAll + + | stream | + stream := RWBinaryOrTextStream on: String new. + stream nextPutAll: 'hello'. + self assert: stream contents = 'hello'. + + stream := RWBinaryOrTextStream on: String new. + stream nextPutAll: 'hello' asArray. + self assert: stream contents = 'hello'. + + stream := RWBinaryOrTextStream on: String new. + stream nextPutAll: 'hello' asByteArray. + self assert: stream contents = 'hello' + ! Item was added: + ----- Method: RWBinaryOrTextStreamTest>>testUpTo (in category 'tests') ----- + testUpTo + + | stream | + stream := RWBinaryOrTextStream on: String new. + stream nextPutAll: 'world'; reset. + self assert: (stream upTo: $r) = 'wo'. + self assert: stream next = $l. + + stream := RWBinaryOrTextStream on: String new. + stream nextPutAll: 'hello'; reset. + self assert: (stream upTo: $x) = 'hello'. + self assert: stream atEnd. + + stream := RWBinaryOrTextStream on: String new. + stream binary. + stream nextPutAll: 'world'; reset. + self assert: (stream upTo: $r asciiValue) = 'wo' asByteArray. + self assert: stream next = $l asciiValue. + + stream := RWBinaryOrTextStream on: String new. + stream binary. + stream nextPutAll: 'hello'; reset. + self assert: (stream upTo: $x asciiValue) = 'hello' asByteArray. + self assert: stream atEnd. + ! Item was added: + ----- Method: CharacterTest>>testCodePoint (in category 'tests - creation') ----- + testCodePoint + self assert: (Character codePoint: $A asciiValue) = $A. + self shouldnt:[Character codePoint: 500] raise: Error. + self assert: (Character codePoint: 500) asciiValue = 500.!

1 0

The Trunk: Files-jcg.27.mcz
by commits＠source.squeak.org 01 Sep '09

01 Sep '09

Joshua Gargus uploaded a new version of Files to project The Trunk: http://source.squeak.org/trunk/Files-jcg.27.mcz ==================== Summary ==================== Name: Files-jcg.27 Author: jcg Time: 1 September 2009, 12:56:15 pm UUID: 1b72224b-d639-44fc-b7ef-3ea1d359f682 Ancestors: Files-ar.26 RemoteString>>checkSum: relied on broken behavior in #mimeEncode: (see Collections-jcg.124). Fixed this assumption, and simplified the code at the same time. =============== Diff against Files-ar.26 =============== Item was changed: ----- Method: RemoteString>>checkSum: (in category 'private') ----- checkSum: aString "Construct a checksum of the string. A three byte number represented as Base64 characters." + | sum shift bytes | + sum := aString size. + shift := 0. + aString do: [:char | + (shift := shift + 7) > 16 ifTrue: [shift := shift - 17]. + "shift by 7 to keep a change of adjacent chars from xoring to same value" + sum := sum bitXor: (char asInteger bitShift: shift) + ]. + bytes := ByteArray new: 3. + sum := sum + 16r10000000000. + 1 to: 3 do: [:ind | bytes at: ind put: (sum digitAt: ind)]. + ^bytes base64Encoded! - - | sum shift bytes ss bb | - sum := aString size. - shift := 0. - aString do: [:char | - (shift := shift + 7) > 16 ifTrue: [shift := shift - 17]. - "shift by 7 to keep a change of adjacent chars from xoring to same value" - sum := sum bitXor: (char asInteger bitShift: shift)]. - bytes := ByteArray new: 3. - sum := sum + 16r10000000000. - 1 to: 3 do: [:ind | bytes at: ind put: (sum digitAt: ind)]. - ss := ReadWriteStream on: (ByteArray new: 3). - ss nextPutAll: bytes. - bb := Base64MimeConverter mimeEncode: ss. - ^ bb contents! Item was changed: StandardFileStream subclass: #CrLfFileStream instanceVariableNames: 'lineEndConvention' + classVariableNames: 'Cr CrLf Lf LineEndDefault LineEndStrings LookAheadCount' - classVariableNames: 'LookAheadCount LineEndDefault LineEndStrings CrLf Cr Lf' poolDictionaries: '' category: 'Files-Kernel'! !CrLfFileStream commentStamp: 'ls 11/10/2002 13:32' prior: 0! I am the same as a regular file stream, except that when I am in text mode, I will automatically convert line endings between the underlying platform's convention, and Squeak's convention of carriage-return only. The goal is that Squeak text files can be treated as OS text files, and vice versa. In binary mode, I behave identically to a StandardFileStream. To enable CrLfFileStream as the default file stream class for an entire image, modify FileStream class concreteStream . There are two caveats on programming with CrLfFileStream. First, the choice of text mode versus binary mode affects which characters are visible in Squeak, and no longer just affects whether those characters are returned as Character's or as Integer's. Thus the choice of mode needs to be made very carefully, and must be based on intent instead of convenience of representation. The methods asString, asByteArray, asCharacter, and asInteger can be used to convert between character and integer representations. (Arguably, file streams should accept either strings or characters in nextPut: and nextPutAll:, but that is not the case right now.) Second, arithmetic on positions no longer works, because one character that Squeak sees (carriage return) could map to two characters in the underlying file (carriage return plus line feed, on MS Windows and MS DOS). Comparison between positions still works. (This caveat could perhaps be fixed by maintaining a map between Squeak positions and positions in the underlying file, but it is complicated. Consider, for example, updates to the middle of the file. Also, consider that text files are rarely updated in the middle of the file, and that general random access to a text file is rarely very useful. If general random access with specific file counts is desired, then the file is starting to sound like a binary file instead of a text file.) ! Item was changed: Object subclass: #FileDirectory instanceVariableNames: 'pathName' + classVariableNames: 'DefaultDirectory DirectoryClass StandardMIMEMappings' - classVariableNames: 'StandardMIMEMappings DirectoryClass DefaultDirectory' poolDictionaries: '' category: 'Files-Directories'! !FileDirectory commentStamp: '<historical>' prior: 0! A FileDirectory represents a folder or directory in the underlying platform's file system. It carries a fully-qualified path name for the directory it represents, and can enumerate the files and directories within that directory. A FileDirectory can be thought of as a Dictionary whose keys are the local names of files in that directory, and whose values are directory "entries". Each entry is an array of five items: <name> <creationTime> <modificationTime> <dirFlag> <fileSize> The times are given in seconds, and can be converted to a time and date via Time>dateAndTimeFromSeconds:. See the comment in lookupEntry:... which provides primitive access to this information. ! Item was changed: Object subclass: #RemoteString instanceVariableNames: 'sourceFileNumber filePositionHi' + classVariableNames: 'CurrentTextAttStructure CurrentTextAttVersion TextAttributeStructureVersions' - classVariableNames: 'TextAttributeStructureVersions CurrentTextAttVersion CurrentTextAttStructure' poolDictionaries: '' category: 'Files-System'! !RemoteString commentStamp: '<historical>' prior: 0! My instances provide an external file reference to a piece of text. It may be the sourceCode of a method, or the class comments of a class. The changes file or file-in file usually has a chunk that is just the source string of a method: max: aNumber ^ self > aNumber ifTrue: [self] ifFalse: [aNumber]!! I can return either a String or a Text. Some a chunk is followed by a second chunk (beginning with ]style[) containing style information. The encoding is like this: max: aNumber ^ self > aNumber ifTrue: [self] ifFalse: [aNumber]!! ]style[(14 50 312)f1,f1b,f1LInteger +;i!! Allowed TextAttributes are TextFontChange, TextEmphasis, TextColor, TextDoIt, TextKern, TextLink, TextURL. TextFontReference and TextAnchor are not supported. See PositionableStream nextChunkText and RunArray class scanFrom:.!

1 0

Jump to page: