Squeak-dev October 2013

squeak-dev@lists.squeakfoundation.org

35 participants
262 discussions

The Trunk: Graphics-nice.248.mcz
by commits＠source.squeak.org 03 Oct '13

03 Oct '13

Nicolas Cellier uploaded a new version of Graphics to project The Trunk: http://source.squeak.org/trunk/Graphics-nice.248.mcz ==================== Summary ==================== Name: Graphics-nice.248 Author: nice Time: 3 October 2013, 11:39:48.285 pm UUID: 1c360fb6-25d5-48e5-b472-6a3564663927 Ancestors: Graphics-nice.247 Fix small glitch: we must gobble all spaces before the one at which we wrap, but also all spaces after when we are justified. CompositionScanner>>crossedX is too long, split it in 3 understandable parts. Remove unused setConditionArray: Recategorize methods. =============== Diff against Graphics-nice.247 =============== Item was changed: + ----- Method: CharacterBlockScanner>>indentationLevel: (in category 'text attributes') ----- - ----- Method: CharacterBlockScanner>>indentationLevel: (in category 'scanning') ----- indentationLevel: anInteger super indentationLevel: anInteger. nextLeftMargin := leftMargin. indentationLevel timesRepeat: [ nextLeftMargin := textStyle nextTabXFrom: nextLeftMargin leftMargin: leftMargin rightMargin: rightMargin]! Item was changed: + ----- Method: CharacterBlockScanner>>placeEmbeddedObject: (in category 'stop conditions') ----- - ----- Method: CharacterBlockScanner>>placeEmbeddedObject: (in category 'scanning') ----- placeEmbeddedObject: anchoredMorph "Workaround: The following should really use #textAnchorType" anchoredMorph relativeTextAnchorPosition ifNotNil:[^true]. (super placeEmbeddedObject: anchoredMorph) ifFalse: [^ false]. specialWidth := anchoredMorph width. ^ true! Item was changed: + ----- Method: CharacterScanner>>addEmphasis: (in category 'text attributes') ----- - ----- Method: CharacterScanner>>addEmphasis: (in category 'private') ----- addEmphasis: code "Set the bold-ital-under-strike emphasis." emphasisCode := emphasisCode bitOr: code! Item was changed: + ----- Method: CharacterScanner>>addKern: (in category 'text attributes') ----- - ----- Method: CharacterScanner>>addKern: (in category 'private') ----- addKern: kernDelta "Set the current kern amount." kern := kern + kernDelta! Item was changed: + ----- Method: CharacterScanner>>columnBreak (in category 'stop conditions') ----- - ----- Method: CharacterScanner>>columnBreak (in category 'scanning') ----- columnBreak pendingKernX := 0. ^true! Item was changed: + ----- Method: CharacterScanner>>embeddedObject (in category 'stop conditions') ----- - ----- Method: CharacterScanner>>embeddedObject (in category 'scanning') ----- embeddedObject | savedIndex | savedIndex := lastIndex. text attributesAt: lastIndex do:[:attr| attr anchoredMorph ifNotNil:[ "Following may look strange but logic gets reversed. If the morph fits on this line we're not done (return false for true) and if the morph won't fit we're done (return true for false)" (self placeEmbeddedObject: attr anchoredMorph) ifFalse:[^true]]]. lastIndex := savedIndex + 1. "for multiple(!!) embedded morphs" ^false! Item was changed: + ----- Method: CharacterScanner>>handleIndentation (in category 'private') ----- - ----- Method: CharacterScanner>>handleIndentation (in category 'scanning') ----- handleIndentation self indentationLevel timesRepeat: [ self plainTab]! Item was changed: ----- Method: CharacterScanner>>historicalScanCharactersFrom:to:in:rightX:stopConditions:kern: (in category 'scanning') ----- historicalScanCharactersFrom: startIndex to: stopIndex in: sourceString rightX: rightX stopConditions: stops kern: kernDelta "Primitive. This is the inner loop of text display--but see scanCharactersFrom: to:rightX: which would get the string, stopConditions and displaying from the instance. March through source String from startIndex to stopIndex. If any character is flagged with a non-nil entry in stops, then return the corresponding value. Determine width of each character from xTable, indexed by map. If dextX would exceed rightX, then return stops at: 258. Advance destX by the width of the character. If stopIndex has been reached, then return stops at: 257. Optional. See Object documentation whatIsAPrimitive. Historical note: this primitive has been unusable since about Squeak 2.8 when the shape of the CharracterScanner class changed. It is left here as a reminder that the actual primitive still needs supporting in the VM to keep old images such as Scratch1.4 alive - tpr" | ascii nextDestX char | <primitive: 103> + lastIndex := startIndex. - lastIndex _ startIndex. [lastIndex <= stopIndex] whileTrue: [char := (sourceString at: lastIndex). ascii := char asciiValue + 1. (stops at: ascii) == nil ifFalse: [^stops at: ascii]. "Note: The following is querying the font about the width since the primitive may have failed due to a non-trivial mapping of characters to glyphs or a non-existing xTable." nextDestX := destX + (font widthOf: char). nextDestX > rightX ifTrue: [^stops at: CrossedX]. destX := nextDestX + kernDelta. lastIndex := lastIndex + 1]. lastIndex := stopIndex. ^stops at: EndOfRun ! Item was changed: + ----- Method: CharacterScanner>>indentationLevel (in category 'private') ----- - ----- Method: CharacterScanner>>indentationLevel (in category 'scanning') ----- indentationLevel "return the number of tabs that are currently being placed at the beginning of each line" ^indentationLevel ifNil:[0]! Item was changed: + ----- Method: CharacterScanner>>indentationLevel: (in category 'text attributes') ----- - ----- Method: CharacterScanner>>indentationLevel: (in category 'scanning') ----- indentationLevel: anInteger "set the number of tabs to put at the beginning of each line" indentationLevel := anInteger! Item was changed: + ----- Method: CharacterScanner>>isBreakableAt:in:in: (in category 'multilingual scanning') ----- - ----- Method: CharacterScanner>>isBreakableAt:in:in: (in category 'scanner methods') ----- isBreakableAt: index in: sourceString in: encodingClass "check with the encoding whether the character at index is a breakable character- only the JISX0208 & JapaneseEnvironment will ever return true, so only the scanJapaneseCharacters... method calls this" ^ encodingClass isBreakableAt: index in: sourceString. ! Item was changed: + ----- Method: CharacterScanner>>leadingTab (in category 'private') ----- - ----- Method: CharacterScanner>>leadingTab (in category 'scanning') ----- leadingTab "return true if only tabs lie to the left" line first to: lastIndex do: [:i | (text at: i) == Tab ifFalse: [^ false]]. ^ true! Item was changed: + ----- Method: CharacterScanner>>placeEmbeddedObject: (in category 'text attributes') ----- - ----- Method: CharacterScanner>>placeEmbeddedObject: (in category 'scanning') ----- placeEmbeddedObject: anchoredMorph "Place the anchoredMorph or return false if it cannot be placed. In any event, advance destX by its width." | w | "Workaround: The following should really use #textAnchorType" anchoredMorph relativeTextAnchorPosition ifNotNil:[^true]. destX := destX + (w := anchoredMorph width). (destX > rightMargin and: [(leftMargin + w) <= rightMargin]) ifTrue: ["Won't fit, but would on next line" ^ false]. lastIndex := lastIndex + 1. "self setFont." "Force recalculation of emphasis for next run" ^ true! Item was changed: + ----- Method: CharacterScanner>>plainTab (in category 'private') ----- - ----- Method: CharacterScanner>>plainTab (in category 'scanning') ----- plainTab "This is the basic method of adjusting destX for a tab." destX := (alignment = Justified and: [self leadingTab not]) ifTrue: "embedded tabs in justified text are weird" [destX + (textStyle tabWidth - (line justifiedTabDeltaFor: spaceCount)) max: destX] ifFalse: [textStyle nextTabXFrom: destX leftMargin: leftMargin rightMargin: rightMargin]. pendingKernX := 0.! Item was changed: + ----- Method: CharacterScanner>>scanJapaneseCharactersFrom:to:in:rightX:stopConditions:kern: (in category 'multilingual scanning') ----- - ----- Method: CharacterScanner>>scanJapaneseCharactersFrom:to:in:rightX:stopConditions:kern: (in category 'scanner methods') ----- scanJapaneseCharactersFrom: startIndex to: stopIndex in: sourceString rightX: rightX stopConditions: stops kern: kernDelta | ascii encoding nextDestX startEncoding | lastIndex := startIndex. lastIndex > stopIndex ifTrue: [lastIndex := stopIndex. ^ stops endOfRun]. startEncoding := (sourceString at: startIndex) leadingChar. [lastIndex <= stopIndex] whileTrue: [ encoding := (sourceString at: lastIndex) leadingChar. encoding ~= startEncoding ifTrue: [lastIndex := lastIndex - 1. ^ stops endOfRun]. ascii := (sourceString at: lastIndex) charCode. (encoding = 0 and: [ascii < 256 and:[(stops at: ascii + 1) notNil]]) ifTrue: [^ stops at: ascii + 1]. (self isBreakableAt: lastIndex in: sourceString in: (EncodedCharSet charsetAt: encoding)) ifTrue: [ self registerBreakableIndex. ]. nextDestX := destX + (font widthOf: (sourceString at: lastIndex)). nextDestX > rightX ifTrue: [self theFirstCharCrossedX ifFalse: [^ stops crossedX]]. destX := nextDestX + kernDelta. lastIndex := lastIndex + 1. ]. lastIndex := stopIndex. ^ stops endOfRun! Item was changed: + ----- Method: CharacterScanner>>scanMultiCharactersFrom:to:in:rightX:stopConditions:kern: (in category 'multilingual scanning') ----- - ----- Method: CharacterScanner>>scanMultiCharactersFrom:to:in:rightX:stopConditions:kern: (in category 'scanning') ----- scanMultiCharactersFrom: startIndex to: stopIndex in: sourceString rightX: rightX stopConditions: stops kern: kernDelta | ascii encoding nextDestX startEncoding floatDestX widthAndKernedWidth nextChar atEndOfRun | lastIndex := startIndex. lastIndex > stopIndex ifTrue: [lastIndex := stopIndex. ^ stops endOfRun]. startEncoding := (sourceString at: startIndex) leadingChar. floatDestX := destX. widthAndKernedWidth := Array new: 2. atEndOfRun := false. [lastIndex <= stopIndex] whileTrue: [ encoding := (sourceString at: lastIndex) leadingChar. encoding ~= startEncoding ifTrue: [lastIndex := lastIndex - 1. ^ stops endOfRun]. ascii := (sourceString at: lastIndex) charCode. (ascii < 256 and: [(stops at: ascii + 1) ~~ nil]) ifTrue: [^ stops at: ascii + 1]. nextChar := (lastIndex + 1 <= stopIndex) ifTrue:[sourceString at: lastIndex + 1] ifFalse:[ atEndOfRun := true. "if there is a next char in sourceString, then get the kern and store it in pendingKernX" lastIndex + 1 <= sourceString size ifTrue:[sourceString at: lastIndex + 1] ifFalse:[ nil]]. font widthAndKernedWidthOfLeft: (sourceString at: lastIndex) right: nextChar into: widthAndKernedWidth. nextDestX := floatDestX + (widthAndKernedWidth at: 1). nextDestX > rightX ifTrue: [self theFirstCharCrossedX ifFalse: [^stops crossedX]]. floatDestX := floatDestX + kernDelta + (widthAndKernedWidth at: 2). atEndOfRun ifTrue:[ pendingKernX := (widthAndKernedWidth at: 2) - (widthAndKernedWidth at: 1). floatDestX := floatDestX - pendingKernX]. destX := floatDestX . lastIndex := lastIndex + 1. ]. lastIndex := stopIndex. ^ stops endOfRun! Item was changed: + ----- Method: CharacterScanner>>setActualFont: (in category 'text attributes') ----- - ----- Method: CharacterScanner>>setActualFont: (in category 'private') ----- setActualFont: aFont "Set the basal font to an isolated font reference." font := aFont! Item was changed: + ----- Method: CharacterScanner>>setAlignment: (in category 'text attributes') ----- - ----- Method: CharacterScanner>>setAlignment: (in category 'private') ----- setAlignment: style alignment := style. ! Item was removed: - ----- Method: CharacterScanner>>setConditionArray: (in category 'private') ----- - setConditionArray: aStopConditionOrNil - "This method is to be removed" - - ^stopConditions := DefaultStopConditions! Item was changed: + ----- Method: CharacterScanner>>textColor: (in category 'text attributes') ----- - ----- Method: CharacterScanner>>textColor: (in category 'private') ----- textColor: ignored "Overridden in DisplayScanner"! Item was changed: ----- Method: CompositionScanner>>crossedX (in category 'stop conditions') ----- crossedX "There is a word that has fallen across the right edge of the composition rectangle. This signals the need for wrapping which is done to the last space that was encountered, as recorded by the space stop condition, or any other breakable character if the language permits so." pendingKernX := 0. lastBreakIsNotASpace ifTrue: + ["In some languages line break is possible before a non space." + ^self wrapAtLastBreakable]. - ["In some languages break is possible before a non space." - nextIndexAfterLineBreak := spaceIndex. - line stop: spaceIndex - 1. - lineHeight := lineHeightAtSpace. - baseline := baselineAtSpace. - line paddingWidth: rightMargin - spaceX. - line internalSpaces: spaceCount. - ^true]. spaceCount >= 1 ifTrue: + ["The common case. there is a space on the line." + ^self wrapAtLastSpace]. + + "Neither internal nor trailing spaces -- almost never happens." + ^self wrapHere! - ["The common case. First back off to the space at which we wrap." - line stop: spaceIndex. - nextIndexAfterLineBreak := spaceIndex + 1. - lineHeight := lineHeightAtSpace. - baseline := baselineAtSpace. - spaceCount := spaceCount - 1. - spaceIndex := spaceIndex - 1. - - "Check to see if any spaces preceding the one at which we wrap. - Double space after punctuation, most likely." - [(spaceCount >= 1 and: [(text at: spaceIndex) = Space])] - whileTrue: - [spaceCount := spaceCount - 1. - "Account for backing over a run which might - change width of space." - font := text fontAt: spaceIndex withStyle: textStyle. - spaceIndex := spaceIndex - 1. - spaceX := spaceX - (font widthOf: Space)]. - line paddingWidth: rightMargin - spaceX. - line internalSpaces: spaceCount] - ifFalse: - ["Neither internal nor trailing spaces -- almost never happens." - lastIndex := lastIndex - 1. - [destX <= rightMargin or: [ lastIndex = 0 ]] - whileFalse: - [destX := destX - (font widthOf: (text at: lastIndex)). - lastIndex := lastIndex - 1]. - nextIndexAfterLineBreak := lastIndex + 1. - spaceX := destX. - line paddingWidth: rightMargin - destX. - line stop: (lastIndex max: line first)]. - ^true! Item was changed: + ----- Method: CompositionScanner>>setActualFont: (in category 'text attributes') ----- - ----- Method: CompositionScanner>>setActualFont: (in category 'scanning') ----- setActualFont: aFont "Keep track of max height and ascent for auto lineheight" | descent | super setActualFont: aFont. lineHeight == nil ifTrue: [descent := font descent. baseline := font ascent. lineHeight := baseline + descent] ifFalse: [descent := lineHeight - baseline max: font descent. baseline := baseline max: font ascent. lineHeight := lineHeight max: baseline + descent]! Item was added: + ----- Method: CompositionScanner>>wrapAtLastBreakable (in category 'stop conditions') ----- + wrapAtLastBreakable + "Wrap the line before last encountered breakable character." + nextIndexAfterLineBreak := spaceIndex. + line stop: spaceIndex - 1. + lineHeight := lineHeightAtSpace. + baseline := baselineAtSpace. + line paddingWidth: rightMargin - spaceX. + line internalSpaces: spaceCount. + ^true! Item was added: + ----- Method: CompositionScanner>>wrapAtLastSpace (in category 'stop conditions') ----- + wrapAtLastSpace + "Wrap the line before last encountered space" + + nextIndexAfterLineBreak := spaceIndex + 1. + alignment = Justified ifTrue: [ + "gobble all subsequent spaces" + [nextIndexAfterLineBreak <= text size and: [(text at: nextIndexAfterLineBreak) == Space]] + whileTrue: [nextIndexAfterLineBreak := nextIndexAfterLineBreak + 1]]. + + line stop: nextIndexAfterLineBreak - 1. + lineHeight := lineHeightAtSpace. + baseline := baselineAtSpace. + + ["remove the space at which we break..." + spaceCount := spaceCount - 1. + spaceIndex := spaceIndex - 1. + + "...and every other spaces preceding the one at which we wrap. + Double space after punctuation, most likely." + spaceCount >= 1 and: [(text at: spaceIndex) = Space]] + whileTrue: + ["Account for backing over a run which might + change width of space." + font := text fontAt: spaceIndex withStyle: textStyle. + spaceX := spaceX - (font widthOf: Space)]. + line paddingWidth: rightMargin - spaceX. + line internalSpaces: spaceCount. + ^true! Item was added: + ----- Method: CompositionScanner>>wrapHere (in category 'stop conditions') ----- + wrapHere + "Wrap the line before current character." + lastIndex := lastIndex - 1. + [destX <= rightMargin or: [ lastIndex = 0 ]] + whileFalse: + [destX := destX - (font widthOf: (text at: lastIndex)). + lastIndex := lastIndex - 1]. + nextIndexAfterLineBreak := lastIndex + 1. + spaceX := destX. + line paddingWidth: rightMargin - destX. + line stop: (lastIndex max: line first). + ^true! Item was changed: + ----- Method: DisplayScanner>>placeEmbeddedObject: (in category 'stop conditions') ----- - ----- Method: DisplayScanner>>placeEmbeddedObject: (in category 'scanning') ----- placeEmbeddedObject: anchoredMorph anchoredMorph relativeTextAnchorPosition ifNotNil:[ anchoredMorph position: anchoredMorph relativeTextAnchorPosition + (anchoredMorph owner textBounds origin x @ 0) - (0@morphicOffset y) + (0@lineY). ^true ]. (super placeEmbeddedObject: anchoredMorph) ifFalse: [^ false]. (anchoredMorph isMorph or: [anchoredMorph isPrimitiveCostume]) ifTrue: [ anchoredMorph position: ((destX - anchoredMorph width)@lineY) - morphicOffset ] ifFalse: [ destY := lineY. runX := destX. anchoredMorph displayOn: bitBlt destForm at: destX - anchoredMorph width @ destY clippingBox: bitBlt clipRect ]. ^ true! Item was changed: + ----- Method: DisplayScanner>>textColor: (in category 'text attributes') ----- - ----- Method: DisplayScanner>>textColor: (in category 'private') ----- textColor: textColor ignoreColorChanges ifTrue: [^ self]. foregroundColor := textColor!

