# HG changeset patch # User Claus Gittinger # Date 1354374486 -3600 # Node ID cc0b23aea2e940f9b73a2378e81739cd44e8d940 # Parent 370b064ea3b653fc64523fa32c0ad7a5d4867db6 class: PPToken changed: #newline fix for stx's stupid cr/return incompatibility diff -r 370b064ea3b6 -r cc0b23aea2e9 PPPredicateTest.st --- a/PPPredicateTest.st Sat Dec 01 15:29:54 2012 +0100 +++ b/PPPredicateTest.st Sat Dec 01 16:08:06 2012 +0100 @@ -39,14 +39,18 @@ !PPPredicateTest methodsFor:'testing-chars'! testBlank - | parser | - parser := #blank asParser. - self assertCharacterSets: parser. - self assert: parser parse: (String with: Character space) to: Character space. - self assert: parser parse: (String with: Character tab) to: Character tab. - self assert: parser fail: ''. - self assert: parser fail: '1'. - self assert: parser fail: (String with: Character cr) + | parser | + parser := #blank asParser. + self assertCharacterSets: parser. + self assert: parser parse: (String with: Character space) to: Character space. + self assert: parser parse: (String with: Character tab) to: Character tab. + self assert: parser fail: ''. + self assert: parser fail: '1'. + Smalltalk isSmalltalkX ifTrue:[ + self assert: parser fail: (String with: Character return) + ] ifFalse:[ + self assert: parser fail: (String with: Character cr) + ]. ! testChar @@ -61,10 +65,14 @@ ! testCr - | parser | - parser := #cr asParser. - self assertCharacterSets: parser. - self assert: parser parse: (String with: Character cr) to: Character cr + | parser | + parser := #cr asParser. + self assertCharacterSets: parser. + Smalltalk isSmalltalkX ifTrue:[ + self assert: parser parse: (String with: Character return) to: Character return + ] ifFalse:[ + self assert: parser parse: (String with: Character cr) to: Character cr + ] ! testDigit @@ -123,12 +131,16 @@ ! testNewline - | parser | - parser := #newline asParser. - self assertCharacterSets: parser. - self assert: parser parse: (String with: Character cr) to: Character cr. - self assert: parser parse: (String with: Character lf) to: Character lf. - self assert: parser fail: ' ' + | parser | + parser := #newline asParser. + self assertCharacterSets: parser. + Smalltalk isSmalltalkX ifTrue:[ + self assert: parser parse: (String with: Character return) to: Character return. + ] ifFalse:[ + self assert: parser parse: (String with: Character cr) to: Character cr. + ]. + self assert: parser parse: (String with: Character lf) to: Character lf. + self assert: parser fail: ' ' ! testPunctuation @@ -288,11 +300,11 @@ !PPPredicateTest class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPPredicateTest.st,v 1.3 2012-05-04 22:08:04 vrany Exp $' + ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPPredicateTest.st,v 1.4 2012-12-01 15:08:06 cg Exp $' ! version_CVS - ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPPredicateTest.st,v 1.3 2012-05-04 22:08:04 vrany Exp $' + ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPPredicateTest.st,v 1.4 2012-12-01 15:08:06 cg Exp $' ! version_SVN