hg/stx-goodies-petitparser: comparison compiler/tests/PPCUniversalTest.st

equal deleted inserted replaced

-:fb212e14d1f4
+:16e8536f5cfb
 ! !
 !PPCUniversalTest methodsFor:'tests - compiling'!
 testCompileAnd
-parser := #digit asParser and compileUsingCompiler:compiler.
+parser := compiler compile: (#digit asParser and).
 self assert: parser parse: '1' to: $1 end: 0.
 self assert: parser fail: 'a'.
 self assert: parser fail: ''.
 self assert: parser parse: '
 ' to: Character cr.
 !
 testCompileAnyStar
-parser := #any asParser star compileUsingCompiler:compiler.
+parser := compiler compile: (#any asParser star).
 self assert: parser parse: 'aaa' to: { $a. $a . $a }.
 self assert: context invocationCount = 1.
 self assert: parser parse: '' to: { }.
 !
 testCompileBlock
 parser := (#letter asParser) plus ==> [ :res | res collect: [:each | each asUppercase ]].
-parser := parser compileUsingCompiler:compiler.
+parser := compiler compile: (parser).
 self assert: parser parse: 'foo' to: { $F . $O . $O}.
 self assert: parser parse: 'bar' to: { $B . $A . $R}.
 self assert: parser fail: ''.
 !
 testCompileCharacter
-parser := $a asParser compileUsingCompiler:compiler.
+parser := compiler compile: ($a asParser).
 self assert: parser parse: 'a'  to: $a.
 self assert: parser fail: 'b'.
-parser := $# asParser compileUsingCompiler:compiler.
+parser := compiler compile: ($# asParser).
 self assert: parser parse: '#'.
 !
 testCompileChoice
-parser := (#digit asParser / #letter asParser) compileUsingCompiler:compiler.
+parser := compiler compile: ((#digit asParser / #letter asParser)).
 self assert: parser parse: '1' to: $1.
 self assert: parser parse: 'a' to: $a.
 self assert: parser fail: '_'.
 !
 testCompileChoice2
-parser := ('true' asParser / 'false' asParser) compileUsingCompiler:compiler.
+parser := compiler compile: (('true' asParser / 'false' asParser)).
 self assert: parser parse: 'true' to: 'true'.
 self assert: parser parse: 'false' to: 'false'.
 self assert: parser fail: 'trulse'.
 !
 testCompileLiteral
-parser := 'foo' asParser compileUsingCompiler:compiler.
+parser := compiler compile: ('foo' asParser).
 self assert: parser parse: 'foo'  to: 'foo'.
 self assert: parser parse: 'foobar'  to: 'foo' end: 3.
 self assert: parser fail: 'boo'.
-parser := '#[' asParser compileUsingCompiler:compiler.
+parser := compiler compile: ('#[' asParser).
 self assert: parser parse: '#[1]' to: '#[' end: 2.
 !
 testCompileLiteral2
 | quote |
 quote := '''' asParser.
-parser := (quote , $a asParser) compileUsingCompiler:compiler.
+parser := compiler compile: ((quote , $a asParser)).
 self assert: parser parse: '''a'  to: {'''' . $a}.
 !
 testCompileNegate
 parser := #letter asParser negate star, #letter asParser.
-parser := parser compileUsingCompiler:compiler.
+parser := compiler compile: (parser).
 self assert: parser parse: '...a' to: { { $. . $. . $. } . $a }.
 self assert: parser parse: 'aaa' to: { {} . $a } end: 1.
 self assert: parser fail: '...'.
 !
 testCompileNil
-parser := nil asParser compileUsingCompiler:compiler.
+parser := compiler compile: (nil asParser).
 self assert: parser parse: 'a' to: nil end: 0.
 self assert: parser parse: '' to: nil end: 0.
 parser := nil asParser, 'foo' asParser.
 self assert: parser parse: 'foo' to: { nil . 'foo' }
 !
 testCompileNot
-parser := #digit asParser not compileUsingCompiler:compiler.
+parser := compiler compile: (#digit asParser not).
 self assert: parser parse: 'a' to: nil end: 0.
 self assert: parser fail: '1'.
 self assert: parser parse: '' to: nil end: 0.
 parser := 'foo' asParser, $: asParser not.
-parser := parser compileUsingCompiler:compiler.
+parser := compiler compile: (parser).
 self assert: parser parse: 'foo' to: { 'foo'. nil } end: 3.
 parser := 'foo' asParser, $: asParser not, 'bar' asParser.
-parser := parser compileUsingCompiler:compiler.
+parser := compiler compile: (parser).
 self assert: parser parse: 'foobar' to: { 'foo'. nil . 'bar' } end: 6.
 !
 testCompileNot2
-parser := ($a asParser , $b asParser) not compileUsingCompiler:compiler.
+parser := compiler compile: (($a asParser , $b asParser) not).
 self assert: parser parse: '' to: nil end: 0.
 self assert: parser parse: 'a' to: nil end: 0.
 self assert: parser parse: 'aa' to: nil end: 0.
 self assert: parser fail: 'ab'.
 !
 testCompileNot3
-parser := ('foo' asParser not , 'fee' asParser) compileUsingCompiler:compiler.
+parser := compiler compile: (('foo' asParser not , 'fee' asParser)).
 self assert: parser parse: 'fee' to: #(nil 'fee').
 self assert: parser fail: 'foo'.
 !
 testCompileNotLiteral
-parser := 'foo' asParser not compileUsingCompiler:compiler.
+parser := compiler compile: ('foo' asParser not).
 self assert: parser class methodDictionary size = 1.
 self assert: parser parse: 'bar' to: nil end: 0.
 self assert: parser fail: 'foo'.
 self assert: parser parse: 'foobar' to: { 'foo'. nil . #($b $a $r) } end: 6.
 self assert: parser fail: 'foofoo'.
 !
 testCompileOptional
-parser := #digit asParser optional compileUsingCompiler:compiler.
+parser := compiler compile: (#digit asParser optional).
 self assert: parser parse: '1' to: $1.
 self assert: parser parse: 'a' to: nil end: 0.
 parser := (#digit asParser optional, #letter asParser) compile.
 self assert: parser parse: '1a' to: { $1 . $a }.
 self assert: parser parse: 'a' to: { nil . $a }.
 !
 testCompilePlus
-parser := #letter asParser plus compileUsingCompiler:compiler.
+parser := compiler compile: (#letter asParser plus).
 self assert: parser parse: 'lorem' to: {$l. $o. $r. $e. $m} .
 self assert: parser parse: 'a123' to: {$a} end: 1.
 self assert: parser parse: 'ab123' to: {$a . $b} end: 2.
 self assert: parser fail: ''.
 self assert: parser fail: '123'.
 !
 testCompilePredicate
-parser := #digit asParser compileUsingCompiler:compiler.
+parser := compiler compile: (#digit asParser).
 self assert: parser parse: '1' to: $1.
 self assert: parser parse: '0' to: $0.
 self assert: parser fail: 'a'.
 !
 testCompilePredicate2
-parser := #space asParser compileUsingCompiler:compiler.
+parser := compiler compile: (#space asParser).
 self assert: parser parse: ' ' to: Character space.
 self assert: parser fail: 'a'.
 !
 testCompileSequence
-parser := (#digit asParser , #letter asParser) compileUsingCompiler:compiler.
+parser := compiler compile: ((#digit asParser , #letter asParser)).
 self assert: parser parse: '1a' to: {$1 .$a}.
 !
 testCompileSequence2
-parser := (#digit asParser , #space asParser , #letter asParser)
+parser := compiler compile: (#digit asParser , #space asParser , #letter asParser).
-compileUsingCompiler:compiler.
+self assert: parser parse: '9 c' to: {$9 . Character space. $c }.
-self assert: parser parse: '9 c' to: {$9 . Character space. $c }.
 self assert: parser fail: '9c'.
+"Modified: / 07-09-2015 / 12:38:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 testCompileSequence3
-parser := (#any asParser , #any asParser , #any asParser)
+parser := compiler compile: (#any asParser , #any asParser , #any asParser).
-compileUsingCompiler:compiler.
+self assert: parser parse: 'foo' to: #($f $o $o).
-self assert: parser parse: 'foo' to: #($f $o $o).
 self assert: parser fail: 'fo'.
+"Modified: / 07-09-2015 / 12:38:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 testCompileStar
-parser := #letter asParser star compileUsingCompiler:compiler.
+parser := compiler compile: (#letter asParser star).
 self assert: parser parse: 'lorem' to: {$l. $o. $r. $e. $m} .
 self assert: parser parse: '' to: {}.
 self assert: parser parse: '123' to: {} end: 0.
 self assert: parser parse: 'ab123' to: {$a . $b} end: 2.
 !
 testCompileStarLiteral
-parser := 'foo' asParser star compileUsingCompiler:compiler.
+parser := compiler compile: ('foo' asParser star).
 self assert: parser parse: 'foo' to: #('foo' ) .
 self assert: parser parse: 'foofoo' to: #('foo' 'foo') .
 self assert: parser parse: 'foofoofoo' to: #('foo' 'foo' 'foo') .
 self assert: parser parse: '' to: #().
 self assert: parser parse: 'bar' to: #() end: 0.
 !
 testCompileStarPredicate
-parser := #letter asParser star compileUsingCompiler:compiler.
+parser := compiler compile: (#letter asParser star).
 self assert: parser parse: 'foo' to: #($f $o $o ) .
 self assert: parser parse: '' to: #().
 self assert: parser parse: '123' to: #() end: 0.
 !
 testCompileSymbolBlock
 parser := (#letter asParser) plus ==> #second.
-parser := parser compileUsingCompiler:compiler.
+parser := compiler compile: (parser).
 self assert: parser parse: 'foo' to: $o.
 self assert: parser parse: 'bar' to: $a.
 self assert: parser fail: ''.
 self should: [ parser parse: 'f' ] raise: Error.
 !
 testCompileTrim
-parser := $a asParser trim compileUsingCompiler:compiler.
+parser := compiler compile: ($a asParser trim).
 self assert: parser fail: ''.
 self assert: parser parse: 'a' to: $a.
 self assert: parser parse: '   a' to: $a.
 self assert: parser parse: 'a    ' to: $a.
 testCompileTrimmingToken
 | token1 token2 |
 token1 := (#letter asParser) plus trimmingToken.
 token2 := (#letter asParser) plus trimmingToken.
-parser := (token1 , token2) compileUsingCompiler:compiler.
+parser := compiler compile: ((token1 , token2)).
 self assert: parser parse: 'foo bar'.
 self assert: parser parse: ' foo bar '.
 !
 testCompileTrimmingToken2
 | token1 token2 |
 token1 := (#letter asParser) plus trimmingToken.
 token2 := (#letter asParser) plus trimmingToken / 'foo' asParser trimmingToken.
-parser := (token1 , token2) compileUsingCompiler:compiler.
+parser := compiler compile: ((token1 , token2)).
 self assert: parser parse: 'foo bar'.
 self assert: parser parse: ' foo bar '.
 !
 testCompileTrimmingToken3
 | token1 token2 |
 token1 := ($a asParser, $b asParser) trimmingToken name: 'token1'.
 token2 := (token1 not, $c asParser) trimmingToken name: 'token2'.
-parser := (token1 / token2) compileUsingCompiler:compiler.
+parser := compiler compile: ((token1 / token2)).
 self assert: (parser class methodDictionary includesKey: #'token1').
 self assert: (parser class methodDictionary includesKey: #'token1_fast').
 self assert: parser parse: 'ab'.
 ! !
 !PPCUniversalTest methodsFor:'tests - extra'!
 testCompileSmalltalkToken
-parser := (#letter asParser , ((#letter asParser / #digit asParser) star))
+parser := compiler compile: (#letter asParser , ((#letter asParser / #digit asParser) star)) smalltalkToken.
-smalltalkToken compileUsingCompiler:compiler.
 self assert: parser parse: 'foo'.
 self assert: result inputValue = 'foo'.
 self assert: parser parse: 'a'.
 self assert: result inputValue = 'a'.
 "and yet, another comment"
 "one more to make sure :)"
 '.
 self assert: result inputValue = 'foo'.
+"Modified: / 07-09-2015 / 12:38:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 testCycle
 | p1 block |
 p1 := PPDelegateParser new.
 block := ${ asParser, p1, $} asParser / nil asParser.
 p1 setParser: block.
-parser := block compileUsingCompiler:compiler.
+parser := compiler compile: (block).
 self assert: parser parse: '{}' to: { ${. nil . $} }.
 self assert: parser parse: '{{}}' to: { ${. { ${ . nil . $} } . $} }.
 !
 testSmalltalkToken
-parser := (#letter asParser , (#digit asParser / #letter asParser) star)
+parser := compiler compile: (#letter asParser , (#digit asParser / #letter asParser) star) smalltalkToken.
-smalltalkToken compileUsingCompiler:compiler.
 self assert: parser class methodDictionary size = 5.
 self assert: parser parse: 'foo'.
 self assert: result inputValue = 'foo'.
 self assert: context invocationCount = 8.
 self assert: context rememberCount = 0.
 self assert: context lwRememberCount = 0.
 self assert: context lwRestoreCount = 0.
+"Modified: / 07-09-2015 / 12:38:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 testSmalltalkToken2
 id := (#letter asParser, (#digit asParser / #letter asParser) star)
 name: 'identifier';
 parser := (id wrapped, $: asParser) smalltalkToken
 name: 'kw';
 yourself.
-parser := parser compileUsingCompiler:compiler.
+parser := compiler compile: (parser).
 self assert: parser parse: 'foo:'.
 self assert: result inputValue = 'foo:'.
 !
 testToken
-parser := (#letter asParser , (#digit asParser / #letter asParser) star) flatten
+parser := compiler compile: (#letter asParser , (#digit asParser / #letter asParser) star) flatten.
-compileUsingCompiler:compiler.
 self assert: parser parse: 'foo' to: 'foo'.
 self assert: parser parse: 'a' to: 'a'.
 self assert: parser parse: 'f123a' to: 'f123a'.
 self assert: parser fail: ''.
+"Modified: / 07-09-2015 / 12:38:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 testToken2
-parser := (#letter asParser , (#digit asParser / #letter asParser) star) token
+parser := compiler compile: (#letter asParser , (#digit asParser / #letter asParser) star) token.
-compileUsingCompiler:compiler.
 self assert: parser class methodDictionary size = 4.
 self assert: parser parse: 'foo'.
 self assert: result inputValue = 'foo'.
 self assert: context invocationCount = 6.
 self assert: context rememberCount = 0.
 self assert: context lwRememberCount = 0.
 self assert: context lwRestoreCount = 0.
+"Modified: / 07-09-2015 / 12:37:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 testTrimmingToken
-parser := (#letter asParser , (#digit asParser / #letter asParser) star)
+parser := compiler compile: (#letter asParser , (#digit asParser / #letter asParser) star)
-trimmingToken compileUsingCompiler:compiler.
+trimmingToken.
 self assert: parser class methodDictionary size = 4.
 self assert: parser parse: 'foo'.
 self assert: result inputValue = 'foo'.
 self assert: context invocationCount = 6.
 self assert: context rememberCount = 0.
 self assert: context lwRememberCount = 0.
 self assert: context lwRestoreCount = 0.
 self assert: parser parse: ' foo '.
 self assert: result inputValue = 'foo'.
 self assert: parser fail: '123'.
 self assert: context invocationCount = 1.
 self assert: context rememberCount = 0.
 self assert: context lwRememberCount = 0.
 self assert: context lwRestoreCount = 0.
 self assert: parser fail: ''.
+"Modified: / 07-09-2015 / 12:37:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 testTrimmingToken2
-parser := 'foo' asParser trimmingToken , 'bar' asParser trimmingToken
+parser := compiler compile:  ('foo' asParser trimmingToken , 'bar' asParser trimmingToken).
-compileUsingCompiler:compiler.
 self assert: parser parse: 'foobar'.
 self assert: result first inputValue = 'foo'.
 self assert: result second inputValue = 'bar'.
 self assert: context invocationCount = 3.
 self assert: parser parse: ' foobar'.
 self assert: result first inputValue = 'foo'.
 self assert: result second inputValue = 'bar'.
 self assert: context invocationCount = 3.
 self assert: (context invocations anySatisfy: [ :e | e beginsWith: 'token' ]).
 self assert: parser fail: 'bar'.
 self assert: context invocationCount = 2.
-"	self assert: (context invocations noneSatisfy: [ :e | e beginsWith: 'token' ]).	"
+"       self assert: (context invocations noneSatisfy: [ :e | e beginsWith: 'token' ]).         "
+"Modified: / 07-09-2015 / 12:37:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 testTrimmingToken3
-parser := ('foo' asParser trimmingToken / 'bar' asParser trimmingToken)
+parser := compiler compile: ('foo' asParser trimmingToken / 'bar' asParser trimmingToken).
-compileUsingCompiler:compiler.
 self assert: parser parse: 'foo'.
 self assert: result inputValue = 'foo'.
 self assert: context invocationCount = 2.
 self assert: parser parse: ' bar'.
 self assert: result inputValue = 'bar'.
 self assert: context invocationCount = 2.
 self assert: (context invocations anySatisfy: [ :e | e beginsWith: 'token' ]).
 self assert: parser fail: 'baz'.
 self assert: context invocationCount = 2.
 self assert: parser fail: 'zaz'.
 self assert: context invocationCount = 1.
 self assert: (context invocations noneSatisfy: [ :e | e beginsWith: 'token' ]).
+"Modified: / 07-09-2015 / 12:37:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 testTrimmingTokenNested
 | identifier kw |
 kw := 'false' asParser trimmingToken name: #kw.
 identifier := (kw not, (#letter asParser, #word asParser star)) trimmingToken name: #identifier.
 parser := identifier / kw.
-parser := parser compileUsingCompiler:compiler.
+parser := compiler compile: (parser).
 self assert: parser class methodDictionary size = 5.
 self assert: parser parse: 'foo'.
 self assert: result inputValue = 'foo'.
 | identifier kw |
 kw := 'false' asParser trimmingToken name: #kw.
 identifier := (kw not, (#letter asParser, #word asParser star)) trimmingToken name: #identifier.
 parser := identifier / kw.
-parser := parser compileUsingCompiler:compiler.
+parser := compiler compile: (parser).
 self assert: parser class methodDictionary size = 5.
 self assert: parser parse: 'foo'.
 self assert: result inputValue = 'foo'.
 | identifier kw |
 kw := ('false' asParser, #word asParser not) trimmingToken name: #kw.
 identifier := (kw not, (#letter asParser, #word asParser star)) trimmingToken name: #identifier.
 parser := identifier / kw.
-parser := parser compileUsingCompiler:compiler.
+parser := compiler compile: (parser).
 self assert: parser class methodDictionary size = 8.
 self assert: (parser class methodDictionary values anySatisfy: [ :m | m selector = #kw ]).
 self assert: (parser class methodDictionary values anySatisfy: [ :m | m selector = #kw_fast ]).
 self assert: parser parse: 'foo'.
 ! !
 !PPCUniversalTest methodsFor:'tests - ids'!
 setUp
-options := (PPCCompilationOptions default)
+options := (PPCCompilationOptions new)
 profile:true;
 debug:true;
 tokenize:false;
 yourself.
 compiler := PPCCompiler new.
 compiler context options:options
-"Modified: / 04-09-2015 / 16:21:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 07-09-2015 / 10:22:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !PPCUniversalTest class methodsFor:'documentation'!
 version_HG

changeset 538	16e8536f5cfb
parent 537	fb212e14d1f4