1 0

The Trunk: Monticello-cmm.573.mcz
by commits＠source.squeak.org 03 Oct '13

03 Oct '13

Chris Muller uploaded a new version of Monticello to project The Trunk: http://source.squeak.org/trunk/Monticello-cmm.573.mcz ==================== Summary ==================== Name: Monticello-cmm.573 Author: cmm Time: 3 October 2013, 4:39:53.815 pm UUID: c3383883-707a-4bc1-b3ea-3b2ca97053d7 Ancestors: Monticello-fbs.572 - Factor out cacheAllFilenames and flushAllFilenames to support special-case caching. - Stop obliterating Recent Messages when loading MC packages. =============== Diff against Monticello-fbs.572 =============== Item was changed: ----- Method: MCFileBasedRepository>>cacheAllFileNamesDuring: (in category 'private') ----- + cacheAllFileNamesDuring: aBlock - cacheAllFileNamesDuring: aBlock "Cache the result of #allFileNames and #allVersionNames during aBlock" + allFileNamesCache ifNotNil: [ ^ aBlock value ]. + self cacheAllFilenames. + ^ aBlock ensure: [ self flushAllFilenames ]! - - allFileNamesCache ifNotNil: [ ^aBlock value ]. - allFileNamesCache := self allFileNames. - allVersionNamesCache := self allVersionNames. - ^aBlock ensure: [ allFileNamesCache := allVersionNamesCache := nil ]! Item was added: + ----- Method: MCFileBasedRepository>>cacheAllFilenames (in category 'private') ----- + cacheAllFilenames + allFileNamesCache ifNil: + [ allFileNamesCache := self allFileNames. + allVersionNamesCache := self allVersionNames ]! Item was added: + ----- Method: MCFileBasedRepository>>flushAllFilenames (in category 'private') ----- + flushAllFilenames + allFileNamesCache := allVersionNamesCache := nil! Item was changed: ----- Method: MCFileBasedRepository>>flushCache (in category 'private') ----- flushCache + self flushAllFilenames. + cache := nil! - - cache := allFileNamesCache := allVersionNamesCache := nil! Item was changed: ----- Method: MCPackageLoader>>basicLoad (in category 'private') ----- basicLoad "Load the contents of some package. This is the core loading method in Monticello. Be wary about modifying it unless you understand the details and dependencies of the various entities being modified." | pkgName | errorDefinitions := OrderedCollection new. "Obviously this isn't the package name but we don't have anything else to use here. ChangeSet current name will generally work since a CS is usually installed prior to installation." pkgName := ChangeSet current name. preamble ifNotNil: [ChangeSet current preambleString: (self preambleAsCommentNamed: pkgName)]. + RecentMessages default suspendWhile: [ [CurrentReadOnlySourceFiles cacheDuring: [[ "Pass 1: Load everything but the methods, which are collected in methodAdditions." additions do: [:ea | ea isMethodDefinition ifTrue:[methodAdditions add: ea asMethodAddition] ifFalse:[[ea load]on: Error do: [errorDefinitions add: ea]]. ] displayingProgress: 'Reshaping ', pkgName. "Try again any delayed definitions" self shouldWarnAboutErrors ifTrue: [self warnAboutErrors]. errorDefinitions do: [:ea | ea load] displayingProgress: 'Reloading ', pkgName. "Pass 2: We compile new / changed methods" methodAdditions do:[:ea| ea createCompiledMethod] displayingProgress: 'Compiling ', pkgName. 'Installing ', pkgName displayProgressFrom: 0 to: 2 during:[:bar| "There is no progress *during* installation since a progress bar update will redraw the world and potentially call methods that we're just trying to install." bar value: 1. "Pass 3: Install the new / changed methods (this is a separate pass to allow compiler changes to be loaded)" methodAdditions do:[:ea| ea installMethod]. "Pass 4: Remove the obsolete methods" removals do:[:ea| ea unload]. ]. "Finally, notify observers for the method additions" methodAdditions do: [:each | each notifyObservers] "the message is fake but actually telling people how much time we spend in the notifications is embarrassing so lie instead" displayingProgress: 'Installing ', pkgName. additions do: [:ea | ea postloadOver: (self obsoletionFor: ea)] displayingProgress: 'Initializing ', pkgName. ] on: InMidstOfFileinNotification do: [:n | n resume: true] + ]] ensure: [self flushChangesFile] + ]! - ]] ensure: [self flushChangesFile]! Item was added: + ----- Method: MCRepository>>cacheAllFilenames (in category 'private') ----- + cacheAllFilenames + "No-op by default. Subclasses override for performance."! Item was added: + ----- Method: MCRepository>>flushAllFilenames (in category 'private') ----- + flushAllFilenames + "No-op. Subclasses override if necessary."!

