[squeak-dev] The Inbox: System-ct.1190.mcz

commits at source.squeak.org commits at source.squeak.org
Sat Nov 14 19:16:10 UTC 2020

A new version of System was added to project The Inbox:

==================== Summary ====================

Name: System-ct.1190
Author: ct
Time: 14 November 2020, 8:16:03.813394 pm
UUID: 84a690ba-c71c-9b42-ba47-bdd1f179bb2b
Ancestors: System-mt.1187

Complements Compiler-ct.453 and Compiler-ct.452 (both in inbox at this moment).

=============== Diff against System-mt.1187 ===============

Item was changed:
  ----- Method: BreakpointManager class>>compilePrototype:in: (in category 'private') -----
  compilePrototype: aSymbol in: aClass
  	"Compile and answer a new method containing a break statement"
  	| oldSource parser methodNode breakOnlyMethodNode sendBreakMessageNode hasTemps newSource mark positionParser markBeforePragmas pragmasFollowTemps |
  	oldSource := aClass sourceCodeAt: aSymbol.
  	parser := aClass newParser.
+ 	methodNode := parser parse: oldSource class: aClass.
- 	methodNode := parser
- 						parse: oldSource
- 						class: aClass
- 						noPattern: false
- 						notifying: nil 
- 						ifFail: [self error: '[breakpoint] unable to install breakpoint'].
  	breakOnlyMethodNode := aClass newCompiler
+ 		compile: 'temporaryMethodSelectorForBreakpoint self break. ^self'
+ 		in: aClass.
- 								compile: 'temporaryMethodSelectorForBreakpoint self break. ^self'
- 								in: aClass 
- 								notifying: nil 
- 								ifFail: [self error: '[breakpoint] unable to install breakpoint'].
  	sendBreakMessageNode := breakOnlyMethodNode block statements first.
  	methodNode block statements addFirst: sendBreakMessageNode.
  	"Use anothe rparser to discover positions because if pragmas follow temporaries
  	 then we want to insert the break after the last pragma, not after the temporaries."
  	(positionParser := aClass newParser)
  		initPattern: oldSource
  			 positionParser pragmaSequence; temporaries.
  			 markBeforePragmas := positionParser startOfNextToken.
  			 positionParser pragmaSequence].
  	mark := (pragmasFollowTemps := positionParser startOfNextToken > markBeforePragmas)
  					[positionParser startOfNextToken - 1]
  					[(hasTemps := positionParser tempsMark <= oldSource size and: [(oldSource at: positionParser tempsMark) = $|])
  						ifTrue: [positionParser tempsMark + 2]
  						ifFalse: "If no temps, tempsMark points at start of first token in body iff there is a body"
  							[positionParser tempsMark >= oldSource size
  								ifTrue: "empty body"
  									[positionParser startOfNextToken]
  									[positionParser tempsMark - 1]]].
  	newSource := oldSource copyReplaceFrom: mark to: mark - 1 with: '	self break.\' withCRs.
  	^methodNode generate copyWithSourceCode: newSource!

More information about the Squeak-dev mailing list