[squeak-dev] The Trunk: ShoutCore-ul.22.mcz

commits at source.squeak.org commits at source.squeak.org
Tue Oct 12 02:43:36 UTC 2010


Levente Uzonyi uploaded a new version of ShoutCore to project The Trunk:
http://source.squeak.org/trunk/ShoutCore-ul.22.mcz

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

Name: ShoutCore-ul.22
Author: ul
Time: 12 October 2010, 3:24:45.683 am
UUID: c83ce771-5d93-b844-a66e-3a75df80155d
Ancestors: ShoutCore-nice.21

- simplified and enhanced SHParserST80 >> #parsePrimitive. It's in sync with Parser now.
- added a few cosmetic fixes from the shout repository

=============== Diff against ShoutCore-nice.21 ===============

Item was changed:
  ----- Method: SHParserST80>>parsePrimitive (in category 'parse') -----
  parsePrimitive
+ 
  	self scanNext.
+ 	currentTokenFirst isDigit
+ 		ifTrue: [ self scanPast: #integer ]
- 	currentTokenFirst isDigit 
- 		ifTrue: [self scanPast: #integer]
  		ifFalse: [
+ 			self parseStringOrSymbol.
+ 			currentToken = 'module:' ifTrue: [
+ 				self scanPast: #module.
+ 				self parseStringOrSymbol ] ].
+ 	currentToken = 'error:' ifTrue: [
+ 		self scanPast: #primitive. "there's no rangeType for error"
+ 		self isName
+ 			ifTrue: [ self scanPast: #patternTempVar ]
+ 			ifFalse: [ self parseStringOrSymbol ] ].
+ 	self failUnless: currentToken = '>'.
- 			currentTokenFirst == $'
- 				ifTrue: [ self parseString ]
- 				ifFalse: [
- 					currentTokenFirst == $#
- 						ifTrue: [ self parseSymbol ]
- 						ifFalse: [ self error ] ].
- 			currentToken = 'module:' 
- 				ifTrue: [
- 					self scanPast: #module.
- 					currentTokenFirst == $'
- 						ifTrue: [ self parseString ]
- 						ifFalse: [
- 							currentTokenFirst == $#
- 								ifTrue: [ self parseSymbol ]
- 								ifFalse: [ self error ] ] ] ].
- 	self failUnless: currentTokenFirst == $>.
  	self scanPast: #primitiveOrExternalCallEnd!

Item was added:
+ ----- Method: SHParserST80>>parseStringOrSymbol (in category 'parse') -----
+ parseStringOrSymbol
+ 
+ 	currentTokenFirst == $' ifTrue: [ ^self parseString ].
+ 	currentTokenFirst == $# ifTrue: [ ^self parseSymbol ].
+ 	self error!

Item was changed:
  ----- Method: SHTextStyler>>evaluateWithoutStyling: (in category 'styling') -----
  evaluateWithoutStyling: aBlock
  	| t |
  	t := stylingEnabled.
+ 	stylingEnabled := false.
+ 	^ aBlock ensure: [stylingEnabled := t]!
- 	^[stylingEnabled := false.
- 	aBlock value]
- 		ensure: [stylingEnabled := t]!

Item was changed:
  ----- Method: SHTextStylerST80 class>>styleTable (in category 'style table') -----
  styleTable
+ 
+ 	^styleTable ifNil: [ styleTable := self chooseDefaultStyleTable ]!
- 	
- 	styleTable ifNotNil:[^styleTable].
- 	^styleTable := self chooseDefaultStyleTable.	
- 						!

Item was changed:
  ----- Method: SHTextStylerST80 class>>textAttributesByPixelHeight (in category 'style table') -----
  textAttributesByPixelHeight
+ 	^ textAttributesByPixelHeight ifNil: [ textAttributesByPixelHeight := Dictionary new ]!
- 	
- 	textAttributesByPixelHeight == nil ifFalse:[^textAttributesByPixelHeight].
- 	^textAttributesByPixelHeight := Dictionary new
- 						!




More information about the Squeak-dev mailing list