1 0

fonts, characterscanners and dead primitive 103
by tim Rowledge 03 Oct '13

03 Oct '13

I've been trying to sort out mantis-1650 and siblings; oh boy what fun. Basically at some point the shape of CharacterScanner was changed so that primitive 103 could no longer work; nowadays we waste time in starting up the primitive and never doing anything but failing it. The fallback code is pretty ugly too, though I have a few small improvements for it. We can't reasonably 'fix' the primitive since it is required to support older images, in particular Scratch on the Pi. Anyone doing something that compromises *that* will get a quiet visit from The Boys. We *could* add a new primitive, of course. It's also possible that for a lot of modern machines running Cog it might not be worth it - but not all machines are cogged nor fast. Part of the complication is that we have rather lot of font related classes these days and not all of them are even subclasses of AbstractFont. So far as I can tell the major change was due to an attempt to handle fonts that can have character pair kerning, which looks like only FreeTypeFont. All the others are wasting time both through losing the primitive support and pointlessly finding out that pair-kerning does nothing new. Oh and FT2Face seems to be off on its own for some reason I haven't discerned as yet. Obvious question - who is most up to speed with what the hell Fonts are up to these days? I have some Questioning Instruments warming up for you… MultiCharacterScanner brings in a whole new level of insanity, not least because it uses identical code including the pointless call of the primitive - and the two senders of these two methods are also (effectively) identical. And do, just for grins, take a look at the only reference to MultiCharacterScanner - FreeTypeFontProvider class>initialize. Oh my. And let's consider references and uses to other classes in that hierarchy - in NewParagraph>characterBlock* MultiCharacterBlockScanner is used for WideStrings but in Paragraph>composeAll it is used for both byte strings and wider strings. And then there is GrafPort>displayScannerForMulti:…. How have we got into such a mixed and messy state? Did some experiment get partially worked on and forgotten? Surely nobody has deliberately made it so convoluted? tim -- tim Rowledge; tim(a)rowledge.org; http://www.rowledge.org/tim Strange OpCodes: CLOUT: Call Long-distance On Unused Telephone

