--- a/PPPredicateTest.st Tue Mar 04 15:34:21 2014 +0100
+++ b/PPPredicateTest.st Tue Mar 04 15:34:22 2014 +0100
@@ -1,6 +1,6 @@
"{ Package: 'stx:goodies/petitparser' }"
-PPAbstractParseTest subclass:#PPPredicateTest
+PPAbstractParserTest subclass:#PPPredicateTest
instanceVariableNames:''
classVariableNames:''
poolDictionaries:''
@@ -11,12 +11,13 @@
!PPPredicateTest methodsFor:'private'!
charactersDo: aBlock
- "The limits are 1-255 as far as I know"
- self breakPoint: #petitparser.
- 1 to: 255 do: [ :index | aBlock value: (Character codePoint: index) ]
-"/ 1 to: 256 do: [ :index | aBlock value: (Character codePoint: index) ]
+ "cg: isn't 256 one too many?"
- "Modified: / 19-12-2010 / 16:58:58 / Jan Kurs <kurs.jan@post.cz>"
+ Smalltalk isSmalltalkX ifTrue:[
+ 0 to: 255 do: [ :index | aBlock value: (Character codePoint: index) ]
+ ] ifFalse:[
+ 1 to: 256 do: [ :index | aBlock value: (Character codePoint: index) ]
+ ].
! !
!PPPredicateTest methodsFor:'testing'!
@@ -39,18 +40,14 @@
!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'.
- Smalltalk isSmalltalkX ifTrue:[
- self assert: parser fail: (String with: Character return)
- ] ifFalse:[
- 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'.
+ self assert: parser fail: (String with: Character cr)
!
testChar
@@ -65,14 +62,15 @@
!
testCr
- | parser |
+ | parser cr |
+
+ cr := Smalltalk isSmalltalkX
+ ifTrue:[Character return]
+ ifFalse:[Character cr].
+
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
- ]
+ self assert: parser parse: (String with: cr) to: cr
!
testDigit
@@ -131,16 +129,12 @@
!
testNewline
- | 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: ' '
+ | 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: ' '
!
testPunctuation
@@ -300,13 +294,14 @@
!PPPredicateTest class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPPredicateTest.st,v 1.4 2012-12-01 15:08:06 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPPredicateTest.st,v 1.5 2014-03-04 14:34:22 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPPredicateTest.st,v 1.4 2012-12-01 15:08:06 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPPredicateTest.st,v 1.5 2014-03-04 14:34:22 cg Exp $'
!
version_SVN
- ^ '§Id: PPPredicateTest.st 5 2010-12-19 17:38:27Z kursjan §'
+ ^ '$Id: PPPredicateTest.st,v 1.5 2014-03-04 14:34:22 cg Exp $'
! !
+