Packages February 2021

packages@lists.squeakfoundation.org

1 participants
74 discussions

The Trunk: EToys-mt.422.mcz
by commits＠source.squeak.org 18 Feb '21

18 Feb '21

Marcel Taeumel uploaded a new version of EToys to project The Trunk: http://source.squeak.org/trunk/EToys-mt.422.mcz ==================== Summary ==================== Name: EToys-mt.422 Author: mt Time: 18 February 2021, 2:31:24.938649 pm UUID: 65503b97-01b4-134f-8b1f-d6967bc024a7 Ancestors: EToys-mt.421, EToys-ct.370, EToys-ct.368, EToys-ct.390, EToys-ct.404 Merges Christoph's (ct) efforts to improve code-to-tile conversion. =============== Diff against EToys-mt.421 =============== Item was added: + ----- Method: BlockNode>>asTileSetForPlayer: (in category '*Etoys-tiles') ----- + asTileSetForPlayer: aPlayer + + ^ self statements gather: [:statement | + [statement asStatementTileSetForPlayer: aPlayer] + ifError: [{statement asMorphicSyntaxIn: SyntaxMorph new}]]! Item was added: + ----- Method: BlockNode>>withoutImplicitReturns (in category '*Etoys-tiles') ----- + withoutImplicitReturns + + (self statements ifEmpty: [^ self]) last isImplicitReturn + ifFalse: [^ self]. + ^ self copy statements: self statements allButLast! Item was added: + ----- Method: CascadeNode>>asStatementTileSetForPlayer: (in category '*Etoys-tiles') ----- + asStatementTileSetForPlayer: aPlayer + + ^ self asTileSetForPlayer: aPlayer! Item was added: + ----- Method: CascadeNode>>asTileSetForPlayer: (in category '*Etoys-tiles') ----- + asTileSetForPlayer: aPlayer + + ^ self messages gather: [:message | + message copy + receiver: self receiver; + asTileSetForPlayer: aPlayer]! Item was added: + ----- Method: CommentNode>>asTileSetForPlayer: (in category '*Etoys-tiles') ----- + asTileSetForPlayer: aPlayer + + ^ #()! Item was changed: ----- Method: EtoysDebugger>>evaluateNextTile (in category 'evaluating') ----- evaluateNextTile (scriptEditor isTextuallyCoded) ifTrue:[^ self inform: 'You can''t step through textually coded scripts.\Use a script''s tile-based representation instead.' withCRs translated]. [next = (scriptEditor tiles at: 1 ifAbsent: [nil]) ifTrue: ["We are about to evaluate the first tile" self updateStartingPosition]. + (self trailMorph ifNotNil: #batchPenTrails ifNil: [false]) - self trailMorph batchPenTrails ifTrue: [self evaluateNextTileWithBatchPenTrails] ifFalse: [next evaluateOn: self]] on: Error do: [:err || newNext | newNext := scriptEditor tiles at: 1 ifAbsent: [^ self]. newNext = next ifTrue: [err pass] ifFalse: [next := newNext]. self evaluateNextTile] ! Item was added: + ----- Method: LiteralNode>>asTileForPlayer: (in category '*Etoys-tiles') ----- + asTileForPlayer: aPlayer + + ^ aPlayer presenter constantTile: self literalValue! Item was added: + ----- Method: MessageNode>>asStatementTileSetForPlayer: (in category '*Etoys-tiles') ----- + asStatementTileSetForPlayer: aPlayer + + ^ self asTileSetForPlayer: aPlayer! Item was added: + ----- Method: MessageNode>>asTileForPlayer: (in category '*Etoys-tiles') ----- + asTileForPlayer: aPlayer + + | receiverType argumentType resultType phrase receiverTiles | + "Catch edge case: Color tile" + (self receiver isVariableNode and: [self receiver key = (Smalltalk bindingOf: #Color)]) + ifTrue: [ | source result | + source := String streamContents: (MessageSend receiver: self selector: #shortPrintOn:). + result := [Compiler evaluate: source] ifError: [nil]. + result isColor ifTrue: [^ result newTileMorphRepresentative]]. + + "Catch edge case: Test tile" + self ifConditionNormalizeAndDo: [:conditionNode :trueNode :falseNode | | compound | + compound := StandardScriptingSystem new yesNoComplexOfTiles. + compound testPart insertTileRow: (conditionNode asTileSetForPlayer: aPlayer) after: 0. + compound yesPart insertTileRow: (trueNode withoutImplicitReturns asTileSetForPlayer: aPlayer) after: 0. + compound noPart insertTileRow: (falseNode withoutImplicitReturns asTileSetForPlayer: aPlayer) after: 0. + compound enforceTileColorPolicy; layoutChanged; fullBounds. + ^ compound]. + + "Otherwise, try to build a phrase tile" + self arguments size < 2 ifFalse: [^ self convertToTileError]. + + receiverType := #unknown. + argumentType := self arguments ifEmpty: [nil] ifNotEmpty: [#unknown]. + resultType := #unknown. + phrase := PhraseTileMorph new. + phrase + setOperator: self selector key + type: resultType + rcvrType: receiverType + argType: argumentType. + receiverTiles := self receiver asTileSetForPlayer: aPlayer. + receiverTiles size = 1 ifFalse: [^ self convertToTileError]. + phrase firstSubmorph + addMorph: receiverTiles first; + hResizing: #shrinkWrap; vResizing: #shrinkWrap. + self arguments ifNotEmpty: [ | argumentTiles | + argumentTiles := self arguments first asTileSetForPlayer: aPlayer. + argumentTiles size = 1 ifFalse: [^ self convertToTileError]. + phrase lastSubmorph + setType: argumentType; + changeTableLayout; + addMorph: argumentTiles first; + hResizing: #shrinkWrap; vResizing: #shrinkWrap]. + + ^ phrase + hResizing: #shrinkWrap; vResizing: #shrinkWrap; + yourself! Item was added: + ----- Method: MessageNode>>ifConditionNormalizeAndDo: (in category '*Etoys-tiles') ----- + ifConditionNormalizeAndDo: aBlock + + | blocks | + blocks := self selector key + caseOf: { + [#ifTrue:ifFalse:] -> [arguments]. + [#ifFalse:ifTrue:] -> [self arguments reversed]. + [#ifTrue:] -> [self arguments copyWith: (BlockNode statements: #() returns: #())]. + [#ifFalse:] -> [self arguments copyWithFirst: (BlockNode statements: #() returns: #())] } + otherwise: [^ self]. + ^ aBlock value: self receiver value: blocks first value: blocks last! Item was added: + ----- Method: MethodNode>>asScriptEditorFor: (in category '*Etoys-tiles') ----- + asScriptEditorFor: aPlayer + + | editor | + editor := ScriptEditorMorph new. + editor + playerScripted: aPlayer; + setMorph: aPlayer costume scriptName: self selector. + + (self asTileSetForPlayer: aPlayer) + withIndexDo: [:tile :index | + editor insertTileRow: {tile} after: index]. + editor + removeSpaces; + enforceTileColorPolicy; + scriptEdited; + allMorphsDo: #layoutChanged. + ^ editor! Item was added: + ----- Method: MethodNode>>asTileSetForPlayer: (in category '*Etoys-tiles') ----- + asTileSetForPlayer: aPlayer + + ^ self block withoutImplicitReturns asTileSetForPlayer: aPlayer! Item was added: + ----- Method: MethodTempsNode>>asTileSetForPlayer: (in category '*Etoys-tiles') ----- + asTileSetForPlayer: aPlayer + + ^ #()! Item was added: + ----- Method: MethodWithInterface>>revertTileVersionFrom:for: (in category 'updating') ----- + revertTileVersionFrom: anEditor for: playerScripted + "Only for universal tiles." + + ^ self revertToLastSavedTileVersionFor: anEditor! Item was added: + ----- Method: ParseNode>>asStatementTileSetForPlayer: (in category '*Etoys-tiles') ----- + asStatementTileSetForPlayer: aPlayer + + ^ self convertToTileError! Item was added: + ----- Method: ParseNode>>asTileForPlayer: (in category '*Etoys-tiles') ----- + asTileForPlayer: aPlayer + "Private. Better call #asTileMorphsForPlayer:." + + ^ self convertToTileError! Item was added: + ----- Method: ParseNode>>asTileSetForPlayer: (in category '*Etoys-tiles') ----- + asTileSetForPlayer: aPlayer + + ^ {self asTileForPlayer: aPlayer}! Item was added: + ----- Method: ParseNode>>convertToTileError (in category '*Etoys-tiles') ----- + convertToTileError + + ^ self error: 'Cannot convert this expression to a tile'! Item was added: + ----- Method: ParseNode>>isImplicitReturn (in category '*Etoys-tiles') ----- + isImplicitReturn + + ^false! Item was added: + ----- Method: ReturnNode>>asTileSetForPlayer: (in category '*Etoys-tiles') ----- + asTileSetForPlayer: aPlayer + + "self isReturnSelf ifTrue: [^ #()]." + ^ self expr asTileSetForPlayer: aPlayer! Item was added: + ----- Method: ReturnNode>>isImplicitReturn (in category '*Etoys-tiles') ----- + isImplicitReturn + + ^ self isReturnSelf! Item was added: + ----- Method: ScriptEditorMorph>>convertToTileVersion (in category 'save & revert') ----- + convertToTileVersion + "The receiver, currently showing textual code, is asked to revert to the last-saved tile version" + + | aUserScript | + + self + hResizing: #shrinkWrap; + vResizing: #shrinkWrap. + aUserScript := playerScripted class userScriptForPlayer: playerScripted selector: scriptName. + aUserScript revertTileVersionFrom: self for: playerScripted. + self currentWorld startSteppingSubmorphsOf: self! Item was changed: ----- Method: ScriptEditorMorph>>offerScriptorMenu (in category 'other') ----- offerScriptorMenu "Put up a menu in response to the user's clicking in the menu-request area of the scriptor's heaer" | aMenu count | - self modernize. self currentHand showTemporaryCursor: nil. + - Preferences eToyFriendly ifTrue: [^ self offerSimplerScriptorMenu]. + - aMenu := MenuMorph new defaultTarget: self. aMenu addTitle: scriptName asString. aMenu addStayUpItem. "NB: the kids version in #offerSimplerScriptorMenu does not deploy the stay-up item" + - aMenu addList: (self hasParameter ifTrue: [{ {'remove parameter' translated. #ceaseHavingAParameter}}] ifFalse: [{ {'add parameter' translated. #addParameter}}]). self hasParameter ifFalse: [aMenu addTranslatedList: { {'button to fire this script' translatedNoop. #tearOfButtonToFireScript}. {'fires per tick...' translatedNoop. #chooseFrequency}. #- }]. + + aMenu addUpdating: #showingCaretsString target: self action: #toggleShowingCarets. - - aMenu addUpdating: #showingCaretsString target: self action: #toggleShowingCarets. aMenu addLine. aMenu addList: { {'edit balloon help for this script' translated. #editMethodDescription}. {'explain status alternatives' translated. #explainStatusAlternatives}. {'button to show/hide this script' translated. #buttonToOpenOrCloseThisScript}. #- }. + + Preferences universalTiles ifFalse: [ + count := self savedTileVersionsCount. - - - Preferences universalTiles ifFalse: - [count := self savedTileVersionsCount. self showingMethodPane + ifFalse: [ "currently showing tiles" + aMenu add: 'show code textually' translated action: #showSourceInScriptor. + count > 0 ifTrue: [ + aMenu add: 'revert to tile version...' translated action: #revertScriptVersion]. + aMenu add: 'save this version' translated action: #saveScriptVersion ] + ifTrue: [ "current showing textual source" + aMenu add: 'convert to tile version' translated action: #toggleWhetherShowingTiles. + count > 0 ifTrue: + [aMenu add: 'revert to tile version...' translated action: #revertScriptVersion]] ]. + - ifFalse: "currently showing tiles" - [aMenu add: 'show code textually' translated action: #toggleWhetherShowingTiles. - count > 0 ifTrue: - [aMenu add: 'revert to tile version...' translated action: #revertScriptVersion]. - aMenu add: 'save this version' translated action: #saveScriptVersion] - - ifTrue: "current showing textual source" - [count >= 1 ifTrue: - [aMenu add: 'revert to tile version' translated action: #toggleWhetherShowingTiles]]]. - "aMenu addLine. self addGoldBoxItemsTo: aMenu." + - aMenu addLine. + aMenu add: 'grab this object' translated target: playerScripted selector: #grabPlayerIn: argument: ActiveWorld. - aMenu add: 'grab this object' translated target: playerScripted selector: #grabPlayerIn: argument: self currentWorld. aMenu balloonTextForLastItem: 'This will actually pick up the object bearing this script and hand it to you. Click the (left) button to drop it' translated. + + aMenu add: 'reveal this object' translated target: playerScripted selector: #revealPlayerIn: argument: ActiveWorld. - - aMenu add: 'reveal this object' translated target: playerScripted selector: #revealPlayerIn: argument: self currentWorld. aMenu balloonTextForLastItem: 'If you have misplaced the object bearing this script, use this item to (try to) make it visible' translated. + - aMenu add: 'tile representing this object' translated target: playerScripted action: #tearOffTileForSelf. aMenu balloonTextForLastItem: 'choose this to obtain a tile which represents the object associated with this script' translated. + - aMenu addTranslatedList: { #-. {'open viewer' translatedNoop. #openObjectsViewer. 'open the viewer of the object to which this script belongs' translatedNoop}. {'detached method pane' translatedNoop. #makeIsolatedCodePane. 'open a little window that shows the Smalltalk code underlying this script.' translatedNoop}. #-. {'destroy this script' translatedNoop. #destroyScript} }. + + aMenu popUpInWorld: self currentWorld.! - - - ^ aMenu popUpInWorld: self currentWorld! Item was changed: ----- Method: ScriptEditorMorph>>parseNodeWith: (in category '*Etoys-Squeakland-other') ----- parseNodeWith: encoder | statements ret | statements := WriteStream on: (Array new: self tileRows size). + self tileRows do: [:row | + row do: [:morph | + (morph respondsTo: #parseNodeWith:asStatement:) ifTrue: [ + statements nextPut: (morph parseNodeWith: encoder asStatement: true)]]]. - self tileRows do: [:r | - r do: [:m | - ((m isKindOf: TileMorph) - or: [(m isKindOf: CompoundTileMorph) - or: [m isKindOf: PhraseTileMorph]]) ifTrue: [ - statements nextPut: (m parseNodeWith: encoder asStatement: true)]]]. statements := statements contents. ret := ReturnNode new expr: (encoder encodeVariable: 'self'). + ^ BlockNode new + arguments: #() + statements: (statements copyWith: ret) + returns: true + from: encoder.! - ^ BlockNode new arguments: #() statements: (statements copyWith: ret) returns: true from: encoder. - ! Item was removed: - ----- Method: ScriptEditorMorph>>revertToTileVersion (in category 'save & revert') ----- - revertToTileVersion - "The receiver, currently showing textual code, is asked to revert to the last-saved tile version" - - | aUserScript | - - self - hResizing: #shrinkWrap; - vResizing: #shrinkWrap. - aUserScript := playerScripted class userScriptForPlayer: playerScripted selector: scriptName. - aUserScript revertToLastSavedTileVersionFor: self. - self currentWorld startSteppingSubmorphsOf: self! Item was changed: ----- Method: ScriptEditorMorph>>toggleWhetherShowingTiles (in category 'other') ----- toggleWhetherShowingTiles "Toggle between showing the method pane and showing the tiles pane" + - self showingMethodPane + ifFalse: [ "currently showing tiles" + self showSourceInScriptor ] + ifTrue: [ "currently showing textual source" + self convertToTileVersion ].! - ifFalse: "currently showing tiles" - [self showSourceInScriptor] - - ifTrue: "current showing textual source" - [Preferences universalTiles - ifTrue: [^ self revertToTileVersion]. - self savedTileVersionsCount >= 1 - ifTrue: - [(self userScriptObject lastSourceString = (playerScripted class sourceCodeAt: scriptName)) - ifFalse: - [(self confirm: - 'Caution -- this script was changed - textually; if you revert to tiles at this - point you will lose all the changes you - may have made textually. Do you - really want to do this?' translated) ifFalse: [^ self]]. - self revertToTileVersion] - ifFalse: - [Beeper beep]]! Item was added: + TestCase subclass: #ScriptEditorMorphTest + instanceVariableNames: 'editor minimalMethod player' + classVariableNames: '' + poolDictionaries: '' + category: 'Etoys-Tests'! Item was added: + ----- Method: ScriptEditorMorphTest>>exampleMinimalPlayerCode (in category 'accessing') ----- + exampleMinimalPlayerCode + + self forward: 6 * 7. + self turn: 6. + self forward: 7. + self getIsUnderMouse ifFalse: [self abandon]. + "self color: (Color r: 1 g: 0.6 b: 0). + [[''''''''] cull: 42] onDNU: #foo do: #ba."! Item was added: + ----- Method: ScriptEditorMorphTest>>examplePlayerCode (in category 'accessing') ----- + examplePlayerCode + + self forward: 6 * 7. + self + turn: 6; + forward: 7. + self getIsUnderMouse ifFalse: [self abandon]. + "self color: (Color fromString: '#ff9900'). + [[''''''''] cull: 42] onDNU: #foo do: #ba."! Item was added: + ----- Method: ScriptEditorMorphTest>>setUp (in category 'running') ----- + setUp + + super setUp. + + player := Morph new assuredPlayer. + minimalMethod := (self class lookupSelector: #exampleMinimalPlayerCode) decompile.! Item was added: + ----- Method: ScriptEditorMorphTest>>tearDown (in category 'running') ----- + tearDown + + [editor ifNotNil: #destroyScript] valueSuppressingMessages: #('*destroy*'). + super tearDown.! Item was added: + ----- Method: ScriptEditorMorphTest>>testCodeToTileAndBack (in category 'testing') ----- + testCodeToTileAndBack + + | templateMethod | + templateMethod := (self class lookupSelector: #examplePlayerCode) decompile. + editor := templateMethod asScriptEditorFor: player. + self + assert: minimalMethod block printString + equals: (player class lookupSelector: #examplePlayerCode) decompile block printString! Item was added: + ----- Method: ScriptEditorMorphTest>>testMinimalCodeToTileAndBack (in category 'testing') ----- + testMinimalCodeToTileAndBack + + editor := minimalMethod asScriptEditorFor: player. + self + assert: minimalMethod block printString + equals: (player class lookupSelector: #exampleMinimalPlayerCode) decompile block printString.! Item was changed: ----- Method: SyntaxMorph>>parseNodeWith:asStatement: (in category '*Etoys-Squeakland-code generation') ----- parseNodeWith: encoder asStatement: aBoolean + | methodNode | + methodNode := self parseNodeWith: encoder. + ^ aBoolean + ifFalse: [methodNode] + ifTrue: [methodNode block]! - ^ self parseNode! Item was added: + ----- Method: UniclassScript>>revertTileVersionFrom:for: (in category 'updating') ----- + revertTileVersionFrom: anEditor for: playerScripted + + anEditor removeAllButFirstSubmorph. + Preferences universalTiles + ifFalse: [ + ((self playerClass >> self selector) decompile asTileSetForPlayer: playerScripted) + withIndexDo: [:tile :index | + anEditor insertTileRow: {tile} after: index]. + anEditor allMorphsDo: #layoutChanged] + ifTrue: [ + anEditor insertUniversalTiles]. + anEditor showingMethodPane: false. + isTextuallyCoded := false.! Item was added: + ----- Method: UserScript>>revertTileVersionFrom:for: (in category 'versions') ----- + revertTileVersionFrom: anEditor for: playerScripted + + anEditor removeAllButFirstSubmorph. + ((self playerClass >> self selector) decompile asTileSetForPlayer: playerScripted) + withIndexDo: [:tile :index | + anEditor insertTileRow: {tile} after: index]. + anEditor allMorphsDo: #layoutChanged. + anEditor showingMethodPane: false. + self becomeTextuallyCoded.! Item was added: + ----- Method: VariableNode>>asTileForPlayer: (in category '*Etoys-tiles') ----- + asTileForPlayer: aPlayer + + | target | + self isSelfPseudoVariable + ifTrue: [^ aPlayer tileToRefer]. + target := self key isVariableBinding + ifTrue: [aPlayer environment at: self key key] + ifFalse: [self key]. + ^ TileMorph new + setToReferTo: target; + yourself! Item was added: + ----- Method: VariableNode>>isImplicitReturn (in category '*Etoys-tiles') ----- + isImplicitReturn + + ^ self = NodeNil!