11 65

The Trunk: Tests-cmm.256.mcz
by commits＠source.squeak.org 03 Oct '13

03 Oct '13

Chris Muller uploaded a new version of Tests to project The Trunk: http://source.squeak.org/trunk/Tests-cmm.256.mcz ==================== Summary ==================== Name: Tests-cmm.256 Author: cmm Time: 3 October 2013, 2:52:17.76 pm UUID: c46a7f7b-159f-4f8c-9e26-ab6f97290614 Ancestors: Tests-nice.255 Changes for updates to RecentMessages in System-cmm.600. =============== Diff against Tests-nice.255 =============== Item was added: + ----- Method: RecentMessages>>purge: (in category '*tests') ----- + purge: aMethodReference + methodReferences remove: aMethodReference.! Item was added: + ----- Method: RecentMessages>>purgeMissingMethods (in category '*tests') ----- + purgeMissingMethods + methodReferences := methodReferences select: [:mref | |cls| + cls := mref actualClass. + cls notNil + and: [cls isInMemory] + and: [mref selector == #Comment or: [(cls compiledMethodAt: mref selector ifAbsent: [nil]) notNil]]].! Item was changed: ----- Method: RecentMessagesTest>>testMaximumSubmissionCountCapsReferenceCount (in category 'testing') ----- testMaximumSubmissionCountCapsReferenceCount rm maximumSubmissionCount: 2. rm recordSelector: #foo forClass: Utilities inEnvironment: Smalltalk globals. rm recordSelector: #bar forClass: Utilities inEnvironment: Smalltalk globals. rm recordSelector: #baz forClass: Utilities inEnvironment: Smalltalk globals. + self assert: #bar equals: rm leastRecent selector.! - self assert: #bar equals: rm oldest selector.! Item was changed: ----- Method: RecentMessagesTest>>testOldestReturnsOldestSubmission (in category 'testing') ----- testOldestReturnsOldestSubmission + self assert: nil equals: rm leastRecent description: 'Return nil if no submissions yet'. - self assert: nil equals: rm oldest description: 'Return nil if no submissions yet'. rm recordSelector: #foo forClass: Utilities inEnvironment: Smalltalk globals. + self assert: #foo equals: rm leastRecent selector. - self assert: #foo equals: rm oldest selector. rm recordSelector: #baz forClass: Utilities inEnvironment: Smalltalk globals. + self assert: #foo equals: rm leastRecent selector.! - self assert: #foo equals: rm oldest selector.!

