--- a/PPPredicateObjectParser.st	Fri Oct 03 01:59:10 2014 +0100
+++ b/PPPredicateObjectParser.st	Fri Oct 03 02:33:08 2014 +0100
@@ -16,6 +16,11 @@
 
 on: aBlock message: aString negated: aNegatedBlock message: aNegatedString
 	^ self new initializeOn: aBlock message: aString negated: aNegatedBlock message: aNegatedString
+!
+
+startOfLine
+	
+	^ PPStartOfLine new.
 ! !
 
 !PPPredicateObjectParser class methodsFor:'factory-chars'!
@@ -37,12 +42,7 @@
 !
 
 cr
-    |cr|
-
-    cr := Smalltalk isSmalltalkX 
-            ifTrue:[Character return] 
-            ifFalse:[Character cr].
-    ^ self char: cr message: 'carriage return expected'
+	^ self char: Character cr message: 'carriage return expected'
 !
 
 digit
@@ -71,12 +71,7 @@
 !
 
 newline
-    |cr|
-
-    cr := Smalltalk isSmalltalkX 
-            ifTrue:[Character return] 
-            ifFalse:[Character cr].
-    ^ self chars: (String with: cr with: Character lf) message: 'newline expected'
+	^ self chars: (String with: Character cr with: Character lf) message: 'newline expected'
 !
 
 punctuation
@@ -156,10 +151,10 @@
 
 !PPPredicateObjectParser methodsFor:'parsing'!
 
-parseOn: aStream
-	^ (aStream atEnd not and: [ predicate value: aStream uncheckedPeek ])
-		ifFalse: [ PPFailure message: predicateMessage at: aStream position ]
-		ifTrue: [ aStream next ]
+parseOn: aPPContext
+	^ (aPPContext atEnd not and: [ predicate value: aPPContext uncheckedPeek ])
+		ifFalse: [ PPFailure message: predicateMessage context: aPPContext ]
+		ifTrue: [ aPPContext next ]
 ! !
 
 !PPPredicateObjectParser class methodsFor:'documentation'!