PPStream.st
author Jan Vrany <jan.vrany@fit.cvut.cz>
Wed, 08 Oct 2014 21:56:20 +0100
changeset 388 74c9c229033b
parent 380 8fe3cb4e607f
child 405 0470a5e6e712
permissions -rw-r--r--
Workaround to fix PPComposedTest>>testLeftRecursion - make PPStream>>size returning size of the input. For whatever reason, in Smalltalk/X ReadStream>>size returns size remaning data, not the size of a whole stream. This is a bug and should be fixed in Smalltalk/X libbasic. Meanwhile, override PPStream>>size to return proper value. In Pharo, the method is not needed as the inherited method is exactly the same.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4
90de244a7fa2 move to package
Claus Gittinger <cg@exept.de>
parents: 0
diff changeset
     1
"{ Package: 'stx:goodies/petitparser' }"
0
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     2
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     3
ReadStream subclass:#PPStream
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     4
	instanceVariableNames:''
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     5
	classVariableNames:''
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     6
	poolDictionaries:''
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     7
	category:'PetitParser-Core'
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     8
!
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     9
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    10
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    11
!PPStream methodsFor:'accessing'!
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    12
159
0a53379a1214 class: PPStream
Claus Gittinger <cg@exept.de>
parents: 42
diff changeset
    13
collection
0a53379a1214 class: PPStream
Claus Gittinger <cg@exept.de>
parents: 42
diff changeset
    14
	"Answer the underlying collection."
0a53379a1214 class: PPStream
Claus Gittinger <cg@exept.de>
parents: 42
diff changeset
    15
	
0a53379a1214 class: PPStream
Claus Gittinger <cg@exept.de>
parents: 42
diff changeset
    16
	^ collection
0a53379a1214 class: PPStream
Claus Gittinger <cg@exept.de>
parents: 42
diff changeset
    17
!
0a53379a1214 class: PPStream
Claus Gittinger <cg@exept.de>
parents: 42
diff changeset
    18
42
9b021405b8a5 Checkin from browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 4
diff changeset
    19
next: anInteger 
0
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    20
	"Answer up to anInteger elements of my collection. Overridden for efficiency."
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    21
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    22
	| answer endPosition |
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    23
	endPosition := position + anInteger min: readLimit.
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    24
	answer := collection copyFrom: position + 1 to: endPosition.
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    25
	position := endPosition.
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    26
	^ answer
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    27
!
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    28
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    29
peek
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    30
	"An improved version of peek, that is slightly faster than the built in version."
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    31
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    32
	^ self atEnd ifFalse: [ collection at: position + 1 ]
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    33
!
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    34
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    35
position: anInteger
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    36
	"The receiver does not check for invalid arguments passed to this method, as it is solely used with valid indexes for backtracking."
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    37
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    38
	position := anInteger
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    39
!
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    40
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    41
uncheckedPeek
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    42
	"An unchecked version of peek that throws an error if we try to peek over the end of the stream, even faster than #peek."
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    43
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    44
	^ collection at: position + 1
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    45
! !
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    46
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    47
!PPStream methodsFor:'converting'!
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    48
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    49
asPetitStream
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    50
	^ self
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    51
! !
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    52
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    53
!PPStream methodsFor:'printing'!
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    54
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    55
printOn: aStream
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    56
	collection isString
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    57
		ifFalse: [ ^ super printOn: aStream ].
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    58
	aStream
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    59
		nextPutAll: (collection copyFrom: 1 to: position);
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    60
		nextPutAll: '·';
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    61
		nextPutAll: (collection copyFrom: position + 1 to: readLimit)
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    62
! !
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    63
377
6112a403a52d Updated to latest version from Moose repository.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 159
diff changeset
    64
!PPStream methodsFor:'queries'!
6112a403a52d Updated to latest version from Moose repository.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 159
diff changeset
    65
6112a403a52d Updated to latest version from Moose repository.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 159
diff changeset
    66
insideCRLF
380
8fe3cb4e607f Remove Pharoisms to make code more portable and running on Smalltalk/X
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 377
diff changeset
    67
        (position < 1) ifTrue: [ ^ false ].
8fe3cb4e607f Remove Pharoisms to make code more portable and running on Smalltalk/X
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 377
diff changeset
    68
        
8fe3cb4e607f Remove Pharoisms to make code more portable and running on Smalltalk/X
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 377
diff changeset
    69
        ^ (self peek = (Character codePoint: 10)) and: [ self peekBack = (Character codePoint: 13) ]
8fe3cb4e607f Remove Pharoisms to make code more portable and running on Smalltalk/X
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 377
diff changeset
    70
8fe3cb4e607f Remove Pharoisms to make code more portable and running on Smalltalk/X
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 377
diff changeset
    71
    "Modified: / 03-10-2014 / 23:52:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
377
6112a403a52d Updated to latest version from Moose repository.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 159
diff changeset
    72
!
6112a403a52d Updated to latest version from Moose repository.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 159
diff changeset
    73
6112a403a52d Updated to latest version from Moose repository.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 159
diff changeset
    74