1 0

The Trunk: System-cmm.600.mcz
by commits＠source.squeak.org 03 Oct '13

03 Oct '13

Chris Muller uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-cmm.600.mcz ==================== Summary ==================== Name: System-cmm.600 Author: cmm Time: 3 October 2013, 2:49:50.903 pm UUID: 1dc3ab37-822a-4ac0-93d0-c06542622247 Ancestors: System-fbs.599 - RecentMessages can now temporarily suspend, so it'll be able to avoid being blown away just from loading MC packages. - API consistency. - Test methods moved to Tests. =============== Diff against System-fbs.599 =============== Item was changed: Object subclass: #RecentMessages + instanceVariableNames: 'methodReferences size maximumSubmissionCount isSuspended' - instanceVariableNames: 'methodReferences size maximumSubmissionCount' classVariableNames: 'Default NumberOfRecentSubmissionsToStore' poolDictionaries: '' category: 'System-Support'! Item was changed: ----- Method: RecentMessages>>initialize (in category 'initialize-release') ----- initialize + self initializeWithSize: self defaultSize! - maximumSubmissionCount := self defaultSize. - methodReferences := OrderedCollection new.! Item was added: + ----- Method: RecentMessages>>leastRecent (in category 'accessing') ----- + leastRecent + ^ methodReferences + ifEmpty: [nil] + ifNotEmpty: [methodReferences first].! Item was removed: - ----- Method: RecentMessages>>oldest (in category 'accessing') ----- - oldest - ^ methodReferences - ifEmpty: [nil] - ifNotEmpty: [methodReferences first].! Item was removed: - ----- Method: RecentMessages>>purge: (in category 'accessing') ----- - purge: aMethodReference - methodReferences remove: aMethodReference.! Item was removed: - ----- Method: RecentMessages>>purgeMissingMethods (in category 'accessing') ----- - purgeMissingMethods - methodReferences := methodReferences select: [:mref | |cls| - cls := mref actualClass. - cls notNil - and: [cls isInMemory] - and: [mref selector == #Comment or: [(cls compiledMethodAt: mref selector ifAbsent: [nil]) notNil]]].! Item was changed: ----- Method: RecentMessages>>recordSelector:forClass:inEnvironment: (in category 'accessing') ----- recordSelector: aSelector forClass: aClass inEnvironment: anEnvironment | ref | + isSuspended = true ifTrue: [ ^ self ]. ref := MethodReference class: aClass selector: aSelector environment: anEnvironment. aClass wantsChangeSetLogging ifFalse: [^ ref]. ^ methodReferences detect: [:mref | mref = ref] ifNone: [methodReferences addLast: ref. self size > self maximumSubmissionCount ifTrue: [methodReferences removeFirst]. ref].! Item was added: + ----- Method: RecentMessages>>suspendWhile: (in category 'accessing') ----- + suspendWhile: aBlock + | priorSuspended | + priorSuspended := isSuspended. + isSuspended := true. + aBlock ensure: [ isSuspended := priorSuspended ]!

