--- a/compiler/tests/PPCDistinctScannerTest.st Mon Sep 07 08:03:02 2015 +0100
+++ b/compiler/tests/PPCDistinctScannerTest.st Mon Sep 07 08:20:46 2015 +0100
@@ -3,7 +3,7 @@
"{ NameSpace: Smalltalk }"
TestCase subclass:#PPCDistinctScannerTest
- instanceVariableNames:'configuration scanner'
+ instanceVariableNames:'compiler scanner'
classVariableNames:''
poolDictionaries:''
category:'PetitCompiler-Tests-Core-Tokenizing'
@@ -53,14 +53,14 @@
!
setUp
- configuration := PPCConfiguration tokenizing.
+ compiler := PPCCompiler tokenizing.
!
testConsumeToken
| parser |
parser := self fooToken, self overlappingToken.
- parser compileWithConfiguration: configuration.
- scanner := (Smalltalk at: configuration context options scannerName) new.
+ parser compileUsingCompiler:compiler.
+ scanner := (Smalltalk at: compiler context options scannerName) new.
scanner stream: 'foobaz' asPetitStream.
scanner perform: #'consume_foo'.
@@ -75,8 +75,8 @@
testConsumeToken2
| parser |
parser := self fooToken, self barToken.
- parser compileWithConfiguration: configuration.
- scanner := (Smalltalk at: configuration context options scannerName) new.
+ parser compileUsingCompiler:compiler.
+ scanner := (Smalltalk at: compiler context options scannerName) new.
scanner stream: 'foobar' asPetitStream.
scanner perform: #'consume_foo'.
@@ -91,9 +91,9 @@
testScan
| parser |
parser := self aToken.
- parser compileWithConfiguration: configuration.
+ parser compileUsingCompiler:compiler.
- scanner := (Smalltalk at: configuration context options scannerName) new.
+ scanner := (Smalltalk at: compiler context options scannerName) new.
scanner stream: 'a' asPetitStream.
scanner perform: #'scan_token'.
@@ -108,9 +108,9 @@
testScan2
| parser |
parser := self fooToken.
- parser compileWithConfiguration: configuration.
+ parser compileUsingCompiler:compiler.
- scanner := (Smalltalk at: configuration context options scannerName) new.
+ scanner := (Smalltalk at: compiler context options scannerName) new.
scanner stream: 'foo' asPetitStream.
scanner perform: #'scan_foo'.
@@ -125,9 +125,9 @@
testScan3
| parser |
parser := self fooToken.
- parser compileWithConfiguration: configuration.
+ parser compileUsingCompiler:compiler.
- scanner := (Smalltalk at: configuration context options scannerName) new.
+ scanner := (Smalltalk at: compiler context options scannerName) new.
scanner stream: 'bar' asPetitStream.
scanner perform: #'scan_foo'.
@@ -142,9 +142,9 @@
testScan4
| parser |
parser := self fooToken, self idToken.
- parser compileWithConfiguration: configuration.
+ parser compileUsingCompiler:compiler.
- scanner := (Smalltalk at: configuration context options scannerName) new.
+ scanner := (Smalltalk at: compiler context options scannerName) new.
scanner stream: 'foothere' asPetitStream.
scanner perform: #'scan_foo'.
@@ -165,9 +165,9 @@
testSequence
| parser result |
parser := self fooTrimmingToken, self idTrimmingToken.
- parser compileWithConfiguration: configuration.
+ parser compileUsingCompiler:compiler.
- scanner := (Smalltalk at: configuration context options scannerName) new.
+ scanner := (Smalltalk at: compiler context options scannerName) new.
scanner stream: 'foo there ' asPetitStream.
scanner perform: #'foo'.
@@ -195,9 +195,9 @@
testToken
| parser |
parser := self fooToken, self idTrimmingToken.
- parser compileWithConfiguration: configuration.
+ parser compileUsingCompiler:compiler.
- scanner := (Smalltalk at: configuration context options scannerName) new.
+ scanner := (Smalltalk at: compiler context options scannerName) new.
scanner stream: 'foo there' asPetitStream.
scanner perform: #'foo'.
@@ -213,9 +213,9 @@
testTrimmingScan
| parser |
parser := self fooTrimmingToken, self idTrimmingToken.
- parser compileWithConfiguration: configuration.
+ parser compileUsingCompiler:compiler.
- scanner := (Smalltalk at: configuration context options scannerName) new.
+ scanner := (Smalltalk at: compiler context options scannerName) new.
scanner stream: 'foo there' asPetitStream.
scanner perform: #'scan_foo'.
@@ -230,9 +230,9 @@
testTrimmingToken
| parser result |
parser := self fooTrimmingToken, self idTrimmingToken.
- parser compileWithConfiguration: configuration.
+ parser compileUsingCompiler:compiler.
- scanner := (Smalltalk at: configuration context options scannerName) new.
+ scanner := (Smalltalk at: compiler context options scannerName) new.
scanner stream: 'foo there' asPetitStream.
result := scanner perform: #'foo'.