fankes/moshi
2
0
Fork 0
mirror of https://github.com/fankes/moshi.git synced 2025-10-19 07:59:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #230 from serj-lotutovici/sl/no_loop_if_buf

Browse Source 
Avoid calling source.select() if the value is buffered.
This commit is contained in:
Jesse Wilson
2017-01-22 18:00:21 -05:00
committed by GitHub
parent 5a12b31439 ddf2489910
commit 050b9affbc
1 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
moshi/src/main/java/com/squareup/moshi/BufferedSourceJsonReader.java
View File

@@ -563,9 +563,12 @@ final class BufferedSourceJsonReader extends JsonReader {
if (p == PEEKED_NONE) {
p = doPeek();
}
if (p < PEEKED_SINGLE_QUOTED_NAME || p > PEEKED_BUFFERED_NAME) {
if (p < PEEKED_SINGLE_QUOTED_NAME || p > PEEKED_BUFFERED_NAME) {
return -1;
}
if (p == PEEKED_BUFFERED_NAME) {
return findName(peekedString, options);
}
int result = source.select(options.doubleQuoteSuffix);
if (result != -1) {
@@ -580,20 +583,31 @@ final class BufferedSourceJsonReader extends JsonReader {
String lastPathName = pathNames[stackSize - 1];
String nextName = nextName();
result = findName(nextName, options);
if (result == -1) {
peeked = PEEKED_BUFFERED_NAME;
peekedString = nextName;
// We can't push the path further, make it seem like nothing happened.
pathNames[stackSize - 1] = lastPathName;
}
return result;
}
/**
* If {@code name} is in {@code options} this consumes it and returns it's index.
* Otherwise this returns -1 and no name is consumed.
*/
private int findName(String name, Options options) {
for (int i = 0, size = options.strings.length; i < size; i++) {
if (nextName.equals(options.strings[i])) {
if (name.equals(options.strings[i])) {
peeked = PEEKED_NONE;
pathNames[stackSize - 1] = nextName;
pathNames[stackSize - 1] = name;
return i;
}
}
peeked = PEEKED_BUFFERED_NAME;
peekedString = nextName;
// We can't push the path further, make it seem like nothing happened.
pathNames[stackSize - 1] = lastPathName;
return -1;
}
@@ -632,6 +646,9 @@ final class BufferedSourceJsonReader extends JsonReader {
if (p < PEEKED_SINGLE_QUOTED || p > PEEKED_BUFFERED) {
return -1;
}
if (p == PEEKED_BUFFERED) {
return findString(peekedString, options);
}
int result = source.select(options.doubleQuoteSuffix);
if (result != -1) {
@@ -642,19 +659,30 @@ final class BufferedSourceJsonReader extends JsonReader {
}
String nextString = nextString();
result = findString(nextString, options);
if (result == -1) {
peeked = PEEKED_BUFFERED;
peekedString = nextString;
pathIndices[stackSize - 1]--;
}
return result;
}
/**
* If {@code string} is in {@code options} this consumes it and returns it's index.
* Otherwise this returns -1 and no string is consumed.
*/
private int findString(String string, Options options) {
for (int i = 0, size = options.strings.length; i < size; i++) {
if (nextString.equals(options.strings[i])) {
if (string.equals(options.strings[i])) {
peeked = PEEKED_NONE;
pathIndices[stackSize - 1]++;
return i;
}
}
peeked = PEEKED_BUFFERED;
peekedString = nextString;
pathIndices[stackSize - 1]--;
return -1;
}