1 0

The Trunk: Compiler-cmm.275.mcz
by commits＠source.squeak.org 03 Oct '13

03 Oct '13

Chris Muller uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-cmm.275.mcz ==================== Summary ==================== Name: Compiler-cmm.275 Author: cmm Time: 3 October 2013, 2:34:56.409 pm UUID: 9d002330-e75e-436f-8699-b29413e98e81 Ancestors: Compiler-nice.274 When loading code, don't blow up just because of an undeclared ref. =============== Diff against Compiler-nice.274 =============== Item was changed: ----- Method: Encoder>>undeclared: (in category 'encoding') ----- + undeclared: name - undeclared: name | sym | requestor interactive ifTrue: + [ requestor requestor == #error: ifTrue: [ requestor error: 'Undeclared' ]. + ^ self notify: 'Undeclared' ]. - [requestor requestor == #error: ifTrue: - [requestor error: 'Undeclared']. - ^self notify: 'Undeclared']. "Allow knowlegeable clients to squash the undeclared warning if they want (e.g. Diffing pretty printers that are simply formatting text). As this breaks compilation it should only be used by clients that want to discard the result of the compilation. To squash the warning use e.g. [Compiler format: code in: class notifying: nil decorated: false] on: UndeclaredVariableWarning do: [:ex| ex resume: false]" sym := name asSymbol. + ^ (UndeclaredVariableWarning new + name: name + selector: selector + class: cue getClass) signal - ^(UndeclaredVariableWarning new name: name selector: selector class: cue getClass) signal ifTrue: + [ | undeclared | - [| undeclared | undeclared := cue environment undeclared. + [ undeclared + at: sym + put: nil ] + on: AttemptToWriteReadOnlyGlobal + do: [ : noti | noti resume: true ]. + self + global: (undeclared associationAt: sym) + name: sym ] - undeclared at: sym put: nil. - self global: (undeclared associationAt: sym) name: sym] ifFalse: + [ self + global: (Association key: sym) + name: sym ]! - [self global: (Association key: sym) name: sym]!

