--- a/PPPredicateObjectParser.st Sat Nov 01 00:34:30 2014 +0000
+++ b/PPPredicateObjectParser.st Mon Nov 03 09:10:56 2014 +0000
@@ -20,7 +20,7 @@
startOfLine
- ^ PPStartOfLine new.
+ ^ PPStartOfLineParser new.
! !
!PPPredicateObjectParser class methodsFor:'factory-chars'!
@@ -42,9 +42,7 @@
!
cr
- ^ self char: (Character codePoint: 13) message: 'carriage return expected'
-
- "Modified: / 03-10-2014 / 23:56:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ ^ self char: (Character codePoint: 13) message: 'carriage return expected'
!
digit
@@ -65,7 +63,7 @@
!
lf
- ^ self char: Character lf
+ ^ self char: (Character codePoint: 10)
!
lowercase
@@ -73,9 +71,7 @@
!
newline
- ^ self chars: (String with: (Character codePoint: 13) with: (Character codePoint: 10)) message: 'newline expected'
-
- "Modified: / 03-10-2014 / 23:56:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ ^ self chars: (String with: (Character codePoint: 13) with: (Character codePoint: 10)) message: 'newline expected'
!
punctuation
@@ -124,6 +120,11 @@
negated: [ :each | each < min or: [ each > max ] ] message: min printString , '..' , max printString , ' not expected'
!
+endOfLine
+
+ ^ PPEndOfLineParser new.
+!
+
expect: anObject
^ self expect: anObject message: anObject printString , ' expected'
!
@@ -134,6 +135,7 @@
negated: [ :each | each ~= anObject ] message: 'no ' , aString
! !
+
!PPPredicateObjectParser methodsFor:'initialization'!
initializeOn: aBlock message: aString negated: aNegatedBlock message: aNegatedString