author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Wed, 08 Jun 2011 14:12:37 +0000 | |
changeset 11 | 9388b5fb34aa |
parent 10 | c8eeee6c945e |
child 15 | f46eba00e7cb |
permissions | -rw-r--r-- |
2 | 1 |
"{ Package: 'stx:libwebkit' }" |
2 |
||
3 |
Object subclass:#WebKitRenderer |
|
4 | 4 |
instanceVariableNames:'view pid socket channel' |
2 | 5 |
classVariableNames:'' |
6 |
poolDictionaries:'' |
|
7 |
category:'Views-WebKit' |
|
8 |
! |
|
9 |
||
4 | 10 |
PeekableStream subclass:#Channel |
9
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
11 |
instanceVariableNames:'socket peekChar buffer' |
4 | 12 |
classVariableNames:'' |
13 |
poolDictionaries:'' |
|
14 |
privateIn:WebKitRenderer |
|
15 |
! |
|
16 |
||
2 | 17 |
|
18 |
!WebKitRenderer class methodsFor:'instance creation'! |
|
19 |
||
20 |
for: aWebKitView |
|
21 |
||
3
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
22 |
^self new initializeForView: aWebKitView |
2 | 23 |
|
24 |
"Created: / 02-06-2011 / 23:38:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
25 |
"Modified: / 06-06-2011 / 10:38:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2 | 26 |
! ! |
27 |
||
4 | 28 |
!WebKitRenderer methodsFor:'commands'! |
29 |
||
30 |
setVariable: name to: value |
|
31 |
||
32 |
channel ifNil:[^self]. |
|
33 |
||
34 |
channel |
|
35 |
nextPutAll: #set; |
|
36 |
space; |
|
37 |
nextPutAll: name; |
|
38 |
nextPut:$=; |
|
39 |
nextPutAll: value printString; |
|
40 |
cr |
|
41 |
||
42 |
"Created: / 07-06-2011 / 10:21:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
43 |
! ! |
|
44 |
||
45 |
!WebKitRenderer methodsFor:'event handling'! |
|
46 |
||
47 |
LOAD_COMMIT: event |
|
48 |
||
6 | 49 |
view url value ~= event second ifTrue: |
50 |
[view url value: event second]. |
|
4 | 51 |
|
52 |
"Created: / 07-06-2011 / 11:36:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
6 | 53 |
"Modified: / 07-06-2011 / 19:29:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
11 | 54 |
! |
55 |
||
56 |
TITLE_CHANGED: event |
|
57 |
||
58 |
event second = '(no title)' ifFalse: |
|
59 |
[view title value: event second]. |
|
60 |
||
61 |
"Created: / 08-06-2011 / 14:14:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
4 | 62 |
! ! |
63 |
||
3
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
64 |
!WebKitRenderer methodsFor:'event loop'! |
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
65 |
|
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
66 |
dispatchEvent |
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
67 |
|
4 | 68 |
| ev sym | |
69 |
ev := channel nextEvent. |
|
70 |
||
71 |
(self respondsTo: (sym := (ev first , ':') asSymbol)) |
|
72 |
ifTrue:[self perform: sym with: ev] |
|
73 |
ifFalse:[Transcript showCR: 'UNKNOWN EVENT: ', ev asArray printString]. |
|
3
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
74 |
|
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
75 |
"Created: / 06-06-2011 / 18:13:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
4 | 76 |
"Modified: / 07-06-2011 / 11:35:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
3
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
77 |
! |
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
78 |
|
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
79 |
eventLoop |
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
80 |
|
4 | 81 |
[ channel atEnd ] whileFalse: [ |
3
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
82 |
self dispatchEvent |
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
83 |
] |
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
84 |
|
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
85 |
"Created: / 06-06-2011 / 18:00:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
4 | 86 |
"Modified: / 07-06-2011 / 10:52:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
3
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
87 |
! ! |
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
88 |
|
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
89 |
!WebKitRenderer methodsFor:'initialization & release'! |
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
90 |
|
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
91 |
close |
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
92 |
|
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
93 |
"Created: / 06-06-2011 / 18:38:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
4 | 94 |
"Modified: / 07-06-2011 / 10:32:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
3
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
95 |
! |
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
96 |
|
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
97 |
init |
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
98 |
|
4 | 99 |
self |
100 |
setVariable: #forward_keys to: 1; |
|
101 |
setVariable: #show_status to: 0; |
|
102 |
setVariable: #scrollbars_visible to: 1; |
|
7 | 103 |
setVariable: #uri to: view url value; |
4 | 104 |
|
105 |
yourself |
|
3
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
106 |
|
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
107 |
"Created: / 06-06-2011 / 18:00:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
7 | 108 |
"Modified: / 07-06-2011 / 19:57:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
3
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
109 |
! |
2 | 110 |
|
111 |
initializeForView: aWebKitView |
|
112 |
||
113 |
view := aWebKitView. |
|
114 |
||
115 |
"Created: / 02-06-2011 / 23:38:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
116 |
! ! |
|
117 |
||
3
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
118 |
!WebKitRenderer methodsFor:'private'! |
2 | 119 |
|
3
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
120 |
startEventLoop |
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
121 |
|
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
122 |
[ |
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
123 |
self waitFor; init; eventLoop; close |
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
124 |
] fork |
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
125 |
|
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
126 |
"Created: / 06-06-2011 / 17:57:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
127 |
! |
2 | 128 |
|
3
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
129 |
waitFor |
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
130 |
|
4 | 131 |
socket listenFor: 1. |
132 |
channel := Channel on: socket accept. |
|
133 |
socket port asFilename remove. |
|
134 |
socket close. |
|
3
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
135 |
|
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
136 |
"Created: / 06-06-2011 / 18:00:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
4 | 137 |
"Modified: / 07-06-2011 / 10:49:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
3
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
138 |
! ! |
2 | 139 |
|
3
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
140 |
!WebKitRenderer methodsFor:'spawn / terminate'! |
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
141 |
|
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
142 |
spawn |
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
143 |
|path uzbl args| |
2 | 144 |
|
3
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
145 |
path := Filename newTemporary. |
4 | 146 |
socket := Socket newUNIXserverAt:path pathName. |
3
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
147 |
uzbl := '/home/jv/work/uzbl/uzbl-core'. |
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
148 |
args := (Array |
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
149 |
with:'/home/jv/work/uzbl/uzbl-core' |
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
150 |
with:'-s' |
4 | 151 |
with:view rendererView embeddingWindowId printString |
3
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
152 |
with:'--connect-socket=' , path pathName). |
4 | 153 |
|
154 |
self startEventLoop. |
|
155 |
||
156 |
||
157 |
pid := OperatingSystem |
|
3
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
158 |
exec: uzbl |
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
159 |
withArguments: args |
4 | 160 |
fork: true. |
2 | 161 |
|
162 |
"Created: / 02-06-2011 / 23:40:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
4 | 163 |
"Modified: / 07-06-2011 / 10:32:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2 | 164 |
! |
165 |
||
3
32456ba40192
Starts uzbl process and connects to its control socket
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2
diff
changeset
|
166 |
terminate |
2 | 167 |
"Created: / 02-06-2011 / 23:40:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
168 |
! ! |
|
169 |
||
4 | 170 |
!WebKitRenderer::Channel class methodsFor:'instance creation'! |
171 |
||
172 |
on: aReadStream |
|
173 |
||
174 |
^self basicNew initializeOn: aReadStream |
|
175 |
||
176 |
"Created: / 07-06-2011 / 10:44:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
177 |
! ! |
|
178 |
||
179 |
!WebKitRenderer::Channel methodsFor:'accessing'! |
|
180 |
||
181 |
contents |
|
182 |
"return the entire contents of the stream. |
|
183 |
For a readStream, that is the rest (i.e. upToEnd), |
|
184 |
for a writeStream, that is the collected data. As we do not know here, |
|
185 |
what we are, this is the responsibility of a subclass..." |
|
186 |
||
187 |
^ self shouldNotImplement |
|
188 |
||
189 |
"Modified: / 07-06-2011 / 10:46:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
9
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
190 |
! |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
191 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
192 |
peekChar |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
193 |
^ peekChar |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
194 |
! |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
195 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
196 |
peekChar:something |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
197 |
peekChar := something. |
4 | 198 |
! ! |
199 |
||
200 |
!WebKitRenderer::Channel methodsFor:'initialization'! |
|
201 |
||
202 |
initializeOn: aReadStream |
|
203 |
||
9
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
204 |
socket := aReadStream. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
205 |
buffer := String new writeStream. |
4 | 206 |
|
207 |
"Created: / 07-06-2011 / 10:45:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
9
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
208 |
"Modified: / 08-06-2011 / 13:12:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
209 |
! ! |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
210 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
211 |
!WebKitRenderer::Channel methodsFor:'private'! |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
212 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
213 |
contentsSpecies |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
214 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
215 |
^String |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
216 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
217 |
"Created: / 08-06-2011 / 13:19:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
4 | 218 |
! ! |
219 |
||
220 |
!WebKitRenderer::Channel methodsFor:'queries'! |
|
221 |
||
222 |
isReadable |
|
223 |
"return true, if reading is supported by the recevier. |
|
224 |
This has to be redefined in concrete subclasses." |
|
225 |
||
226 |
^ socket isReadable |
|
227 |
||
228 |
"Modified: / 07-06-2011 / 10:46:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
229 |
! |
|
230 |
||
231 |
isWritable |
|
232 |
"return true, if writing is supported by the recevier. |
|
233 |
This has to be redefined in concrete subclasses." |
|
234 |
||
235 |
^ socket isWritable |
|
236 |
||
237 |
"Modified: / 07-06-2011 / 10:46:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
238 |
! ! |
|
239 |
||
240 |
!WebKitRenderer::Channel methodsFor:'reading'! |
|
241 |
||
242 |
expect: aString |
|
243 |
||
244 |
| s | |
|
245 |
||
246 |
(s := self next: aString size) ~= aString |
|
247 |
ifTrue:[self error: 'Unexpect data in rendered channel']. |
|
248 |
||
249 |
"Created: / 07-06-2011 / 10:55:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
250 |
! |
|
251 |
||
252 |
next |
|
253 |
"return the next element of the stream |
|
254 |
- we do not know here how to do it, it must be redefined in subclass" |
|
255 |
||
9
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
256 |
| char | |
4 | 257 |
|
9
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
258 |
^peekChar isNil ifFalse:[ |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
259 |
char := peekChar. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
260 |
peekChar := nil. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
261 |
char. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
262 |
] ifTrue:[ |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
263 |
socket next |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
264 |
] |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
265 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
266 |
"Modified: / 08-06-2011 / 13:02:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
4 | 267 |
! |
268 |
||
269 |
next: n |
|
270 |
||
9
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
271 |
| nextn | |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
272 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
273 |
peekChar isNil ifTrue:[ |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
274 |
nextn := socket next: n |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
275 |
] ifFalse:[ |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
276 |
nextn := peekChar asString , socket next: n - 1. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
277 |
peekChar := nil |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
278 |
]. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
279 |
^nextn |
4 | 280 |
|
281 |
"Created: / 07-06-2011 / 11:01:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
9
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
282 |
"Modified: / 08-06-2011 / 13:04:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
4 | 283 |
! |
284 |
||
285 |
nextEvent |
|
286 |
||
9
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
287 |
| ev arg | |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
288 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
289 |
ev := OrderedCollection new: 4. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
290 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
291 |
self upTo:$E. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
292 |
self expect: 'VENT ['. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
293 |
self skipFor:$]. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
294 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
295 |
ev add: (self upTo: Character space). |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
296 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
297 |
[ (arg := self nextStringOrSymbolOrNumber) notNil] whileTrue: |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
298 |
[ev add: arg]. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
299 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
300 |
^ev asArray |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
301 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
302 |
" |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
303 |
(WebKitRenderer::Channel on: 'EVENT [1234] LOAD_COMMIT ''http://www.smalltalk-x.de''' readStream) |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
304 |
nextEvent. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
305 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
306 |
(WebKitRenderer::Channel on: 'EVENT [1234] TITLE ''This is title''' readStream) |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
307 |
nextEvent. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
308 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
309 |
(WebKitRenderer::Channel on: 'EVENT [1234] TITLE ''rock\''n\''roll''' readStream) |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
310 |
nextEvent. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
311 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
312 |
(WebKitRenderer::Channel on: 'EVENT [1234] VARIABLE_SET name str ''xxx''' readStream) |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
313 |
nextEvent. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
314 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
315 |
(WebKitRenderer::Channel on: 'EVENT [1234] VARIABLE_SET name int 12' readStream) |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
316 |
nextEvent. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
317 |
|
10 | 318 |
(WebKitRenderer::Channel on: 'EVENT [1234] VARIABLE_SET name float 1.2 |
319 |
EVENT [1234] VARIABLE_SET name string ''xxx''' readStream) |
|
320 |
nextEvent |
|
321 |
||
9
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
322 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
323 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
324 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
325 |
" |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
326 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
327 |
"Created: / 07-06-2011 / 10:52:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10 | 328 |
"Modified: / 08-06-2011 / 13:45:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
9
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
329 |
! |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
330 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
331 |
nextNumberOrSymbol |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
332 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
333 |
| contents | |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
334 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
335 |
buffer reset. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
336 |
buffer nextPut: self next. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
337 |
[self atEnd not and:[self peek isAlphaNumeric]] whileTrue:[ |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
338 |
buffer nextPut: self next. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
339 |
]. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
340 |
self peek == $. ifTrue:[ |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
341 |
buffer nextPut: self next. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
342 |
[self atEnd not and:[self peek isAlphaNumeric]] whileTrue:[ |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
343 |
buffer nextPut: self next. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
344 |
] |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
345 |
]. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
346 |
contents := buffer contents. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
347 |
(contents anySatisfy:[:c|c isLetter]) |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
348 |
ifTrue:[contents := contents asSymbol] |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
349 |
ifFalse:[contents := contents asNumber]. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
350 |
^contents. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
351 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
352 |
"Created: / 08-06-2011 / 13:06:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
353 |
! |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
354 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
355 |
nextString |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
356 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
357 |
| char | |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
358 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
359 |
"/eat $' |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
360 |
buffer reset. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
361 |
self next. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
362 |
[self atEnd not and:[(char := self next) ~~ $']] whileTrue:[ |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
363 |
char == $\ ifTrue:[char := self next]. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
364 |
buffer nextPut: char. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
365 |
]. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
366 |
^buffer contents. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
367 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
368 |
"Created: / 08-06-2011 / 13:06:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
369 |
! |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
370 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
371 |
nextStringOrSymbolOrNumber |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
372 |
|
10 | 373 |
|
374 |
socket atEnd ifTrue:[^nil]. |
|
375 |
self peek == Character cr ifTrue:[^nil]. |
|
9
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
376 |
self skipSeparators. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
377 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
378 |
self peek == $' ifTrue:[^self nextString]. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
379 |
self peek isDigit ifTrue:[^self nextNumberOrSymbol]. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
380 |
^self nextSymbol |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
381 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
382 |
"Created: / 08-06-2011 / 12:57:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
383 |
! |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
384 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
385 |
nextSymbol |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
386 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
387 |
^super nextSymbol asSymbol |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
388 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
389 |
"Created: / 08-06-2011 / 13:20:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
390 |
! |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
391 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
392 |
peek |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
393 |
"return the next element of the stream without advancing (i.e. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
394 |
the following send of next will return this element again.) |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
395 |
- we do not know here how to do it, it must be redefined in subclass" |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
396 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
397 |
peekChar ifNil:[peekChar := socket next]. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
398 |
^peekChar. |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
399 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
400 |
"Modified: / 08-06-2011 / 13:00:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
401 |
! ! |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
402 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
403 |
!WebKitRenderer::Channel methodsFor:'reading (old)'! |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
404 |
|
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
405 |
old_nextEvent |
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
406 |
|
5 | 407 |
| ev | |
4 | 408 |
|
409 |
ev := OrderedCollection new: 4. |
|
410 |
||
411 |
self upTo:$E. |
|
412 |
self expect: 'VENT ['. |
|
413 |
self skipFor:$]. |
|
414 |
||
415 |
ev add: (self upTo: Character space). |
|
6 | 416 |
|
9
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
417 |
[ self old_nextEventArgumentIn: ev ] whileTrue. |
4 | 418 |
|
419 |
^ev asArray |
|
420 |
||
5 | 421 |
" |
422 |
(WebKitRenderer::Channel on: 'EVENT [1234] LOAD_COMMIT ''http://www.smalltalk-x.de''' readStream) |
|
423 |
nextEvent. |
|
424 |
||
425 |
(WebKitRenderer::Channel on: 'EVENT [1234] VARIABLE_SET name str ''xxx''' readStream) |
|
426 |
nextEvent. |
|
427 |
||
428 |
(WebKitRenderer::Channel on: 'EVENT [1234] VARIABLE_SET name int 12' readStream) |
|
429 |
nextEvent. |
|
430 |
||
431 |
(WebKitRenderer::Channel on: 'EVENT [1234] VARIABLE_SET name float 1.2' readStream) |
|
432 |
nextEvent. |
|
433 |
||
434 |
||
435 |
||
436 |
" |
|
437 |
||
9
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
438 |
"Created: / 08-06-2011 / 12:57:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
5 | 439 |
! |
440 |
||
9
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
441 |
old_nextEventArgumentIn: event |
5 | 442 |
|
443 |
| s c conv | |
|
444 |
s := String new writeStream. |
|
445 |
[ socket atEnd not and:[(c := socket next) ~~ Character space and:[ c ~~ Character cr ] ] ] |
|
446 |
whileTrue: [ |
|
447 |
conv == nil ifTrue: [ |
|
448 |
c == $' ifTrue:[conv := #asString. c := socket next.] ifFalse:[ |
|
449 |
c isDigit ifTrue: [conv := #asNumber] ifFalse:[ |
|
450 |
conv := #asSymbol]] |
|
451 |
]. |
|
6 | 452 |
(conv == #asNumber and:[c isDigit not and:[c ~~ $.]]) ifTrue: |
453 |
[conv := #asSymbol]. |
|
5 | 454 |
s nextPut: c. |
455 |
]. |
|
456 |
conv ifNotNil:[ |
|
6 | 457 |
conv = #asString ifTrue:[s skip: -1]. |
5 | 458 |
event add: (s contents perform: conv). |
459 |
]. |
|
460 |
||
461 |
^c == Character space. |
|
462 |
||
9
267f2990f003
Event reading improved (spaces and escapes in string literals)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
7
diff
changeset
|
463 |
"Created: / 08-06-2011 / 12:47:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
4 | 464 |
! ! |
465 |
||
466 |
!WebKitRenderer::Channel methodsFor:'testing'! |
|
467 |
||
468 |
atEnd |
|
469 |
"return true if the end of the stream has been reached; |
|
470 |
- we do not know here how to do it, it must be redefined in subclass" |
|
471 |
||
472 |
^ socket atEnd |
|
473 |
||
474 |
"Modified: / 07-06-2011 / 10:46:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
475 |
! |
|
476 |
||
477 |
isEmpty |
|
478 |
"return true, if the contents of the stream is empty" |
|
479 |
||
480 |
^ socket isEmpty |
|
481 |
||
482 |
"Modified: / 07-06-2011 / 10:46:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
483 |
! ! |
|
484 |
||
485 |
!WebKitRenderer::Channel methodsFor:'writing'! |
|
486 |
||
487 |
cr |
|
488 |
||
489 |
^ socket cr |
|
490 |
||
491 |
"Created: / 07-06-2011 / 10:51:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
492 |
! |
|
493 |
||
494 |
nextPut:anObject |
|
495 |
"put the argument, anObject onto the receiver |
|
496 |
- we do not know here how to do it, it must be redefined in subclass" |
|
497 |
||
498 |
^ socket nextPut:anObject |
|
499 |
||
500 |
"Modified: / 07-06-2011 / 10:50:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
501 |
! |
|
502 |
||
503 |
nextPutAll:anObject |
|
504 |
"put the argument, anObject onto the receiver |
|
505 |
- we do not know here how to do it, it must be redefined in subclass" |
|
506 |
||
507 |
^ socket nextPutAll:anObject |
|
508 |
||
509 |
"Created: / 07-06-2011 / 10:51:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
510 |
! |
|
511 |
||
512 |
space |
|
513 |
||
514 |
^ socket space |
|
515 |
||
516 |
"Created: / 07-06-2011 / 10:51:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
517 |
! ! |
|
518 |
||
2 | 519 |
!WebKitRenderer class methodsFor:'documentation'! |
520 |
||
521 |
version_SVN |
|
522 |
^ '$Id$' |
|
523 |
! ! |