1 0

running old images
by Bob Arning 03 Oct '13

03 Oct '13

In looking for a baseline for the change set history, I tried to see how early an image I could still run. That ended up being 2.5 with one small glitch noticed. I simply could not get earlier images to run well or at all. The Mac has gone through several processor/os changes since the early squeak days and this complicates things. So, - what's the earliest squeak image you can still run on your everyday computer? - is there a way to run earlier than 2.5 on a modern Mac? Cheers, Bob

5 4

Re: [squeak-dev] The Trunk: Graphics-nice.247.mcz
by Chris Muller 03 Oct '13

03 Oct '13

Ah, much better. Thank you! On Thu, Oct 3, 2013 at 7:59 AM, <commits(a)source.squeak.org> wrote: > Nicolas Cellier uploaded a new version of Graphics to project The Trunk: > http://source.squeak.org/trunk/Graphics-nice.247.mcz > > ==================== Summary ==================== > > Name: Graphics-nice.247 > Author: nice > Time: 3 October 2013, 2:59:08.347 pm > UUID: 17c8bf48-139a-42f5-8032-ae3045f4b265 > Ancestors: Graphics-nice.246 > > Restore correct width of embedded morphs (recent regression). > > =============== Diff against Graphics-nice.246 =============== > > Item was changed: > ----- Method: CharacterBlockScanner>>retrieveLastCharacterWidth (in category 'private') ----- > retrieveLastCharacterWidth > | lastCharacter | > lastIndex > text size ifTrue: [^lastCharacterWidth := 0]. > + specialWidth ifNotNil: [^lastCharacterWidth := specialWidth]. > lastCharacter := text at: lastIndex. > (lastCharacter charCode >= 256 or: [(stopConditions at: lastCharacter charCode + 1) isNil]) > ifTrue: [lastCharacterWidth := font widthOf: (text at: lastIndex)]. > "if last character was a stop condition, then the width is already set" > ^lastCharacterWidth! > >

