--- a/PPTokenTest.st Sat Dec 01 16:08:06 2012 +0100
+++ b/PPTokenTest.st Sat Dec 01 16:09:03 2012 +0100
@@ -98,23 +98,31 @@
!PPTokenTest methodsFor:'testing-querying'!
testColumn
- | input parser result |
- input := '1' , (String with: Character cr) , '12' , (String with: Character cr with: Character lf) , '123' , (String with: Character lf) , '1234'.
- parser := #any asParser token star.
- result := parser parse: input.
- result
- with: #(1 2 1 2 3 4 1 2 3 4 1 2 3 4)
- do: [ :token :line | self assert: token column = line ]
+ | input parser result |
+ Smalltalk isSmalltalkX ifTrue:[
+ input := '1' , (String with: Character return) , '12' , (String with: Character return with: Character lf) , '123' , (String with: Character lf) , '1234'.
+ ] ifFalse:[
+ input := '1' , (String with: Character cr) , '12' , (String with: Character cr with: Character lf) , '123' , (String with: Character lf) , '1234'.
+ ].
+ parser := #any asParser token star.
+ result := parser parse: input.
+ result
+ with: #(1 2 1 2 3 4 1 2 3 4 1 2 3 4)
+ do: [ :token :line | self assert: token column = line ]
!
testLine
- | input parser result |
- input := '1' , (String with: Character cr) , '12' , (String with: Character cr with: Character lf) , '123' , (String with: Character lf) , '1234'.
- parser := #any asParser token star.
- result := parser parse: input.
- result
- with: #(1 1 2 2 2 2 3 3 3 3 4 4 4 4)
- do: [ :token :line | self assert: token line = line ]
+ | input parser result |
+ Smalltalk isSmalltalkX ifTrue:[
+ input := '1' , (String with: Character return) , '12' , (String with: Character return with: Character lf) , '123' , (String with: Character lf) , '1234'.
+ ] ifFalse:[
+ input := '1' , (String with: Character cr) , '12' , (String with: Character cr with: Character lf) , '123' , (String with: Character lf) , '1234'.
+ ].
+ parser := #any asParser token star.
+ result := parser parse: input.
+ result
+ with: #(1 1 2 2 2 2 3 3 3 3 4 4 4 4)
+ do: [ :token :line | self assert: token line = line ]
! !
!PPTokenTest methodsFor:'utilities'!
@@ -126,11 +134,11 @@
!PPTokenTest class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPTokenTest.st,v 1.3 2012-05-04 22:05:27 vrany Exp $'
+ ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPTokenTest.st,v 1.4 2012-12-01 15:09:03 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPTokenTest.st,v 1.3 2012-05-04 22:05:27 vrany Exp $'
+ ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPTokenTest.st,v 1.4 2012-12-01 15:09:03 cg Exp $'
!
version_SVN