diff -r 538267cab6ec -r 1d7503124bc8 analyzer/tests/PPAnalyzerTest.st --- a/analyzer/tests/PPAnalyzerTest.st Thu Oct 30 23:52:47 2014 +0000 +++ b/analyzer/tests/PPAnalyzerTest.st Sat Nov 01 00:12:10 2014 +0000 @@ -1,5 +1,3 @@ -"{ Encoding: utf8 }" - "{ Package: 'stx:goodies/petitparser/analyzer/tests' }" PPAbstractParserTest subclass:#PPAnalyzerTest @@ -19,7 +17,7 @@ !PPAnalyzerTest methodsFor:'accessing'! grammarA - "Güting, Erwig, Ãœbersetzerbau, Springer (p.63)" + "Güting, Erwig, Übersetzerbau, Springer (p.63)" | grammar | grammar := Dictionary new. @@ -65,24 +63,24 @@ | grammar | grammar := PPUnresolvedParser new. grammar def: (grammar , $+ asParser , grammar) / $1 asParser. - ^ grammar + ^grammar ! grammarD - "A highly ambiguous grammar from: Saichaitanya Jampana. Exploring the problem of ambiguity in context-free grammars. Master’s thesis, Oklahoma State University, July 2005." + "A highly ambiguous grammar from: Saichaitanya Jampana. Exploring the problem of ambiguity in context-free grammars. Master's thesis, Oklahoma State University, July 2005." - | grammar | - grammar := Dictionary new. - #(S A a B b) do: [ :each | grammar at: each put: (PPUnresolvedParser named: each) ]. + | grammar | + grammar := Dictionary new. + #(S A a B b) do: [ :each | grammar at: each put: (PPUnresolvedParser named: each) ]. - (grammar at: #a) def: $a asParser. - (grammar at: #b) def: $b asParser. - - (grammar at: #S) def: (grammar at: #A) , (grammar at: #B) / (grammar at: #a). - (grammar at: #A) def: (grammar at: #S) , (grammar at: #B) / (grammar at: #b). - (grammar at: #B) def: (grammar at: #B) , (grammar at: #A) / (grammar at: #a). - - ^ grammar + (grammar at: #a) def: $a asParser. + (grammar at: #b) def: $b asParser. + + (grammar at: #S) def: (grammar at: #A) , (grammar at: #B) / (grammar at: #a). + (grammar at: #A) def: (grammar at: #S) , (grammar at: #B) / (grammar at: #b). + (grammar at: #B) def: (grammar at: #B) , (grammar at: #A) / (grammar at: #a). + + ^ grammar ! grammarE @@ -98,15 +96,15 @@ testAllNamedParsers | p1 p2 p3 | - p1 := (#digit asParser name: 'a'). + p1 := #digit asParser name: 'a'. p2 := (#digit asParser name: 'b') star. p3 := (#digit asParser name: 'c') token end. - self assert: p1 allNamedParsers size = 1. - self assert: p1 allNamedParsers first name = 'a'. - self assert: p2 allNamedParsers size = 1. - self assert: p2 allNamedParsers first name = 'b'. - self assert: p3 allNamedParsers size = 1. - self assert: p3 allNamedParsers first name = 'c' + self assert: p1 allNamedParsers size equals: 1. + self assert: p1 allNamedParsers first name equals: 'a'. + self assert: p2 allNamedParsers size equals: 1. + self assert: p2 allNamedParsers first name equals: 'b'. + self assert: p3 allNamedParsers size equals: 1. + self assert: p3 allNamedParsers first name equals: 'c' ! testAllParsers @@ -115,20 +113,20 @@ p2 := p1 ==> #asUppercase. p3 := PPUnresolvedParser new. p3 def: p2 / p3. - self assert: p1 allParsers size = 1. - self assert: p2 allParsers size = 2. - self assert: p3 allParsers size = 3 + self assert: p1 allParsers size equals: 1. + self assert: p2 allParsers size equals: 2. + self assert: p3 allParsers size equals: 3 ! testInnerChildren | p1 p2 p3 | - p1 := (#digit asParser name: 'a'). - p2 := (#digit asParser star name: 'b'). + p1 := #digit asParser name: 'a'. + p2 := #digit asParser star name: 'b'. p3 := (#digit asParser name: 'c') token star end. self assert: p1 innerChildren isEmpty. - self assert: p2 innerChildren size = 1. + self assert: p2 innerChildren size equals: 1. self assert: (p2 innerChildren allSatisfy: [ :each | each name isNil ]). - self assert: p3 innerChildren size = 2. + self assert: p3 innerChildren size equals: 2. self assert: (p3 innerChildren allSatisfy: [ :each | each name isNil ]) ! @@ -163,17 +161,17 @@ testNamedChildren | p1 p2 p3 p4 | - p1 := (#digit asParser name: 'a'). + p1 := #digit asParser name: 'a'. p2 := (#digit asParser name: 'b') star. p3 := (#digit asParser name: 'c') token end. p4 := ((#digit asParser name: 'c') token name: 'd') end. self assert: p1 namedChildren isEmpty. - self assert: p2 namedChildren size = 1. - self assert: p2 namedChildren first name = 'b'. - self assert: p3 namedChildren size = 1. - self assert: p3 namedChildren first name = 'c'. - self assert: p4 namedChildren size = 1. - self assert: p4 namedChildren first name = 'd' + self assert: p2 namedChildren size equals: 1. + self assert: p2 namedChildren first name equals: 'b'. + self assert: p3 namedChildren size equals: 1. + self assert: p3 namedChildren first name equals: 'c'. + self assert: p4 namedChildren size equals: 1. + self assert: p4 namedChildren first name equals: 'd' ! ! !PPAnalyzerTest methodsFor:'testing-cycleset'! @@ -190,26 +188,23 @@ | grammar cycleSet | grammar := self grammarC. cycleSet := grammar cycleSet. - self assert: (cycleSet size = 2). + self assert: cycleSet size equals: 2. self assert: (cycleSet includes: grammar) ! testCycleSetGrammarD | grammar cycleSet | grammar := self grammarD. - cycleSet := (grammar at: #S) cycleSet. - self assert: (cycleSet size = 4). + self assert: cycleSet size equals: 4. self assert: (cycleSet includes: (grammar at: #A)). self assert: (cycleSet includes: (grammar at: #S)). - cycleSet := (grammar at: #A) cycleSet. - self assert: (cycleSet size = 4). + self assert: cycleSet size equals: 4. self assert: (cycleSet includes: (grammar at: #A)). self assert: (cycleSet includes: (grammar at: #S)). - cycleSet := (grammar at: #B) cycleSet. - self assert: (cycleSet size = 2). + self assert: cycleSet size equals: 2. self assert: (cycleSet includes: (grammar at: #B)) ! @@ -217,7 +212,7 @@ | grammar cycleSet | grammar := self grammarE. cycleSet := grammar cycleSet. - self assert: (cycleSet size = 1). + self assert: cycleSet size equals: 1. self assert: (cycleSet includes: grammar) ! @@ -226,14 +221,13 @@ parser := PPUnresolvedParser new. parser def: parser / $a asParser. cycleSet := parser cycleSet. - self assert: (cycleSet size = 1). + self assert: cycleSet size equals: 1. self assert: (cycleSet includes: parser). - parser := PPUnresolvedParser new. parser def: $a asParser / parser. cycleSet := parser cycleSet. - self assert: (cycleSet size = 1). - self assert: (cycleSet includes: parser). + self assert: cycleSet size equals: 1. + self assert: (cycleSet includes: parser) ! testCycleSetInSequence @@ -241,15 +235,13 @@ parser := PPUnresolvedParser new. parser def: parser , $a asParser. cycleSet := parser cycleSet. - self assert: (cycleSet size = 1). + self assert: cycleSet size equals: 1. self assert: (cycleSet includes: parser). - parser := PPUnresolvedParser new. parser def: nil asParser , parser. cycleSet := parser cycleSet. - self assert: (cycleSet size = 1). + self assert: cycleSet size equals: 1. self assert: (cycleSet includes: parser). - parser := PPUnresolvedParser new. parser def: $a asParser , parser. cycleSet := parser cycleSet.