--- a/PPLambdaParserTest.st Tue Mar 04 15:34:17 2014 +0100
+++ b/PPLambdaParserTest.st Tue Mar 04 15:34:18 2014 +0100
@@ -63,43 +63,37 @@
!PPLambdaParserTest methodsFor:'testing-utilities'!
testParseOnError
- | beenHere |
- result := self parserClass
- parse: '\x.y'
- onError: [ self fail ].
- self assert: result = #('x' 'y').
-
- beenHere := false.
- result := self parserClass
- parse: '\x.'
- onError: [ beenHere := true ].
- self assert: beenHere.
-
- beenHere := false.
- result := self parserClass
- parse: '\x.'
- onError: [ :fail | beenHere := true. fail ].
- self assert: beenHere.
- "We don't use $ before character sign in ST/X"
- self assert: (result message includesSubString: '(').
-"/ self assert: (result message includesSubString: '$(').
- self assert: (result message includesSubString: 'expected').
- self assert: (result position = 0).
+ | beenHere |
+ result := self parserClass
+ parse: '\x.y'
+ onError: [ self fail ].
+ self assert: result = #('x' 'y').
+
+ beenHere := false.
+ result := self parserClass
+ parse: '\x.'
+ onError: [ beenHere := true ].
+ self assert: beenHere.
- beenHere := false.
- result := self parserClass
- parse: '\x.'
- onError: [ :msg :pos |
- "We don't use $ before character sign in ST/X"
- self assert: (msg includesSubString: '(').
-"/ self assert: (msg includesSubString: '$(').
- self assert: (msg includesSubString: 'expected').
- self assert: (pos = 0).
- beenHere := true ].
- self assert: result.
- self assert: beenHere
+ beenHere := false.
+ result := self parserClass
+ parse: '\x.'
+ onError: [ :fail | beenHere := true. fail ].
+ self assert: beenHere.
+ self assert: (result message findString: '$(') > 0.
+ self assert: (result message findString: 'expected') > 0.
+ self assert: (result position = 0).
- "Modified: / 19-12-2010 / 16:52:33 / Jan Kurs <kurs.jan@post.cz>"
+ beenHere := false.
+ result := self parserClass
+ parse: '\x.'
+ onError: [ :msg :pos |
+ self assert: (msg findString: '$(') > 0.
+ self assert: (msg findString: 'expected') > 0.
+ self assert: (pos = 0).
+ beenHere := true ].
+ self assert: result.
+ self assert: beenHere
!
testParseStartingAtOnError
@@ -151,13 +145,14 @@
!PPLambdaParserTest class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPLambdaParserTest.st,v 1.3 2012-05-04 22:05:16 vrany Exp $'
+ ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPLambdaParserTest.st,v 1.4 2014-03-04 14:34:18 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPLambdaParserTest.st,v 1.3 2012-05-04 22:05:16 vrany Exp $'
+ ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPLambdaParserTest.st,v 1.4 2014-03-04 14:34:18 cg Exp $'
!
version_SVN
- ^ '§Id: PPLambdaParserTest.st 5 2010-12-19 17:38:27Z kursjan §'
+ ^ '$Id: PPLambdaParserTest.st,v 1.4 2014-03-04 14:34:18 cg Exp $'
! !
+