[Pkg] The Trunk: Compiler-nice.94.mcz

commits at source.squeak.org commits at source.squeak.org
Tue Oct 27 11:28:54 UTC 2009

Nicolas Cellier uploaded a new version of Compiler to project The Trunk:

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

Name: Compiler-nice.94
Author: nice
Time: 27 October 2009, 12:28:57 pm
UUID: 42292a5b-3735-fc4b-883b-42249a88aac9
Ancestors: Compiler-nice.93

Ensure usage of #typeTableAt:  rather than typeTable ivar to handle Wide characters

=============== Diff against Compiler-nice.93 ===============

Item was changed:
  ----- Method: Scanner>>scanAllTokenPositionsInto: (in category 'expression types') -----
  scanAllTokenPositionsInto: aBlock
  	"Evaluate aBlock with the start and end positions of all separate non-white-space tokens, including comments."
  	| lastMark |
  	lastMark := 1.
  	[currentComment notNil ifTrue:
  		[currentComment do:
  			[:cmnt| | idx |
  			 idx := source originalContents indexOfSubCollection: cmnt startingAt: lastMark.
  			 (idx > 0 and: [idx < mark]) ifTrue:
  				[aBlock value: idx - 1 value: (lastMark := idx + cmnt size)]].
  		 currentComment := nil].
  	mark notNil ifTrue:
  		[(token == #- 
+ 		  and: [(self typeTableAt: hereChar) = #xDigit]) ifTrue:
- 		  and: [(typeTable at: hereChar charCode) = #xDigit]) ifTrue:
  			[| savedMark |
  			 savedMark := mark.
  			 self scanToken.
  			 token := token negated.
  			 mark := savedMark].
  		"Compensate for the fact that the parser uses two character lookahead.  Normally we must
  		  remove the extra two chaacters.  But this mustn't happen for the last token at the end of stream."
  			value: mark
  			value: (source atEnd
  					ifTrue: [tokenType := #doIt. "to cause an immediate ^self" source position]
  					ifFalse: [source position - 2])].
  	 (tokenType = #rightParenthesis
  	  or: [tokenType == #doIt]) ifTrue:
  	tokenType = #leftParenthesis
  			[self scanToken; scanAllTokenPositionsInto: aBlock]
  			[(tokenType = #word or: [tokenType = #keyword or: [tokenType = #colon]])
  					[self scanLitWord.
  					 token = #true ifTrue: [token := true].
  					 token = #false ifTrue: [token := false].
  					 token = #nil ifTrue: [token := nil]]
  					[(token == #- 
+ 					  and: [(self typeTableAt: hereChar) = #xDigit])
- 					  and: [(typeTable at: hereChar charCode) = #xDigit])
  							[self scanToken.
  							 token := token negated]]].
  		self scanToken.
  	true] whileTrue!

More information about the Packages mailing list