diff -r 548996aca274 -r fb212e14d1f4 compiler/tests/PPCCodeGeneratorTest.st --- a/compiler/tests/PPCCodeGeneratorTest.st Mon Sep 07 08:03:02 2015 +0100 +++ b/compiler/tests/PPCCodeGeneratorTest.st Mon Sep 07 08:20:46 2015 +0100 @@ -3,7 +3,7 @@ "{ NameSpace: Smalltalk }" PPAbstractParserTest subclass:#PPCCodeGeneratorTest - instanceVariableNames:'visitor node result compiler parser context configuration options' + instanceVariableNames:'visitor node result parser context compiler options' classVariableNames:'' poolDictionaries:'' category:'PetitCompiler-Tests-Visitors' @@ -13,7 +13,7 @@ !PPCCodeGeneratorTest methodsFor:'generating'! compileTree: root - parser := configuration compile: root. + parser := compiler compile: root. ! ! @@ -24,18 +24,16 @@ ! setUp - options := PPCCompilationOptions default - tokenize: false; - profile: true; - yourself. - - configuration := PPCConfiguration new passes: - { - PPCCacheFirstFollowPass. - PPCCheckingVisitor . - PPCUniversalCodeGenerator . - }. - configuration options: options. + options := (PPCCompilationOptions default) + tokenize:false; + profile:true; + yourself. + compiler := PPCCompiler new passes:{ + PPCCacheFirstFollowPass. + PPCCheckingVisitor. + PPCUniversalCodeGenerator + }. + compiler options:options. "Modified: / 04-09-2015 / 16:22:30 / Jan Vrany " ! @@ -928,7 +926,7 @@ ! testStarAnyNode - configuration removePass: PPCCacheFirstFollowPass. + compiler removePass: PPCCacheFirstFollowPass. node := PPCStarAnyNode new child: PPCNilNode new; yourself. @@ -942,7 +940,7 @@ ! testStarCharSetPredicateNode - configuration removePass: PPCCacheFirstFollowPass. + compiler removePass: PPCCacheFirstFollowPass. node := PPCStarCharSetPredicateNode new predicate: (PPCharSetPredicate on: [:e | e = $a ]); child: PPCSentinelNode new; @@ -960,7 +958,7 @@ ! testStarMessagePredicateNode - configuration removePass: PPCCacheFirstFollowPass. + compiler removePass: PPCCacheFirstFollowPass. node := PPCStarMessagePredicateNode new message: #isLetter; child: PPCSentinelNode new; @@ -1039,7 +1037,7 @@ message: #isLetter; child: PPCSentinelNode new; yourself. - configuration removePass: PPCCacheFirstFollowPass. + compiler removePass: PPCCacheFirstFollowPass. options guards: false. self compileTree: node. @@ -1066,7 +1064,7 @@ node := PPCForwardNode new child: starNode; yourself. - configuration removePass: PPCCacheFirstFollowPass. + compiler removePass: PPCCacheFirstFollowPass. self compileTree: node. self assert: parser class methodDictionary size = 2. @@ -1088,7 +1086,7 @@ node := PPCForwardNode new child: starNode; yourself. - configuration removePass: PPCCacheFirstFollowPass. + compiler removePass: PPCCacheFirstFollowPass. self compileTree: node. self assert: parser class methodDictionary size = 1.