The Trunk: KernelTests-mt.367.mcz

Marcel Taeumel uploaded a new version of KernelTests to project The Trunk:
http://source.squeak.org/trunk/KernelTests-mt.367.mcz

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

Name: KernelTests-mt.367
Author: mt
Time: 12 July 2019, 10:03:38.274568 am
UUID: a9bb0047-2d49-904c-b91b-a920c1bbc314
Ancestors: KernelTests-ul.366

Refactoring of #literalsDo: - Step 3 of 3.

For more information, see http://forum.world.st/Please-Review-Refactoring-for-literalsDo-etc-tp5099756p5100896.html.

=============== Diff against KernelTests-ul.366 ===============

Item was changed:
  ----- Method: LiteralRefLocatorTest>>testFindLiteralsInBytecode (in category 'tests') -----
  testFindLiteralsInBytecode
  "Create a method referencing integers, characters, special selectors and nil, true & false.
  Compile it and check that the objects are found."
  | source primary secondary binarySpecials integers characters |
  binarySpecials := Smalltalk specialSelectors select: [:s| s isSymbol and: [s isBinary]].
  "-65536 to 65535 in powers of two"
  integers := ((16 to: 1 by: -1) collect: [:power| (2 raisedTo: power) negated]),
  ((0 to: 16) collect: [:power| (2 raisedTo: power) - 1]).
  "some printable characters; alas none have code > 255"
  characters := (0 to: 65535)
  select: [:n| (n between: 132 and: 160) not "these have no glyph in typical fonts"
  and: [(Character value: n) shouldBePrintedAsLiteral]]
  thenCollect: [:n| Character value: n].
  [characters size > 32] whileTrue:
  [characters := (1 to: characters size by: 2) collect: [:i| characters at: i]].
 
  #(('' '') ('^[' ']')) do: "And the locators should work whether in a block or not"
  [:pFixes|
  source := ByteString streamContents:
  [:s| | binaries |
  binaries := binarySpecials readStream.
  s nextPutAll: 'exampleMethod'; crtab; nextPutAll: pFixes first.
  integers
  do: [:n| s print: n]
  separatedBy:
  [binaries atEnd ifTrue: [binaries reset].
  s space; nextPutAll: binaries next; space].
  s nextPut: $.; crtab.
  s nextPut: ${; space.
  characters
  do: [:c| s print: c]
  separatedBy: [s nextPut: $.; space].
  s space; nextPut: $}; nextPut: $.; crtab.
  s nextPutAll: 'true ifTrue: [^nil] ifFalse: [^false]'; nextPutAll: pFixes last].
  primary := CompiledCode classPool at: #PrimaryBytecodeSetEncoderClass.
  secondary := CompiledCode classPool at: #SecondaryBytecodeSetEncoderClass.
  { primary. secondary } do:
  [:encoderClass| | method |
  method := (Parser new
  encoderClass: encoderClass;
  parse: source class: self class)
  generate: CompiledMethodTrailer empty.
+ binarySpecials, integers, characters, #(nil false true) do:
+ [:literal | self assert: (method hasLiteral: literal)].
- binarySpecials, integers, characters, #(nil false true) do:
- [:literal|
- self assert: (method
- refersTo: literal
- primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: literal)
- secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: literal)
- thorough: false).
- (encoderClass scanBlockOrNilForLiteral: literal)
- ifNil: [self assert: (method hasLiteral: literal)]
- ifNotNil: [:scanBlock|
- self assert: ((method scanFor: scanBlock)
- or: [method literals anySatisfy: [:l| l isCompiledCode and: [l scanFor: scanBlock]]])]].
 
  "Now test for false positives..."
  integers, characters, #(nil false true) do:
  [:literal| | simpleSource simpleMethod |
  simpleSource := ByteString streamContents:
  [:s| s nextPutAll: 'exampleMethod'; crtab; nextPutAll: pFixes first; print: literal; nextPutAll: ' class'; nextPutAll: pFixes last].
  simpleMethod := (Parser new
  encoderClass: encoderClass;
  parse: simpleSource class: self class)
  generate: CompiledMethodTrailer empty.
+ binarySpecials, integers, characters, #(nil false true) do: [:anyLiteral |
- binarySpecials, integers, characters, #(nil false true) do:
- [:anyLiteral|
  anyLiteral == literal
+ ifTrue: [self assert: (simpleMethod hasLiteral: anyLiteral)]
+ ifFalse: [self deny: (simpleMethod hasLiteral: anyLiteral)]]]]]!
- ifTrue:
- [self assert: (simpleMethod
- refersTo: anyLiteral
- primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: anyLiteral)
- secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: anyLiteral)
- thorough: false).
- (encoderClass scanBlockOrNilForLiteral: anyLiteral)
- ifNil: [self assert: (simpleMethod hasLiteral: anyLiteral)]
- ifNotNil: [:scanBlock|
- self assert: ((simpleMethod scanFor: scanBlock)
- or: [simpleMethod literals anySatisfy: [:l| l isCompiledCode and: [l scanFor: scanBlock]]])]]
- ifFalse:
- [self deny: (simpleMethod
- refersTo: anyLiteral
- primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: anyLiteral)
- secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: anyLiteral)
- thorough: false).
- (encoderClass scanBlockOrNilForLiteral: anyLiteral)
- ifNil: [self deny: (simpleMethod hasLiteral: anyLiteral)]
- ifNotNil: [:scanBlock|
- self deny: ((simpleMethod scanFor: scanBlock)
- or: [simpleMethod literals anySatisfy: [:l| l isCompiledCode and: [l scanFor: scanBlock]]])]]]]]]!

Item was changed:
  ----- Method: LiteralRefLocatorTest>>testThoroughFindLiteralsInBytecode (in category 'tests') -----
  testThoroughFindLiteralsInBytecode
  "Create a method referencing integers, characters, special selectors and nil, true & false.
  Compile it and check that the objects are found."
  | literals problem primary secondary |
  literals := #(-1 0 1 $0 $1 1.0 #[1 2 3 4] 'one' #one nil true false NaN).
  problem := Float bindingOf: #NaN.
  primary := CompiledCode classPool at: #PrimaryBytecodeSetEncoderClass.
  secondary := CompiledCode classPool at: #SecondaryBytecodeSetEncoderClass.
  { primary. secondary } do:
  [:encoderClass| | method |
  #(('' '') ('^[' ']')) do: "And the locators should work whether in a block or not"
  [:pFixes|
  "NaN's binding should still be found even though (Float bindingOf: #NaN) ~= (Float bindingOf: #NaN)"
  method := (Parser new
  encoderClass: encoderClass;
  parse: 'foo ', pFixes first, '^NaN', pFixes last class: Float)
  generate: CompiledMethodTrailer empty.
+
+ "Check our problematic case first."
+ self assert: (method hasLiteral: problem).
- [:literal|
- self assert: (method
- refersTo: literal
- primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: literal)
- secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: literal)
- thorough: false).
- self assert: (method
- refersTo: literal
- primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: literal)
- secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: literal)
- thorough: true).
  "The selector of a method should never be found (unless it occurs as a literal or in a pragma)"
+ self deny: (method hasLiteral: method selector).
- self deny: (method
- refersTo: method selector
- primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: literal)
- secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: literal)
- thorough: false).
- self deny: (method
- refersTo: method selector
- primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: literal)
- secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: literal)
- thorough: true)] value: problem.
 
  "All the literals should be found in a thorough search, but not otherwise"
  method := (Parser new
  encoderClass: encoderClass;
  parse: 'foo ', pFixes first, '^', literals storeString, pFixes last class: Float)
  generate: CompiledMethodTrailer empty.
+ literals, {problem key} do:
+ [:literal | self assert: (method hasLiteral: literal)]].
- literals, {problem. problem key} do:
- [:literal|
- self deny: (method
- refersTo: literal
- primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: literal)
- secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: literal)
- thorough: false).
- self assert: (method
- refersTo: literal
- primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: literal)
- secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: literal)
- thorough: true)]].
 
  "Likewise if in a pragma"
  method := (Parser new
  encoderClass: encoderClass;
  parse: 'foo <pragma: ', literals storeString, ' with: ', problem key storeString, '>' class: Float)
  generate: CompiledMethodTrailer empty.
+ literals, {problem key} do:
+ [:literal | self assert: (method hasLiteral: literal)]]!
- literals, {problem. problem key} do:
- [:literal|
- self deny: (method
- refersTo: literal
- primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: literal)
- secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: literal)
- thorough: false).
- self assert: (method
- refersTo: literal
- primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: literal)
- secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: literal)
- thorough: true)]]!