1 0

The Trunk: Compiler-ct.424.mcz
by commits＠source.squeak.org 18 Feb '21

18 Feb '21

Marcel Taeumel uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-ct.424.mcz ==================== Summary ==================== Name: Compiler-ct.424 Author: ct Time: 26 March 2020, 5:19:54.71456 pm UUID: 10f4405b-896c-3149-b76b-b9cd45ca5734 Ancestors: Compiler-nice.420 Fixes a bug regarding decompilation of FullBlockClosures Sample to reproduce: [^ true] decompile should NOT return {[]}! =============== Diff against Compiler-nice.420 =============== Item was changed: ----- Method: Decompiler>>blockTo: (in category 'control') ----- blockTo: end + "Decompile a range of code as in statementsTo:, but return a block node. NB: end is an exclusive index." - "Decompile a range of code as in statementsTo:, but return a block node." | exprs block oldBase lastStatementOfBlockIsNil | oldBase := blockStackBase. blockStackBase := stack size. exprs := self statementsTo: end. lastStatementOfBlockIsNil := pc < method endPC and: [exprs notEmpty and: [exprs last == (constTable at: 4)]]. lastStatementOfBlockIsNil ifTrue: [exprs := exprs allButLast]. block := constructor codeBlock: exprs returns: lastReturnPc = lastPc. blockStackBase := oldBase. lastReturnPc := -1. "So as not to mislead outer calls" ^block! Item was changed: ----- Method: Decompiler>>doClosureCopy:copiedValues: (in category 'control') ----- doClosureCopy: aCompiledBlock copiedValues: blockCopiedValues "implementation note: must be invoked on a copy because it modifies states" | savedPC blockArgs blockTemps blockTempsOffset block mark | numLocalTemps := aCompiledBlock numTemps - aCompiledBlock numArgs - blockCopiedValues size. blockTempsOffset := aCompiledBlock numArgs + blockCopiedValues size. (blockStartsToTempVars notNil "implies we were intialized with temp names." and: [blockStartsToTempVars includesKey: aCompiledBlock]) ifTrue: [tempVars := blockStartsToTempVars at: aCompiledBlock] ifFalse: [blockArgs := (1 to: aCompiledBlock numArgs) collect: [:i| (constructor codeTemp: i - 1 named: 't', (tempVarCount + i) printString) beBlockArg]. blockTemps := (1 to: numLocalTemps) collect: [:i| constructor codeTemp: i + blockTempsOffset - 1 named: 't', (tempVarCount + i + aCompiledBlock numArgs) printString]. tempVars := blockArgs, blockCopiedValues, blockTemps]. tempVarCount := tempVarCount + aCompiledBlock numArgs + numLocalTemps. lastJumpIfPcStack := OrderedCollection new. caseExits := OrderedCollection new. statements := OrderedCollection new: 20. savedPC := pc. self method: (method := aCompiledBlock) pc: aCompiledBlock initialPC. mark := stack size. + block := self blockTo: aCompiledBlock endPC + 1. - block := self blockTo: aCompiledBlock endPC. mark = stack size ifFalse: [self error: 'block did alter the stack']. ^((constructor codeArguments: (tempVars copyFrom: 1 to: aCompiledBlock numArgs) temps: (tempVars copyFrom: blockTempsOffset + 1 to: blockTempsOffset + numLocalTemps) block: block) pc: aCompiledBlock -> savedPC; "c.f. BytecodeEncoder>>pc" yourself).!