isStartOfLine
380
8fe3cb4e607f Remove Pharoisms to make code more portable and running on Smalltalk/X
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 377
diff changeset
    75
        (position = 0) ifTrue: [ ^ true ].
377
6112a403a52d Updated to latest version from Moose repository.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 159
diff changeset
    76
380
8fe3cb4e607f Remove Pharoisms to make code more portable and running on Smalltalk/X
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 377
diff changeset
    77
        self insideCRLF ifTrue: [ ^ false ].
8fe3cb4e607f Remove Pharoisms to make code more portable and running on Smalltalk/X
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 377
diff changeset
    78
        
8fe3cb4e607f Remove Pharoisms to make code more portable and running on Smalltalk/X
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 377
diff changeset
    79
        ^ (self peekBack = (Character codePoint: 13)) or: [ self peekBack = (Character codePoint: 10)].
8fe3cb4e607f Remove Pharoisms to make code more portable and running on Smalltalk/X
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 377
diff changeset
    80
8fe3cb4e607f Remove Pharoisms to make code more portable and running on Smalltalk/X
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 377
diff changeset
    81
    "Modified: / 03-10-2014 / 23:52:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
388
74c9c229033b Workaround to fix PPComposedTest>>testLeftRecursion - make PPStream>>size returning size of the input.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 380
diff changeset
    82
!
74c9c229033b Workaround to fix PPComposedTest>>testLeftRecursion - make PPStream>>size returning size of the input.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 380
diff changeset
    83
74c9c229033b Workaround to fix PPComposedTest>>testLeftRecursion - make PPStream>>size returning size of the input.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 380
diff changeset
    84
size
74c9c229033b Workaround to fix PPComposedTest>>testLeftRecursion - make PPStream>>size returning size of the input.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 380
diff changeset
    85
    ^ readLimit
74c9c229033b Workaround to fix PPComposedTest>>testLeftRecursion - make PPStream>>size returning size of the input.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 380
diff changeset
    86
    "DO NOT REMOVE this method event though in Pharo it is the same as
74c9c229033b Workaround to fix PPComposedTest>>testLeftRecursion - make PPStream>>size returning size of the input.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 380
diff changeset
    87
     inherited. This is required for Smalltalk/X compatibility"
74c9c229033b Workaround to fix PPComposedTest>>testLeftRecursion - make PPStream>>size returning size of the input.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 380
diff changeset
    88
74c9c229033b Workaround to fix PPComposedTest>>testLeftRecursion - make PPStream>>size returning size of the input.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 380
diff changeset
    89
    "Created: / 08-10-2014 / 12:25:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
377
6112a403a52d Updated to latest version from Moose repository.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 159
diff changeset
    90
! !
6112a403a52d Updated to latest version from Moose repository.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 159
diff changeset
    91
0
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    92
!PPStream class methodsFor:'documentation'!
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    93
42
9b021405b8a5 Checkin from browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 4
diff changeset
    94
version
159
0a53379a1214 class: PPStream
Claus Gittinger <cg@exept.de>
parents: 42
diff changeset
    95
    ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPStream.st,v 1.4 2014-03-04 14:32:00 cg Exp $'
42
9b021405b8a5 Checkin from browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 4
diff changeset
    96
!
9b021405b8a5 Checkin from browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 4
diff changeset
    97
9b021405b8a5 Checkin from browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 4
diff changeset
    98
version_CVS
159
0a53379a1214 class: PPStream
Claus Gittinger <cg@exept.de>
parents: 42
diff changeset
    99
    ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPStream.st,v 1.4 2014-03-04 14:32:00 cg Exp $'
42
9b021405b8a5 Checkin from browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 4
diff changeset
   100
!
9b021405b8a5 Checkin from browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 4
diff changeset
   101
388
74c9c229033b Workaround to fix PPComposedTest>>testLeftRecursion - make PPStream>>size returning size of the input.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 380
diff changeset
   102
version_HG
74c9c229033b Workaround to fix PPComposedTest>>testLeftRecursion - make PPStream>>size returning size of the input.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 380
diff changeset
   103
74c9c229033b Workaround to fix PPComposedTest>>testLeftRecursion - make PPStream>>size returning size of the input.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 380
diff changeset
   104
    ^ '$Changeset: <not expanded> $'
74c9c229033b Workaround to fix PPComposedTest>>testLeftRecursion - make PPStream>>size returning size of the input.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 380
diff changeset
   105
!
74c9c229033b Workaround to fix PPComposedTest>>testLeftRecursion - make PPStream>>size returning size of the input.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 380
diff changeset
   106
0
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   107
version_SVN
159
0a53379a1214 class: PPStream
Claus Gittinger <cg@exept.de>
parents: 42
diff changeset
   108
    ^ '$Id: PPStream.st,v 1.4 2014-03-04 14:32:00 cg Exp $'
0
739fe9b7253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   109
! !
159
0a53379a1214 class: PPStream
Claus Gittinger <cg@exept.de>
parents: 42
diff changeset
   110