--- a/compiler/tests/PPCNodeFirstFollowNextTests.st Mon Sep 07 08:03:02 2015 +0100
+++ b/compiler/tests/PPCNodeFirstFollowNextTests.st Mon Sep 07 08:20:46 2015 +0100
@@ -3,7 +3,7 @@
"{ NameSpace: Smalltalk }"
TestCase subclass:#PPCNodeFirstFollowNextTests
- instanceVariableNames:'tree first node followSet configuration'
+ instanceVariableNames:'tree first node followSet compiler'
classVariableNames:''
poolDictionaries:''
category:'PetitCompiler-Tests-Nodes'
@@ -24,8 +24,8 @@
!PPCNodeFirstFollowNextTests methodsFor:'setup'!
setUp
- configuration := PPCConfiguration default.
- configuration context options generate: false.
+ compiler := PPCCompiler default.
+ compiler context options generate:false.
"Modified: / 28-08-2015 / 14:17:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
@@ -75,7 +75,9 @@
!
treeFrom: parser
- ^ parser compileWithConfiguration: configuration
+ ^ parser compileUsingCompiler: compiler
+
+ "Modified: / 07-09-2015 / 10:08:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!PPCNodeFirstFollowNextTests methodsFor:'testing - first'!
@@ -164,7 +166,7 @@
!
testFirstNegate1
- configuration removePass: PPCSpecializingVisitor.
+ compiler removePass: PPCSpecializingVisitor.
tree := self treeFrom: ('a' asParser negate, 'b' asParser).
first := self first: tree.
@@ -187,7 +189,7 @@
!
testFirstNot2
- configuration removePass: PPCSpecializingVisitor.
+ compiler removePass: PPCSpecializingVisitor.
tree := self treeFrom: (#letter asParser not star, #letter asParser).
first := self first: tree.
@@ -329,7 +331,7 @@
!
testFirstSequence6
- configuration removePass: PPCSpecializingVisitor.
+ compiler removePass: PPCSpecializingVisitor.
tree := self treeFrom: #space asParser star, 'a' asParser.
tree firstFollowCache: nil.
@@ -667,7 +669,7 @@
testFollowTrimmingToken
| token1 token2 |
- configuration removePass: PPCSpecializingVisitor.
+ compiler removePass: PPCSpecializingVisitor.
token1 := #letter asParser plus trimmingToken name: 'token1'; yourself.
token2 := #letter asParser plus trimmingToken name: 'token2'; yourself.