anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Unroll some async methods in stanza reader

Browse source
This commit is contained in:
Marvin W 2019-07-14 13:54:42 +02:00
parent 567ac81d78
commit 87da6584c0
No known key found for this signature in database
GPG key ID: 072E9235DB996F2A
1 changed files with 37 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
xmpp-vala/src/core/stanza_reader.vala
View file

@ -63,14 +63,14 @@ public class StanzaReader {
if (buffer_pos >= buffer_fill) { if (buffer_pos >= buffer_fill) {
yield update_buffer(); yield update_buffer();
} }
char c = (char) buffer[buffer_pos++]; return (char) buffer[buffer_pos++];
return c;
} }
private async char peek_single() throws XmlError { private async char peek_single() throws XmlError {
var res = yield read_single(); if (buffer_pos >= buffer_fill) {
buffer_pos--; yield update_buffer();
return res; }
return (char) buffer[buffer_pos];
} }
private bool is_ws(uint8 what) { private bool is_ws(uint8 what) {
@ -82,37 +82,55 @@ public class StanzaReader {
} }
private async void skip_until_non_ws() throws XmlError { private async void skip_until_non_ws() throws XmlError {
while (is_ws(yield peek_single())) { if (buffer_pos >= buffer_fill) {
skip_single(); yield update_buffer();
}
while (is_ws(buffer[buffer_pos])) {
buffer_pos++;
if (buffer_pos >= buffer_fill) {
yield update_buffer();
}
} }
} }
private async string read_until_ws() throws XmlError { private async string read_until_ws() throws XmlError {
var res = new StringBuilder(); var res = new StringBuilder();
var what = yield peek_single(); if (buffer_pos >= buffer_fill) {
while (!is_ws(what)) { yield update_buffer();
res.append_c(yield read_single()); }
what = yield peek_single(); while (!is_ws(buffer[buffer_pos])) {
res.append_c((char) buffer[buffer_pos++]);
if (buffer_pos >= buffer_fill) {
yield update_buffer();
}
} }
return res.str; return res.str;
} }
private async string read_until_char_or_ws(char x, char y = 0) throws XmlError { private async string read_until_char_or_ws(char x, char y = 0) throws XmlError {
var res = new StringBuilder(); var res = new StringBuilder();
var what = yield peek_single(); if (buffer_pos >= buffer_fill) {
while (what != x && what != y && !is_ws(what)) { yield update_buffer();
res.append_c(yield read_single()); }
what = yield peek_single(); while (buffer[buffer_pos] != x && buffer[buffer_pos] != y && !is_ws(buffer[buffer_pos])) {
res.append_c((char) buffer[buffer_pos++]);
if (buffer_pos >= buffer_fill) {
yield update_buffer();
}
} }
return res.str; return res.str;
} }
private async string read_until_char(char x) throws XmlError { private async string read_until_char(char x) throws XmlError {
var res = new StringBuilder(); var res = new StringBuilder();
var what = yield peek_single(); if (buffer_pos >= buffer_fill) {
while (what != x) { yield update_buffer();
res.append_c(yield read_single()); }
what = yield peek_single(); while (buffer[buffer_pos] != x) {
res.append_c((char) buffer[buffer_pos++]);
if (buffer_pos >= buffer_fill) {
yield update_buffer();
}
} }
return res.str; return res.str;
} }