diff -r 451b5ae38b72 -r 8fe3cb4e607f tests/PPTokenTest.st --- a/tests/PPTokenTest.st Fri Oct 03 03:11:33 2014 +0100 +++ b/tests/PPTokenTest.st Sun Oct 05 00:05:20 2014 +0100 @@ -89,21 +89,25 @@ !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 equals: line ] + | input parser result | + input := '1' , (String with: (Character codePoint: 13)) , '12' , (String with: (Character codePoint: 13) with: (Character codePoint: 10)) , '123' + , (String with: (Character codePoint: 10)) , '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 equals: line ] + + "Modified: / 03-10-2014 / 23:53:40 / Jan Vrany " ! 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 equals: line ] + | input parser result | + input := '1' , (String with: (Character codePoint: 13)) , '12' , (String with:(Character codePoint: 13) with: (Character codePoint: 10)) , '123' + , (String with: (Character codePoint: 10)) , '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 equals: line ] + + "Modified: / 03-10-2014 / 23:54:22 / Jan Vrany " ! ! !PPTokenTest methodsFor:'testing-values'!