1 0

The Trunk: Compiler-ct.426.mcz
by commits＠source.squeak.org 18 Feb '21

18 Feb '21

Marcel Taeumel uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-ct.426.mcz ==================== Summary ==================== Name: Compiler-ct.426 Author: ct Time: 28 March 2020, 1:22:49.51256 am UUID: 761924e9-77a0-1144-9533-8a7c22c03332 Ancestors: Compiler-ct.424 Fixes a bug regarding decompilation of special selectors. The following did not work before: (OrderedCollection >> #asArray) decompile generate valueWithReceiver: {42} asOrderedCollection arguments: #(). "MessageNotUnderstood: OrderedCollection>>#Array=>Array" See also this thread: http://forum.world.st/The-Inbox-EToys-ct-367-mcz-tp5105507p5114020.html =============== Diff against Compiler-ct.424 =============== Item was changed: ----- Method: DecompilerConstructor>>codeAnySelector: (in category 'constructor') ----- codeAnySelector: selector ^SelectorNode new key: selector + index: nil - index: 0 type: SendType!

1 0

The Trunk: Compiler-ct.449.mcz
by commits＠source.squeak.org 18 Feb '21

18 Feb '21

Marcel Taeumel uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-ct.449.mcz ==================== Summary ==================== Name: Compiler-ct.449 Author: ct Time: 24 October 2020, 12:12:47.879256 am UUID: f4dcd413-ed53-bf47-8762-a0e1c23f7a7f Ancestors: Compiler-tobe.448 Redesigns SyntaxErrorNotification to hold a CompilationCue instead of 'inClass' and 'code', in orderto allow for recompilation of syntax errors where other compilation parameters have been specified, e.g. context or environment. For example, the following syntax error could not be resolved before this patch: Compiler new evaluate: 'aCue yourself:' in: thisContext sender to: thisContext sender receiver. =============== Diff against Compiler-tobe.448 =============== Item was added: + ----- Method: CompilationCue>>source: (in category 'accessing') ----- + source: aString + + source := aString. + sourceStream := source readStream.! Item was changed: ----- Method: Parser>>notify:at: (in category 'error handling') ----- notify: string at: location | messageText | messageText := '"' , string , ' ->"'. cue requestor isNil ifTrue: [ | notification | (encoder == self or: [encoder isNil]) ifTrue: [^ self fail "failure setting up syntax error"]. (notification := SyntaxErrorNotification + cue: (cue copy + source: (source contents asText + copyReplaceFrom: location + to: location - 1 + with: messageText); + yourself) - inClass: encoder classEncoding - withCode: (source contents asText - copyReplaceFrom: location - to: location - 1 - with: messageText) doitFlag: doitFlag errorMessage: string location: location) signal. notification tryNewSourceIfAvailable] ifFalse: [cue requestor notify: messageText at: location in: source]. ^ self fail! Item was changed: Error subclass: #SyntaxErrorNotification + instanceVariableNames: 'cue doitFlag errorMessage location newSource' - instanceVariableNames: 'inClass code doitFlag errorMessage location newSource' classVariableNames: '' poolDictionaries: '' category: 'Compiler-Exceptions'! + !SyntaxErrorNotification commentStamp: 'ct 10/24/2020 00:01' prior: 0! - !SyntaxErrorNotification commentStamp: 'nice 9/18/2013 22:16' prior: 0! A SyntaxErrorNotification is an Exception occuring when compiling a Smalltalk source code with incorrect syntax. Note that in interactive mode, this exception is not raised because the Compiler will interact directly with source code editor. The defaultAction is to raise a SyntaxError pop up window so as to enable interactive handling even in non interactive mode. Instance Variables + cue: <CompilationCue> - category: <String | nil> - code: <String | Text | Stream> doitFlag: <Boolean> errorMessage: <String> - inClass: <Behavior> location: <Integer> newSource: <String | Text | Stream | nil> + cue + - the cue for compilation, including receiver class, optional context, and original source code - category - - the category in which the method will be classified - code - - the source code to be compiled or evaluated - doitFlag - true if this is a doIt (code to evaluate), false if this is a method (code of a method to be compiled) errorMessage - contains information about the syntax error - inClass - - target class in which to compile the method - location - position in the source code where the syntax error occured newSource + - eventually hold a source code replacement typically passed by the SyntaxError window! - - eventually hold a source code replacement typically passed by the SyntaxError window - ! Item was added: + ----- Method: SyntaxErrorNotification class>>cue:doitFlag:errorMessage:location: (in category 'instance creation') ----- + cue: aCue doitFlag: doitFlag errorMessage: errorString location: location + + ^ self new + setCue: aCue + doitFlag: doitFlag + errorMessage: errorString + location: location! Item was changed: + ----- Method: SyntaxErrorNotification class>>inClass:withCode:doitFlag:errorMessage:location: (in category 'instance creation') ----- - ----- Method: SyntaxErrorNotification class>>inClass:withCode:doitFlag:errorMessage:location: (in category 'exceptionInstantiator') ----- inClass: aClass withCode: codeString doitFlag: doitFlag errorMessage: errorString location: location + + self deprecated: 'ct: Use #cue:doitFlag:errorMessage:location:'. + ^ self + cue: (CompilationCue source: codeString class: aClass requestor: nil) - ^self new - setClass: aClass - code: codeString doitFlag: doitFlag errorMessage: errorString location: location! Item was added: + ----- Method: SyntaxErrorNotification>>context (in category 'accessing') ----- + context + + ^ cue context! Item was changed: ----- Method: SyntaxErrorNotification>>errorClass (in category 'accessing') ----- errorClass + + ^ cue getClass! - ^inClass! Item was changed: ----- Method: SyntaxErrorNotification>>errorCode (in category 'accessing') ----- errorCode + + ^ cue source! - ^code! Item was changed: ----- Method: SyntaxErrorNotification>>messageText (in category 'accessing') ----- messageText ^ super messageText + ifEmpty: [messageText := self errorCode]! - ifEmpty: [messageText := code]! Item was changed: ----- Method: SyntaxErrorNotification>>reparse:notifying:ifFail: (in category 'accessing') ----- reparse: aString notifying: aController ifFail: failBlock "Try to parse if aString has correct syntax, but do not evaluate/install any code. In case of incorrect syntax, execute failBlock and let a Compiler interact with the requestor. In case of correct syntax, set newSource." + + (doitFlag ifTrue: [nil class] ifFalse: [self errorClass]) newCompiler + compileCue: (cue copy + source: aString; + requestor: aController; + yourself) + noPattern: doitFlag + ifFail: failBlock. + newSource := aString.! - doitFlag - ifTrue: [nil class newCompiler compileNoPattern: aString in: nil class notifying: aController ifFail: failBlock] - ifFalse: [inClass newCompiler compile: aString in: inClass notifying: aController ifFail: failBlock]. - newSource := aString! Item was removed: - ----- Method: SyntaxErrorNotification>>setClass:code:doitFlag:errorMessage:location: (in category 'accessing') ----- - setClass: aClass code: codeString doitFlag: aBoolean errorMessage: errorString location: anInteger - inClass := aClass. - code := codeString. - doitFlag := aBoolean. - errorMessage := errorString. - location := anInteger! Item was added: + ----- Method: SyntaxErrorNotification>>setCue:doitFlag:errorMessage:location: (in category 'initialize-release') ----- + setCue: aCue doitFlag: aBoolean errorMessage: errorString location: anInteger + + cue := aCue. + doitFlag := aBoolean. + errorMessage := errorString. + location := anInteger!

1 0

The Trunk: Compiler-ct.450.mcz
by commits＠source.squeak.org 18 Feb '21

18 Feb '21

Marcel Taeumel uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-ct.450.mcz ==================== Summary ==================== Name: Compiler-ct.450 Author: ct Time: 24 October 2020, 12:16:36.359256 am UUID: ea5bdd56-7ceb-ae4f-a2d7-1b9d11cda893 Ancestors: Compiler-ct.449 Implements #environment on SyntaxErrorNotification. Sorry I hit the Accept button to soon... =============== Diff against Compiler-tobe.448 =============== Item was added: + ----- Method: CompilationCue>>source: (in category 'accessing') ----- + source: aString + + source := aString. + sourceStream := source readStream.! Item was changed: ----- Method: Parser>>notify:at: (in category 'error handling') ----- notify: string at: location | messageText | messageText := '"' , string , ' ->"'. cue requestor isNil ifTrue: [ | notification | (encoder == self or: [encoder isNil]) ifTrue: [^ self fail "failure setting up syntax error"]. (notification := SyntaxErrorNotification + cue: (cue copy + source: (source contents asText + copyReplaceFrom: location + to: location - 1 + with: messageText); + yourself) - inClass: encoder classEncoding - withCode: (source contents asText - copyReplaceFrom: location - to: location - 1 - with: messageText) doitFlag: doitFlag errorMessage: string location: location) signal. notification tryNewSourceIfAvailable] ifFalse: [cue requestor notify: messageText at: location in: source]. ^ self fail! Item was changed: Error subclass: #SyntaxErrorNotification + instanceVariableNames: 'cue doitFlag errorMessage location newSource' - instanceVariableNames: 'inClass code doitFlag errorMessage location newSource' classVariableNames: '' poolDictionaries: '' category: 'Compiler-Exceptions'! + !SyntaxErrorNotification commentStamp: 'ct 10/24/2020 00:01' prior: 0! - !SyntaxErrorNotification commentStamp: 'nice 9/18/2013 22:16' prior: 0! A SyntaxErrorNotification is an Exception occuring when compiling a Smalltalk source code with incorrect syntax. Note that in interactive mode, this exception is not raised because the Compiler will interact directly with source code editor. The defaultAction is to raise a SyntaxError pop up window so as to enable interactive handling even in non interactive mode. Instance Variables + cue: <CompilationCue> - category: <String | nil> - code: <String | Text | Stream> doitFlag: <Boolean> errorMessage: <String> - inClass: <Behavior> location: <Integer> newSource: <String | Text | Stream | nil> + cue + - the cue for compilation, including receiver class, optional context, and original source code - category - - the category in which the method will be classified - code - - the source code to be compiled or evaluated - doitFlag - true if this is a doIt (code to evaluate), false if this is a method (code of a method to be compiled) errorMessage - contains information about the syntax error - inClass - - target class in which to compile the method - location - position in the source code where the syntax error occured newSource + - eventually hold a source code replacement typically passed by the SyntaxError window! - - eventually hold a source code replacement typically passed by the SyntaxError window - ! Item was added: + ----- Method: SyntaxErrorNotification class>>cue:doitFlag:errorMessage:location: (in category 'instance creation') ----- + cue: aCue doitFlag: doitFlag errorMessage: errorString location: location + + ^ self new + setCue: aCue + doitFlag: doitFlag + errorMessage: errorString + location: location! Item was changed: + ----- Method: SyntaxErrorNotification class>>inClass:withCode:doitFlag:errorMessage:location: (in category 'instance creation') ----- - ----- Method: SyntaxErrorNotification class>>inClass:withCode:doitFlag:errorMessage:location: (in category 'exceptionInstantiator') ----- inClass: aClass withCode: codeString doitFlag: doitFlag errorMessage: errorString location: location + + self deprecated: 'ct: Use #cue:doitFlag:errorMessage:location:'. + ^ self + cue: (CompilationCue source: codeString class: aClass requestor: nil) - ^self new - setClass: aClass - code: codeString doitFlag: doitFlag errorMessage: errorString location: location! Item was added: + ----- Method: SyntaxErrorNotification>>context (in category 'accessing') ----- + context + + ^ cue context! Item was added: + ----- Method: SyntaxErrorNotification>>environment (in category 'accessing') ----- + environment + + ^ cue environment! Item was changed: ----- Method: SyntaxErrorNotification>>errorClass (in category 'accessing') ----- errorClass + + ^ cue getClass! - ^inClass! Item was changed: ----- Method: SyntaxErrorNotification>>errorCode (in category 'accessing') ----- errorCode + + ^ cue source! - ^code! Item was changed: ----- Method: SyntaxErrorNotification>>messageText (in category 'accessing') ----- messageText ^ super messageText + ifEmpty: [messageText := self errorCode]! - ifEmpty: [messageText := code]! Item was changed: ----- Method: SyntaxErrorNotification>>reparse:notifying:ifFail: (in category 'accessing') ----- reparse: aString notifying: aController ifFail: failBlock "Try to parse if aString has correct syntax, but do not evaluate/install any code. In case of incorrect syntax, execute failBlock and let a Compiler interact with the requestor. In case of correct syntax, set newSource." + + (doitFlag ifTrue: [nil class] ifFalse: [self errorClass]) newCompiler + compileCue: (cue copy + source: aString; + requestor: aController; + yourself) + noPattern: doitFlag + ifFail: failBlock. + newSource := aString.! - doitFlag - ifTrue: [nil class newCompiler compileNoPattern: aString in: nil class notifying: aController ifFail: failBlock] - ifFalse: [inClass newCompiler compile: aString in: inClass notifying: aController ifFail: failBlock]. - newSource := aString! Item was removed: - ----- Method: SyntaxErrorNotification>>setClass:code:doitFlag:errorMessage:location: (in category 'accessing') ----- - setClass: aClass code: codeString doitFlag: aBoolean errorMessage: errorString location: anInteger - inClass := aClass. - code := codeString. - doitFlag := aBoolean. - errorMessage := errorString. - location := anInteger! Item was added: + ----- Method: SyntaxErrorNotification>>setCue:doitFlag:errorMessage:location: (in category 'initialize-release') ----- + setCue: aCue doitFlag: aBoolean errorMessage: errorString location: anInteger + + cue := aCue. + doitFlag := aBoolean. + errorMessage := errorString. + location := anInteger!

1 0

The Trunk: EToys-ct.408.mcz
by commits＠source.squeak.org 18 Feb '21

18 Feb '21

Marcel Taeumel uploaded a new version of EToys to project The Trunk: http://source.squeak.org/trunk/EToys-ct.408.mcz ==================== Summary ==================== Name: EToys-ct.408 Author: ct Time: 17 September 2020, 12:48:54.350813 pm UUID: c530407c-bee4-a54c-8781-1ba7af10c1c1 Ancestors: EToys-eem.400 Improves MovingEyeMorph support for custom colors. =============== Diff against EToys-eem.400 =============== Item was added: + ----- Method: MovingEyeMorph class>>color:irisColor: (in category 'instance creation') ----- + color: aColor irisColor: anotherColor + + ^ self new color: aColor irisColor: anotherColor! Item was changed: ----- Method: MovingEyeMorph>>color: (in category 'accessing') ----- color: aColor super color: aColor. "Migrate old instances." inner color: Color transparent. + self keepIrisVisible.! - "Keep iris visible." - aColor = iris color - ifTrue: [iris borderWidth: 1; borderColor: aColor negated] - ifFalse: [iris borderWidth: 0].! Item was added: + ----- Method: MovingEyeMorph>>color:irisColor: (in category 'accessing') ----- + color: aColor irisColor: anotherColor + + self color: aColor. + self irisColor: anotherColor.! Item was added: + ----- Method: MovingEyeMorph>>defaultBorderWidth (in category 'accessing') ----- + defaultBorderWidth + + ^ 0! Item was changed: ----- Method: MovingEyeMorph>>irisColor: (in category 'accessing') ----- irisColor: aColor iris color: aColor. + self keepIrisVisible.! - "Keep iris visible." - aColor = self color - ifTrue: [iris borderWidth: 1; borderColor: aColor negated] - ifFalse: [iris borderWidth: 0].! Item was added: + ----- Method: MovingEyeMorph>>keepIrisVisible (in category 'private') ----- + keepIrisVisible + + self color = self irisColor + ifTrue: [ + iris borderWidth: 1; + borderColor: self color makeForegroundColor] + ifFalse: [ + iris borderWidth: 0].!

1 0

The Trunk: EToys-ct.407.mcz
by commits＠source.squeak.org 18 Feb '21

18 Feb '21

Marcel Taeumel uploaded a new version of EToys to project The Trunk: http://source.squeak.org/trunk/EToys-ct.407.mcz ==================== Summary ==================== Name: EToys-ct.407 Author: ct Time: 17 September 2020, 12:38:51.188813 pm UUID: 1ba5c4b2-8ee7-dd46-9d86-5a7526c91629 Ancestors: EToys-eem.400 Activates Shout styling in EToys MethodMorph. Also includes recategorization of some selectors. Is the reference from EToys to ToolBuilder-Morphic okay? The dependency already existed before. =============== Diff against EToys-eem.400 =============== Item was changed: + PluggableTextMorphPlus subclass: #MethodMorph - PluggableTextMorph subclass: #MethodMorph instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'Etoys-Scripting'! Item was changed: + ----- Method: MethodMorph class>>defaultNameStemForInstances (in category 'constants') ----- - ----- Method: MethodMorph class>>defaultNameStemForInstances (in category 'as yet unclassified') ----- defaultNameStemForInstances ^ 'Method' translatedNoop! Item was changed: ----- Method: MethodMorph>>initialize (in category 'initialization') ----- initialize "initialize the state of the receiver" super initialize. + self useDefaultStyler.! - ! Item was changed: + ----- Method: MethodMorph>>installRollBackButtons: (in category 'initialization') ----- - ----- Method: MethodMorph>>installRollBackButtons: (in category 'as yet unclassified') ----- installRollBackButtons: target | mine | "If I don't already have such a button, put one in at the upper right. Set its target to the furtherest enclosing book. Send chooseAndRevertToVersion when clicked. Stay in place via scrollBar install." mine := self submorphNamed: #chooseAndRevertToVersion ifNone: [nil]. mine ifNil: [mine := SimpleButtonMorph new. "mine height: mine height - 2." mine label: 'Roll Back'; cornerStyle: #square. mine color: Color white; borderColor: Color black. mine actionSelector: #chooseAndRevertToVersion. mine align: mine topRight with: (self findA: ScrollBar) topLeft +(1@1). self addMorphFront: mine. mine height: mine height - 5 "14"]. mine target: target.! Item was added: + ----- Method: MethodMorph>>okToStyle (in category 'testing') ----- + okToStyle + + styler ifNil: [^ false]. + styler + classOrMetaClass: self model selectedClassOrMetaClass; + environment: self model environment. + ^ true!

1 0

The Trunk: EToys-ct.406.mcz
by commits＠source.squeak.org 18 Feb '21

18 Feb '21

Marcel Taeumel uploaded a new version of EToys to project The Trunk: http://source.squeak.org/trunk/EToys-ct.406.mcz ==================== Summary ==================== Name: EToys-ct.406 Author: ct Time: 17 September 2020, 12:23:18.233813 pm UUID: 0b76e3b6-1567-c542-8350-de5b7a28fcf2 Ancestors: EToys-eem.400 Minor Tetris refactorings. Expose action selectors for game control as part of the public Tetris protocol. This will be used to play/pause a tetris game from the outside. Recategorize some methods. This commit is part of reconstruction of Objectland (also known as "The Worlds of Squeak"). For more information, see: http://forum.world.st/The-Inbox-MorphicExtras-ct-267-mcz-td5104764.html =============== Diff against EToys-eem.400 =============== Item was changed: + ----- Method: Tetris class>>colors (in category 'constants') ----- - ----- Method: Tetris class>>colors (in category 'as yet unclassified') ----- colors ^{ Color r: 0.5 g: 0 b: 0. Color r: 0 g: 0.5 b: 0. Color r: 0 g: 0 b: 0.5. Color r: 0.5 g: 0.5 b: 0. Color r: 0.5 g: 0 b: 0.5. Color r: 0 g: 0.5 b: 0.5 } ! Item was changed: ----- Method: Tetris>>makeGameControls (in category 'initialization') ----- makeGameControls ^ self rowForButtons addMorph: (self buildButtonTarget: self label: 'Quit' translated selector: #delete help: 'quit' translated); addMorph: (self + buildButtonTarget: self - buildButtonTarget: board label: 'Pause' translated selector: #pause help: 'pause' translated); addMorph: (self + buildButtonTarget: self - buildButtonTarget: board label: 'New game' translated selector: #newGame help: 'new game' translated)! Item was added: + ----- Method: Tetris>>newGame (in category 'actions') ----- + newGame + + board newGame.! Item was added: + ----- Method: Tetris>>pause (in category 'actions') ----- + pause + + board pause.! Item was changed: + ----- Method: TetrisBlock class>>flipShapes: (in category 'support') ----- - ----- Method: TetrisBlock class>>flipShapes: (in category 'as yet unclassified') ----- flipShapes: anArray ^OrderedCollection new add: anArray; add: (anArray collect: [ :each | each y negated @ each x]); add: (anArray collect: [ :each | each x negated @ each y negated]); add: (anArray collect: [ :each | each y @ each x negated]); yourself ! Item was changed: + ----- Method: TetrisBlock class>>shapeChoices (in category 'constants') ----- - ----- Method: TetrisBlock class>>shapeChoices (in category 'as yet unclassified') ----- shapeChoices ^ ShapeChoices ifNil: [ ShapeChoices := { { { 0 @ 0 . 1 @ 0 . 0 @ 1 . 1 @ 1 } }. "square - one is sufficient here" self flipShapes: { 0 @ 0 . -1 @ 0 . 1 @ 0 . 0 @ -1 }. "T" { { 0 @ 0 . -1 @ 0 . 1 @ 0 . 2 @ 0 }. { 0 @ 0 . 0 @ -1 . 0 @ 1 . 0 @ 2 } "long - two are sufficient here" }. self flipShapes: { 0 @ 0 . 0 @ -1 . 0 @ 1 . 1 @ 1 }. "L" self flipShapes: { 0 @ 0 . 0 @ -1 . 0 @ 1 . -1 @ 1 }. "inverted L" self flipShapes: { 0 @ 0 . -1 @ 0 . 0 @ -1 . 1 @ -1 }. "S" self flipShapes: { 0 @ 0 . 1 @ 0 . 0 @ -1 . -1 @ -1 } "Z" }. ] ! Item was changed: + ----- Method: TetrisBoard>>cellSize (in category 'accessing') ----- - ----- Method: TetrisBoard>>cellSize (in category 'as yet unclassified') ----- cellSize ^12@12! Item was changed: + ----- Method: TetrisBoard>>originForCell: (in category 'accessing') ----- - ----- Method: TetrisBoard>>originForCell: (in category 'as yet unclassified') ----- originForCell: aPoint ^aPoint - (1@1) * self cellSize + self position !

1 0

The Trunk: EToys-ct.405.mcz
by commits＠source.squeak.org 18 Feb '21

18 Feb '21

Marcel Taeumel uploaded a new version of EToys to project The Trunk: http://source.squeak.org/trunk/EToys-ct.405.mcz ==================== Summary ==================== Name: EToys-ct.405 Author: ct Time: 17 September 2020, 12:12:06.449813 pm UUID: db0ca850-9a21-1849-b3e2-bd9ce983b266 Ancestors: EToys-eem.400 Adds WatchMorph example method. This commit is part of reconstruction of Objectland (also known as "The Worlds of Squeak"). For more information, see: http://forum.world.st/The-Inbox-MorphicExtras-ct-267-mcz-td5104764.html =============== Diff against EToys-eem.400 =============== Item was added: + ----- Method: WatchMorph class>>example (in category 'examples') ----- + example + "WatchMorph example openInWorld" + + ^ (WatchMorph + fontName: #BitstreamVeraSerif + bgColor: Color lightGray + centerColor: Color red paler) + handsColor: Color grape; + toggleRoman; + yourself!

1 0

The Trunk: EToys-ct.403.mcz
by commits＠source.squeak.org 18 Feb '21

18 Feb '21

Marcel Taeumel uploaded a new version of EToys to project The Trunk: http://source.squeak.org/trunk/EToys-ct.403.mcz ==================== Summary ==================== Name: EToys-ct.403 Author: ct Time: 16 September 2020, 9:28:21.732871 pm UUID: da566a07-8012-ee4b-88d6-58f224234d76 Ancestors: EToys-eem.400 Fixes an AssertionFailure concerning #doLayoutAgain when a particular arrangement of EToys tiles is laid out. TileMorph wants to change its owner's layout policy if that is a TilePadMorph as soon as it is embedded into that. However, the wrong hook was chosen for this. #ownerChanged is signaled whenever the owner has changed its layout. Instead, #noteNewOner: is signaled whenever the receiver is embedded into a new owner. Note that this practice of lazy layout modification is still suspect from my perspective, but at least it works again. Pooh, this one was really hard to find. Thanks a lot to Marcel (mt) and the MessageSendRecorder for their important help! ;-) =============== Diff against EToys-eem.400 =============== Item was added: + ----- Method: TileMorph>>noteNewOwner: (in category 'change reporting') ----- + noteNewOwner: ownerMorph + + super noteNewOwner: ownerMorph. + + ((ownerMorph isKindOf: TilePadMorph) + and: [ownerMorph layoutPolicy isNil]) + ifTrue: [ + ownerMorph + layoutPolicy: TableLayout new; + hResizing: #shrinkWrap; + vResizing: #spaceFill].! Item was removed: - ----- Method: TileMorph>>ownerChanged (in category 'change reporting') ----- - ownerChanged - super ownerChanged. - (owner class == TilePadMorph and:[owner layoutPolicy isNil]) ifTrue:[ - owner layoutPolicy: TableLayout new. - owner hResizing: #shrinkWrap. - owner vResizing: #spaceFill ].!

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Packages February 2021