1 0

The Trunk: Graphics-nice.247.mcz
by commits＠source.squeak.org 03 Oct '13

03 Oct '13

Nicolas Cellier uploaded a new version of Graphics to project The Trunk: http://source.squeak.org/trunk/Graphics-nice.247.mcz ==================== Summary ==================== Name: Graphics-nice.247 Author: nice Time: 3 October 2013, 2:59:08.347 pm UUID: 17c8bf48-139a-42f5-8032-ae3045f4b265 Ancestors: Graphics-nice.246 Restore correct width of embedded morphs (recent regression). =============== Diff against Graphics-nice.246 =============== Item was changed: ----- Method: CharacterBlockScanner>>retrieveLastCharacterWidth (in category 'private') ----- retrieveLastCharacterWidth | lastCharacter | lastIndex > text size ifTrue: [^lastCharacterWidth := 0]. + specialWidth ifNotNil: [^lastCharacterWidth := specialWidth]. lastCharacter := text at: lastIndex. (lastCharacter charCode >= 256 or: [(stopConditions at: lastCharacter charCode + 1) isNil]) ifTrue: [lastCharacterWidth := font widthOf: (text at: lastIndex)]. "if last character was a stop condition, then the width is already set" ^lastCharacterWidth!

1 0

Update Squeak is not updating all the packages
by Nicolas Cellier 03 Oct '13

03 Oct '13

Curiously, 3 of them have a new version in trunk but are not loaded/merged... Though the package names are in the latest update monticello configuration map: - 45Deprecated - ST80 - Universes Any known reason for this? Nicolas

3 4

← Newer
1
...
20
21
22
23
24
25
26
27
Older →

Jump to page: