diff -r 538267cab6ec -r 1d7503124bc8 analyzer/tests/PPRewriterTest.st
--- a/analyzer/tests/PPRewriterTest.st	Thu Oct 30 23:52:47 2014 +0000
+++ b/analyzer/tests/PPRewriterTest.st	Sat Nov 01 00:12:10 2014 +0000
@@ -22,131 +22,103 @@
 	before := PPListPattern any.
 	between := PPListPattern any.
 	after := PPListPattern any.
-	rewriter
-		replace: before / duplicate / between / duplicate / after
-		with: before / duplicate / between / after.
-	
+	rewriter replace: before / duplicate / between / duplicate / after with: before / duplicate / between / after.
 	result := rewriter execute: $a asParser / $a asParser.
 	self assert: rewriter hasChanged.
-	self assert: result children size = 1.
-	self assert: result children first literal = $a.
-	
+	self assert: result children size equals: 1.
+	self assert: result children first literal equals: $a.
 	result := rewriter execute: $b asParser / $a asParser / $a asParser.
 	self assert: rewriter hasChanged.
-	self assert: result children size = 2.
-	self assert: result children first literal = $b.
-	self assert: result children last literal = $a.
-	
+	self assert: result children size equals: 2.
+	self assert: result children first literal equals: $b.
+	self assert: result children last literal equals: $a.
 	result := rewriter execute: $a asParser / $b asParser / $a asParser.
 	self assert: rewriter hasChanged.
-	self assert: result children size = 2.
-	self assert: result children first literal = $a.
-	self assert: result children last literal = $b.
-	
+	self assert: result children size equals: 2.
+	self assert: result children first literal equals: $a.
+	self assert: result children last literal equals: $b.
 	result := rewriter execute: $a asParser / $a asParser / $b asParser.
 	self assert: rewriter hasChanged.
-	self assert: result children size = 2.
-	self assert: result children first literal = $a.
-	self assert: result children last literal = $b	
+	self assert: result children size equals: 2.
+	self assert: result children first literal equals: $a.
+	self assert: result children last literal equals: $b
 !
 
 testPatternRemoval
 	| pattern result |
 	pattern := PPPattern class: PPLiteralObjectParser.
-	rewriter
-		replace: pattern / pattern
-		with: pattern.
-	
+	rewriter replace: pattern / pattern with: pattern.
 	result := rewriter execute: $a asParser / $a asParser.
 	self assert: rewriter hasChanged.
-	self assert: result class = PPLiteralObjectParser.
-	self assert: result literal = $a.
-	
+	self assert: result class equals: PPLiteralObjectParser.
+	self assert: result literal equals: $a.
 	result := rewriter execute: $a asParser / $a asParser / $a asParser.
 	self deny: rewriter hasChanged.
-	self assert: result class = PPChoiceParser.
-	self assert: result children size = 3
+	self assert: result class equals: PPChoiceParser.
+	self assert: result children size equals: 3
 !
 
 testPatternReplacement
 	| pattern result |
 	pattern := PPPattern class: PPLiteralObjectParser.
-	rewriter
-		replace: pattern
-		with: pattern , pattern.
-	
+	rewriter replace: pattern with: pattern , pattern.
 	result := rewriter execute: $a asParser.
 	self assert: rewriter hasChanged.
-	self assert: result class = PPSequenceParser.
-	self assert: result children first literal = $a.
-	self assert: result children last literal = $a.
-	
+	self assert: result class equals: PPSequenceParser.
+	self assert: result children first literal equals: $a.
+	self assert: result children last literal equals: $a.
 	result := rewriter execute: #any asParser.
 	self deny: rewriter hasChanged.
-	self assert: result class = PPPredicateObjectParser
+	self assert: result class equals: PPPredicateObjectParser
 !
 
 testReplaceLiteral
 	| result |
-	rewriter
-		replace: $a asParser 
-		with: $b asParser.
-	
+	rewriter replace: $a asParser with: $b asParser.
 	result := rewriter execute: $a asParser.
 	self assert: rewriter hasChanged.
-	self assert: result literal = $b.
-	
+	self assert: result literal equals: $b.
 	result := rewriter execute: $c asParser.
 	self deny: rewriter hasChanged.
-	self assert: result literal = $c.
-	
+	self assert: result literal equals: $c.
 	result := rewriter execute: $a asParser , $b asParser , $c asParser.
 	self assert: rewriter hasChanged.
-	self assert: result children size = 3.
-	self assert: result children first literal = $b.
-	self assert: result children last literal = $c
+	self assert: result children size equals: 3.
+	self assert: result children first literal equals: $b.
+	self assert: result children last literal equals: $c
 !
 
 testSwapTwoPattern
 	| first second result |
 	first := PPPattern any.
 	second := PPPattern any.
-	rewriter
-		replace: first , second
-		with: second , first.
-	
+	rewriter replace: first , second with: second , first.
 	result := rewriter execute: $a asParser , $b asParser.
 	self assert: rewriter hasChanged.
-	self assert: result children first literal = $b.
-	self assert: result children last literal = $a.
-	
+	self assert: result children first literal equals: $b.
+	self assert: result children last literal equals: $a.
 	result := rewriter execute: $a asParser / $b asParser.
 	self deny: rewriter hasChanged.
-	self assert: result children first literal = $a.
-	self assert: result children last literal = $b
+	self assert: result children first literal equals: $a.
+	self assert: result children last literal equals: $b
 !
 
 testWrapLiteral
 	| result |
-	rewriter
-		replace: $a asParser
-		withValueFrom: [ :parser | parser token ].
-	
+	rewriter replace: $a asParser withValueFrom: [ :parser | parser token ].
 	result := rewriter execute: $a asParser.
 	self assert: rewriter hasChanged.
-	self assert: result class = PPTokenParser.
-	self assert: result children first literal = $a.
-	
+	self assert: result class equals: PPTokenParser.
+	self assert: result children first literal equals: $a.
 	result := rewriter execute: $c asParser.
 	self deny: rewriter hasChanged.
-	self assert: result literal = $c.
-	
+	self assert: result literal equals: $c.
 	result := rewriter execute: $a asParser , $b asParser.
 	self assert: rewriter hasChanged.
-	self assert: result children first class = PPTokenParser.
-	self assert: result children first children first literal = $a.
-	self assert: result children last class = PPLiteralObjectParser.
-	self assert: result children last literal = $b
+	self assert: result children first class equals: PPTokenParser.
+	self assert: result children first children first literal equals: $a.
+	self assert: result children last class equals: PPLiteralObjectParser.
+	self assert: result children last literal equals: $b
 ! !
 
 !PPRewriterTest class methodsFor:'documentation'!